Merge pull request #286 from mousheng/fix_Chinese_environment_not_work

fix: chiese environment not work
lowcoder-org · Jul 17, 2023 · a827ce4 · a827ce4
2 parents 69a8db4 + 51df678
commit a827ce4
Show file tree

Hide file tree

Showing 2 changed files with 2,403 additions and 2,381 deletions.
diff --git a/client/packages/lowcoder-core/lib/index.js b/client/packages/lowcoder-core/lib/index.js
@@ -11270,7 +11270,7 @@ var globalMessages = Object.fromEntries(Object.entries(getDataByLocale(localeDat
 }));
 var Translator = /** @class */ (function () {
     function Translator(fileData, filterLocales, locales) {
-        var _a = getDataByLocale(fileData, "", filterLocales, locales), data = _a.data, language = _a.language;
+        var _a = getDataByLocale(fileData, "", filterLocales, locales), data = _.merge( fileData.en, _a.data), language = _a.language;
         this.messages = Object.assign({}, data, globalMessages);
         this.language = language;
         this.trans = this.trans.bind(this);