Make sure variables are interpolated when no translations exist.

This commit is contained in:
JC Brand 2017-04-19 14:37:59 +02:00
parent f0deac9ec5
commit 59ca7bae16

View File

@ -27,6 +27,7 @@
tpl_form_captcha tpl_form_captcha
) { ) {
"use strict"; "use strict";
locales = locales || {};
var XFORM_TYPE_MAP = { var XFORM_TYPE_MAP = {
'text-private': 'password', 'text-private': 'password',
@ -158,8 +159,8 @@
// Translation machinery // Translation machinery
// --------------------- // ---------------------
__: function (str) { __: function (str) {
if (typeof Jed === "undefined" || !utils.isConverseLocale(this.locale) || this.locale === 'en') { if (!utils.isConverseLocale(this.locale) || this.locale === 'en') {
return str; return Jed.sprintf.apply(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]));