Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

This commit is contained in:
yflory 2017-02-21 14:16:35 +01:00
commit 20b08a7847
1 changed files with 7 additions and 3 deletions

View File

@ -79,9 +79,13 @@ define(req, function(Default, Language) {
messages._getKey = function (key, argArray) {
if (!messages[key]) { return '?'; }
var text = messages[key];
return text.replace(/\{(\d+)\}/g, function (str, p1) {
return argArray[p1] || null;
});
if (typeof(text) === 'string') {
return text.replace(/\{(\d+)\}/g, function (str, p1) {
return argArray[p1] || null;
});
} else {
return text;
}
};
// Add handler to the language selector