web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolve bad merge

Browse Source
This commit is contained in:
ansuz 2018-01-02 12:13:43 +01:00
parent e3c7e96d71
commit 65e66dea08
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
customize.dist/messages.js
View File

@ -8,7 +8,7 @@ var map = {
'pt-br': 'Português do Brasil', 'pt-br': 'Português do Brasil',
'ro': 'Română', 'ro': 'Română',
'zh': '繁體中文', 'zh': '繁體中文',
'el': 'Ελληνικά', 'el': 'Ελληνικά',
}; };
var messages = {}; var messages = {};
@ -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;