feat: 更新多语言取值的回退机制

从原来默认取空，更改为默认取源多语言的值；这样解决了之前主项目新增多语言，如果不更新 tb-i18n-loader，值回退到 key 上的问题
teambition · Aug 19, 2019 · 433b9da · 433b9da
1 parent 32e4bdc
commit 433b9da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/index.js b/index.js
@@ -19,7 +19,7 @@ module.exports = function (content) {
     if (lang === descriptionAs) {
       result = util.translate(lang, description)
     } else {
-      result = util.translateLocales(lang, Object.keys(description))
+      result = util.translateLocales(lang, description)
     }
     results.push(result)
   }

diff --git a/util.js b/util.js
@@ -23,12 +23,12 @@ function getLocales (language) {
 }
 
 exports.translateLocales = translateLocales
-function translateLocales (language, keys) {
+function translateLocales (language, description) {
   var originLocales = getLocales(language)
   var locales = {}
-  keys.forEach(function (key) {
-    locales[key] = originLocales[key] || ''
-  })
+  for (var key in description) {
+    locales[key] = originLocales[key] || description[key]
+  }
   return translate(language, locales)
 }