@modern-js/plugin-i18n 1.1.1 → 1.1.2-beta.0

package/dist/js/modern/index.js

@@ -1,5 +1,5 @@
 import _get from "lodash/get";
-import { getObjKeyMap } from "./utils/index";
+import { getObjKeyMap } from "./utils";
 
 class I18n {
   constructor() {
@@ -12,10 +12,18 @@ class I18n {
   }
 
   getMessage(lang, key, vars, fallbackText) {
-    const model = this.languageMap[lang];
+    // 判断语言当前语料库是否存在，不存在使用 en 作为默认语言
+    const languages = Object.keys(this.languageMap);
+    const resultLang = languages.find(l => l === lang);
+
+    if (!resultLang && languages.length === 0) {
+      return fallbackText || key;
+    }
+
+    const model = this.languageMap[resultLang || 'en' || languages[0]];
 
     if (!model) {
-      throw new Error(`current ${lang} language is not exisit`);
+      return fallbackText || key;
     }
 
     const message = _get(model, key);

package/dist/js/node/index.js

@@ -7,7 +7,7 @@ exports.I18n = void 0;
 
 var _get2 = _interopRequireDefault(require("lodash/get"));
 
-var _index = require("./utils/index");
+var _utils = require("./utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -22,10 +22,18 @@ class I18n {
   }
 
   getMessage(lang, key, vars, fallbackText) {
-    const model = this.languageMap[lang];
+    // 判断语言当前语料库是否存在，不存在使用 en 作为默认语言
+    const languages = Object.keys(this.languageMap);
+    const resultLang = languages.find(l => l === lang);
+
+    if (!resultLang && languages.length === 0) {
+      return fallbackText || key;
+    }
+
+    const model = this.languageMap[resultLang || 'en' || languages[0]];
 
     if (!model) {
-      throw new Error(`current ${lang} language is not exisit`);
+      return fallbackText || key;
     }
 
     const message = (0, _get2.default)(model, key);
@@ -45,7 +53,7 @@ class I18n {
       this.languageMap = languageMap;
     }
 
-    return (0, _index.getObjKeyMap)(this.languageMap[this.language]);
+    return (0, _utils.getObjKeyMap)(this.languageMap[this.language]);
   }
 
   changeLanguage(config) {

package/dist/js/treeshaking/index.js

@@ -4,9 +4,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-import { getObjKeyMap } from "./utils/index";
+import { getObjKeyMap } from "./utils";
 
 var I18n = /*#__PURE__*/function () {
   function I18n() {
@@ -26,10 +26,20 @@ var I18n = /*#__PURE__*/function () {
   }, {
     key: "getMessage",
     value: function getMessage(lang, key, vars, fallbackText) {
-      var model = this.languageMap[lang];
+      // 判断语言当前语料库是否存在，不存在使用 en 作为默认语言
+      var languages = Object.keys(this.languageMap);
+      var resultLang = languages.find(function (l) {
+        return l === lang;
+      });
+
+      if (!resultLang && languages.length === 0) {
+        return fallbackText || key;
+      }
+
+      var model = this.languageMap[resultLang || 'en' || languages[0]];
 
       if (!model) {
-        throw new Error("current ".concat(lang, " language is not exisit"));
+        return fallbackText || key;
       }
 
       var message = _get(model, key);

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.1",
+  "version": "1.1.2-beta.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -35,8 +35,8 @@
     "@types/lodash": "^4.14.126",
     "@types/node": "^14",
     "typescript": "^4",
-    "@modern-js/plugin-testing": "^1.1.0",
-    "@modern-js/module-tools": "^1.1.0"
+    "@modern-js/plugin-testing": "^1.1.1",
+    "@modern-js/module-tools": "^1.1.1"
   },
   "sideEffects": false,
   "modernConfig": {},

package/src/index.ts

@@ -1,5 +1,5 @@
 import { get } from 'lodash';
-import { getObjKeyMap } from './utils/index';
+import { getObjKeyMap } from './utils';
 
 type Language = string;
 
@@ -43,9 +43,16 @@ class I18n implements TI18n {
     vars?: { [key: string]: string },
     fallbackText?: string,
   ) {
-    const model: LanguageModel = this.languageMap[lang];
+    // 判断语言当前语料库是否存在，不存在使用 en 作为默认语言
+    const languages = Object.keys(this.languageMap);
+    const resultLang = languages.find(l => l === lang);
+    if (!resultLang && languages.length === 0) {
+      return fallbackText || key;
+    }
+    const model: LanguageModel =
+      this.languageMap[resultLang || 'en' || languages[0]];
     if (!model) {
-      throw new Error(`current ${lang} language is not exisit`);
+      return fallbackText || key;
     }
     const message = get(model, key);
     const value = message || fallbackText || key;