From f24b6453d87b9e2130a0fba0682c0b193649c775 Mon Sep 17 00:00:00 2001
From: wkj <278599135@qq.com>
Date: Fri, 29 Jul 2022 18:31:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/platforms/wechatMp/i18n/index.d.ts |  1 +
 lib/platforms/wechatMp/i18n/index.js   | 12 +++---------
 src/platforms/wechatMp/i18n/index.ts   | 13 ++++---------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/lib/platforms/wechatMp/i18n/index.d.ts b/lib/platforms/wechatMp/i18n/index.d.ts
index 632d1b5e..51789845 100644
--- a/lib/platforms/wechatMp/i18n/index.d.ts
+++ b/lib/platforms/wechatMp/i18n/index.d.ts
@@ -41,5 +41,6 @@ export declare const LOCALE_CHANGE_HANDLER_NAME = "$_localeChange";
 export declare const CURRENT_LOCALE_DATA = "$_translations";
 export declare type I18nOptions = {
     translations?: Record<string, any>;
+    defaultLocale?: string;
 };
 export declare function getI18next(options?: I18nOptions): I18nWechatMpRuntimeBase;
diff --git a/lib/platforms/wechatMp/i18n/index.js b/lib/platforms/wechatMp/i18n/index.js
index ee88733e..797162c2 100644
--- a/lib/platforms/wechatMp/i18n/index.js
+++ b/lib/platforms/wechatMp/i18n/index.js
@@ -96,19 +96,13 @@ exports.CURRENT_LOCALE_KEY = '$_locale';
 exports.LOCALE_CHANGE_HANDLER_NAME = '$_localeChange';
 exports.CURRENT_LOCALE_DATA = '$_translations';
 function getI18next(options) {
-    var systemInfo = wx.getSystemInfoSync();
-    var language = systemInfo.language; // 系统语言
-    var translations = (options || { translations: {} }).translations;
-    var defaultLocale = 'zh_CN';
-    if (language) {
-        defaultLocale = language;
-    }
+    var _a = options || {}, translations = _a.translations, defaultLocale = _a.defaultLocale;
     //初始化i18n
     var i18n = initI18nWechatMp({
         locales: {
-            translations: translations,
+            translations: translations || {},
         },
-        defaultLocale: defaultLocale,
+        defaultLocale: defaultLocale || "zh_CN" /* Locale.default */,
     });
     return i18n;
 }
diff --git a/src/platforms/wechatMp/i18n/index.ts b/src/platforms/wechatMp/i18n/index.ts
index b6f4837c..b9d29a68 100644
--- a/src/platforms/wechatMp/i18n/index.ts
+++ b/src/platforms/wechatMp/i18n/index.ts
@@ -136,22 +136,17 @@ export const CURRENT_LOCALE_DATA = '$_translations';
 
 export type I18nOptions = {
     translations?: Record<string, any>;
+    defaultLocale?: string;
 };
 
 export function getI18next(options?: I18nOptions) {
-    const systemInfo = wx.getSystemInfoSync();
-    const { language } = systemInfo; // 系统语言
-    const { translations } = options || { translations: {} };
-    let defaultLocale = 'zh_CN';
-    if (language) {
-        defaultLocale = language;
-    }
+    const { translations, defaultLocale } = options || {};
     //初始化i18n
     const i18n = initI18nWechatMp({
         locales: {
-            translations: translations!,
+            translations: translations || {},
         },
-        defaultLocale,
+        defaultLocale: defaultLocale || Locale.default,
     });
     return i18n;
 }