Make customized translations more maintainable

2018-10-15 18:38:41 +02:00
parent 7d0d8352bf
commit 9f0398826d
23 changed files with 7076 additions and 6765 deletions
--- a/www/common/common-util.js
+++ b/www/common/common-util.js
@@ -262,7 +262,7 @@ define([], function () {
        }
        for (var k in b) {
            if (Util.isObject(b[k])) {
-                a[k] = {};
+                a[k] = Util.isObject(a[k]) ? a[k] : {};
                Util.extend(a[k], b[k]);
                continue;
            }