Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2017-08-16 16:01:40 +02:00
commit ebc2995643
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/converse-ping.js
View File

@ -56,7 +56,9 @@
}; };
_converse.registerPongHandler = function () { _converse.registerPongHandler = function () {
_converse.connection.disco.addFeature(Strophe.NS.PING); if (!_.isUndefined(_converse.connection.disco)) {
_converse.connection.disco.addFeature(Strophe.NS.PING);
}
_converse.connection.ping.addPingHandler(_converse.pong); _converse.connection.ping.addPingHandler(_converse.pong);
}; };

7
src/utils.js
View File

@ -6,7 +6,7 @@
// Copyright (c) 2012-2017, Jan-Carel Brand <jc@opkode.com> // Copyright (c) 2012-2017, Jan-Carel Brand <jc@opkode.com>
// Licensed under the Mozilla Public License (MPLv2) // Licensed under the Mozilla Public License (MPLv2)
// //
/*global define, escape, locales, Jed */ /*global define, escape, locales, window */
(function (root, factory) { (function (root, factory) {
define([ define([
"sizzle", "sizzle",
@ -86,8 +86,11 @@
// Translation machinery // Translation machinery
// --------------------- // ---------------------
u.__ = function (str) { u.__ = function (str) {
if (_.isUndefined(window.Jed)) {
return str;
}
if (!u.isConverseLocale(this.locale) || this.locale === 'en') { if (!u.isConverseLocale(this.locale) || this.locale === 'en') {
return Jed.sprintf.apply(Jed, arguments); return Jed.sprintf.apply(window.Jed, arguments);
} }
if (typeof this.jed === "undefined") { if (typeof this.jed === "undefined") {
this.jed = new Jed(window.JSON.parse(locales[this.locale])); this.jed = new Jed(window.JSON.parse(locales[this.locale]));