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

Merge pull request #268 from gbonvehi/master

Browse Source 
Fix locale set during initialize not being used in utils.translation
This commit is contained in:
JC Brand 2014-10-29 18:51:03 +01:00
commit 1243d8e3a0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
converse.js
View File

@ -300,7 +300,7 @@
// Translation machinery // Translation machinery
// --------------------- // ---------------------
var __ = utils.__; var __ = $.proxy(utils.__, this);
var ___ = utils.___; var ___ = utils.___;
// Translation aware constants // Translation aware constants
// --------------------------- // ---------------------------

4
src/utils.js
View File

@ -30,7 +30,7 @@ define(["jquery"], function ($) {
var utils = { var utils = {
// Translation machinery // Translation machinery
// --------------------- // ---------------------
__: $.proxy(function (str) { __: function (str) {
// Translation factory // Translation factory
if (this.i18n === undefined) { if (this.i18n === undefined) {
this.i18n = locales.en; this.i18n = locales.en;
@ -41,7 +41,7 @@ define(["jquery"], function ($) {
} else { } else {
return t.fetch(); return t.fetch();
} }
}, this), },
___: function (str) { ___: function (str) {
/* XXX: This is part of a hack to get gettext to scan strings to be /* XXX: This is part of a hack to get gettext to scan strings to be