mirror of https://github.com/xwiki-labs/cryptpad
resolve bad merge
This commit is contained in:
parent
e3c7e96d71
commit
65e66dea08
|
@ -8,7 +8,7 @@ var map = {
|
|||
'pt-br': 'Português do Brasil',
|
||||
'ro': 'Română',
|
||||
'zh': '繁體中文',
|
||||
'el': 'Ελληνικά',
|
||||
'el': 'Ελληνικά',
|
||||
};
|
||||
|
||||
var messages = {};
|
||||
|
@ -94,7 +94,11 @@ define(req, function(Util, Default, Language) {
|
|||
var text = messages[key];
|
||||
if (typeof(text) === 'string') {
|
||||
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 {
|
||||
return text;
|
||||
|
|
Loading…
Reference in New Issue