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

Fix translation issue with weblate pushing empty strings

Browse Source
This commit is contained in:
yflory 2019-05-28 14:28:51 +02:00
parent d317053db4
commit 8b200817ee
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
customize.dist/messages.js
View File

@ -69,10 +69,25 @@ define(req, function(Util, AppConfig, Default, Language) {
}); });
} }
Util.extend(messages, Default); var extend = function (a, b) {
for (var k in b) {
if (Util.isObject(b[k])) {
a[k] = Util.isObject(a[k]) ? a[k] : {};
extend(a[k], b[k]);
continue;
}
if (Array.isArray(b[k])) {
a[k] = b[k].slice();
continue;
}
a[k] = b[k] || a[k];
}
};
extend(messages, Default);
if (Language && language !== defaultLanguage) { if (Language && language !== defaultLanguage) {
// Add the translated keys to the returned object // Add the translated keys to the returned object
Util.extend(messages, Language); extend(messages, Language);
} }
messages._languages = map; messages._languages = map;