resolve bad merge

pull/1/head
ansuz 7 years ago
parent e3c7e96d71
commit 65e66dea08

@ -94,7 +94,11 @@ define(req, function(Util, Default, Language) {
var text = messages[key]; var text = messages[key];
if (typeof(text) === 'string') { if (typeof(text) === 'string') {
return text.replace(/\{(\d+)\}/g, function (str, p1) { return text.replace(/\{(\d+)\}/g, function (str, p1) {
return argArray[p1] || null; if (typeof(argArray[p1]) === 'string' || typeof(argArray[p1]) === "number") {
return argArray[p1];
}
console.error("Only strings and numbers can be used in _getKey params!");
return '';
}); });
} else { } else {
return text; return text;

Loading…
Cancel
Save