@cloudbase/cli 2.9.11 → 2.9.13

package/lib/i18n/index.js

@@ -4,19 +4,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isIntl = exports.getLanguage = exports.t = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
 const os_locale_1 = __importDefault(require("os-locale"));
 const db_1 = require("../utils/store/db");
+const locales_1 = require("../../locales");
 let i18n;
+const LANG_DATA = {
+    zh: locales_1.zh,
+    en: locales_1.en
+};
 const configDB = (0, db_1.getSyncDB)('config');
 const AVAILABLE_LANGS = ['zh', 'en'];
 class I18n {
     constructor() {
         this.lang = getLanguage();
+        this.mapping = locales_1.mappingData;
         if (this.lang !== 'zh') {
-            this.loadLanguage();
-            this.loadMapping();
+            this.data = LANG_DATA[this.lang];
         }
     }
     t(key, options) {
@@ -29,11 +32,6 @@ class I18n {
         }
         return key;
     }
-    loadLanguage() {
-        const langPath = path_1.default.resolve(I18n.langDir, `${this.lang}.json`);
-        const langData = fs_1.default.readFileSync(langPath, 'utf-8');
-        this.data = JSON.parse(langData);
-    }
     replaceVars(str, vars) {
         let result = str;
         if (!vars) {
@@ -44,13 +42,7 @@ class I18n {
         });
         return result;
     }
-    loadMapping() {
-        const mappingPath = path_1.default.resolve(__dirname, '../../locales/mapping.json');
-        const mappingStr = fs_1.default.readFileSync(mappingPath, 'utf-8');
-        this.mapping = JSON.parse(mappingStr);
-    }
 }
-I18n.langDir = path_1.default.resolve(__dirname, '../../locales/langs');
 function t(key, options) {
     if (!i18n) {
         i18n = new I18n();

package/locales/index.js

@@ -0,0 +1,5 @@
+const en = require('./langs/en.json')
+const zh = require('./langs/zh.json')
+const mappingData = require('./mapping.json')
+
+module.exports = { en, zh, mappingData }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.9.11",
+    "version": "2.9.13",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {

package/tsconfig.json

@@ -12,7 +12,8 @@
         "declarationDir": "./types",
         "experimentalDecorators": true,
         "emitDecoratorMetadata": true,
-        "newLine": "LF"
+        "newLine": "LF",
+        "resolveJsonModule": true
     },
     "include": ["src/**/*"],
     "exclude": ["node_modules", "test"]