From beb77ebc9af0dac1a32f2062ae6b24820525ddc3 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Fri, 8 Oct 2021 10:57:53 +0800
Subject: [PATCH] fix(mp): i18n

---
 packages/uni-mp-alipay/dist/uni.api.esm.js        | 2 +-
 packages/uni-mp-alipay/dist/uni.mp.esm.js         | 2 +-
 packages/uni-mp-baidu/dist/uni.api.esm.js         | 2 +-
 packages/uni-mp-baidu/dist/uni.mp.esm.js          | 2 +-
 packages/uni-mp-core/src/api/locale.ts            | 2 +-
 packages/uni-mp-core/src/runtime/app.ts           | 4 +++-
 packages/uni-mp-kuaishou/dist/uni.api.esm.js      | 2 +-
 packages/uni-mp-kuaishou/dist/uni.mp.esm.js       | 2 +-
 packages/uni-mp-qq/dist/uni.api.esm.js            | 2 +-
 packages/uni-mp-qq/dist/uni.mp.esm.js             | 2 +-
 packages/uni-mp-toutiao/dist/uni.api.esm.js       | 2 +-
 packages/uni-mp-toutiao/dist/uni.mp.esm.js        | 2 +-
 packages/uni-mp-weixin/dist/uni.api.esm.js        | 2 +-
 packages/uni-mp-weixin/dist/uni.mp.esm.js         | 2 +-
 packages/uni-quickapp-webview/dist/uni.api.esm.js | 2 +-
 packages/uni-quickapp-webview/dist/uni.mp.esm.js  | 2 +-
 16 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/packages/uni-mp-alipay/dist/uni.api.esm.js b/packages/uni-mp-alipay/dist/uni.api.esm.js
index 7054e102b..bf7bdb278 100644
--- a/packages/uni-mp-alipay/dist/uni.api.esm.js
+++ b/packages/uni-mp-alipay/dist/uni.api.esm.js
@@ -734,7 +734,7 @@ const getLocale = () => {
     if (app && app.$vm) {
         return app.$vm.$locale;
     }
-    return uni.getSystemInfoSync().language || 'zh-Hans';
+    return my.getSystemInfoSync().language || 'zh-Hans';
 };
 const setLocale = (locale) => {
     const app = getApp();
diff --git a/packages/uni-mp-alipay/dist/uni.mp.esm.js b/packages/uni-mp-alipay/dist/uni.mp.esm.js
index 0f3d45111..4327c9853 100644
--- a/packages/uni-mp-alipay/dist/uni.mp.esm.js
+++ b/packages/uni-mp-alipay/dist/uni.mp.esm.js
@@ -601,7 +601,7 @@ function initCreateApp(parseAppOptions) {
     };
 }
 function initLocale(appVm) {
-    const locale = ref(uni.getSystemInfoSync().language || 'zh-Hans');
+    const locale = ref(my.getSystemInfoSync().language || 'zh-Hans');
     Object.defineProperty(appVm, '$locale', {
         get() {
             return locale.value;
diff --git a/packages/uni-mp-baidu/dist/uni.api.esm.js b/packages/uni-mp-baidu/dist/uni.api.esm.js
index 28c2a2bd1..bdd618021 100644
--- a/packages/uni-mp-baidu/dist/uni.api.esm.js
+++ b/packages/uni-mp-baidu/dist/uni.api.esm.js
@@ -734,7 +734,7 @@ const getLocale = () => {
     if (app && app.$vm) {
         return app.$vm.$locale;
     }
-    return uni.getSystemInfoSync().language || 'zh-Hans';
+    return swan.getSystemInfoSync().language || 'zh-Hans';
 };
 const setLocale = (locale) => {
     const app = getApp();
diff --git a/packages/uni-mp-baidu/dist/uni.mp.esm.js b/packages/uni-mp-baidu/dist/uni.mp.esm.js
index bcaa5f734..9f4c6ba52 100644
--- a/packages/uni-mp-baidu/dist/uni.mp.esm.js
+++ b/packages/uni-mp-baidu/dist/uni.mp.esm.js
@@ -622,7 +622,7 @@ function initCreateApp(parseAppOptions) {
     };
 }
 function initLocale(appVm) {
-    const locale = ref(uni.getSystemInfoSync().language || 'zh-Hans');
+    const locale = ref(swan.getSystemInfoSync().language || 'zh-Hans');
     Object.defineProperty(appVm, '$locale', {
         get() {
             return locale.value;
diff --git a/packages/uni-mp-core/src/api/locale.ts b/packages/uni-mp-core/src/api/locale.ts
index c903c4817..18e10b997 100644
--- a/packages/uni-mp-core/src/api/locale.ts
+++ b/packages/uni-mp-core/src/api/locale.ts
@@ -4,7 +4,7 @@ export const getLocale: typeof uni.getLocale = () => {
   if (app && app.$vm) {
     return app.$vm.$locale
   }
-  return uni.getSystemInfoSync().language || 'zh-Hans'
+  return __GLOBAL__.getSystemInfoSync().language || 'zh-Hans'
 }
 
 export const setLocale: typeof uni.setLocale = (locale) => {
diff --git a/packages/uni-mp-core/src/runtime/app.ts b/packages/uni-mp-core/src/runtime/app.ts
index eee45fab0..2d0081dff 100644
--- a/packages/uni-mp-core/src/runtime/app.ts
+++ b/packages/uni-mp-core/src/runtime/app.ts
@@ -96,7 +96,9 @@ export function initCreateApp(parseAppOptions?: ParseAppOptions) {
 }
 
 function initLocale(appVm: ComponentPublicInstance) {
-  const locale = ref<string>(uni.getSystemInfoSync().language || 'zh-Hans')
+  const locale = ref<string>(
+    __GLOBAL__.getSystemInfoSync().language || 'zh-Hans'
+  )
   Object.defineProperty(appVm, '$locale', {
     get() {
       return locale.value
diff --git a/packages/uni-mp-kuaishou/dist/uni.api.esm.js b/packages/uni-mp-kuaishou/dist/uni.api.esm.js
index 2f30d2ed6..f8df3161a 100644
--- a/packages/uni-mp-kuaishou/dist/uni.api.esm.js
+++ b/packages/uni-mp-kuaishou/dist/uni.api.esm.js
@@ -734,7 +734,7 @@ const getLocale = () => {
     if (app && app.$vm) {
         return app.$vm.$locale;
     }
-    return uni.getSystemInfoSync().language || 'zh-Hans';
+    return ks.getSystemInfoSync().language || 'zh-Hans';
 };
 const setLocale = (locale) => {
     const app = getApp();
diff --git a/packages/uni-mp-kuaishou/dist/uni.mp.esm.js b/packages/uni-mp-kuaishou/dist/uni.mp.esm.js
index 87ce3029a..44f21e2fd 100644
--- a/packages/uni-mp-kuaishou/dist/uni.mp.esm.js
+++ b/packages/uni-mp-kuaishou/dist/uni.mp.esm.js
@@ -622,7 +622,7 @@ function initCreateApp(parseAppOptions) {
     };
 }
 function initLocale(appVm) {
-    const locale = ref(uni.getSystemInfoSync().language || 'zh-Hans');
+    const locale = ref(ks.getSystemInfoSync().language || 'zh-Hans');
     Object.defineProperty(appVm, '$locale', {
         get() {
             return locale.value;
diff --git a/packages/uni-mp-qq/dist/uni.api.esm.js b/packages/uni-mp-qq/dist/uni.api.esm.js
index 60abc08d2..e1f7dbdd6 100644
--- a/packages/uni-mp-qq/dist/uni.api.esm.js
+++ b/packages/uni-mp-qq/dist/uni.api.esm.js
@@ -734,7 +734,7 @@ const getLocale = () => {
     if (app && app.$vm) {
         return app.$vm.$locale;
     }
-    return uni.getSystemInfoSync().language || 'zh-Hans';
+    return qq.getSystemInfoSync().language || 'zh-Hans';
 };
 const setLocale = (locale) => {
     const app = getApp();
diff --git a/packages/uni-mp-qq/dist/uni.mp.esm.js b/packages/uni-mp-qq/dist/uni.mp.esm.js
index d21075e70..789f486d5 100644
--- a/packages/uni-mp-qq/dist/uni.mp.esm.js
+++ b/packages/uni-mp-qq/dist/uni.mp.esm.js
@@ -622,7 +622,7 @@ function initCreateApp(parseAppOptions) {
     };
 }
 function initLocale(appVm) {
-    const locale = ref(uni.getSystemInfoSync().language || 'zh-Hans');
+    const locale = ref(qq.getSystemInfoSync().language || 'zh-Hans');
     Object.defineProperty(appVm, '$locale', {
         get() {
             return locale.value;
diff --git a/packages/uni-mp-toutiao/dist/uni.api.esm.js b/packages/uni-mp-toutiao/dist/uni.api.esm.js
index fc5cc7723..6b43481a9 100644
--- a/packages/uni-mp-toutiao/dist/uni.api.esm.js
+++ b/packages/uni-mp-toutiao/dist/uni.api.esm.js
@@ -734,7 +734,7 @@ const getLocale = () => {
     if (app && app.$vm) {
         return app.$vm.$locale;
     }
-    return uni.getSystemInfoSync().language || 'zh-Hans';
+    return tt.getSystemInfoSync().language || 'zh-Hans';
 };
 const setLocale = (locale) => {
     const app = getApp();
diff --git a/packages/uni-mp-toutiao/dist/uni.mp.esm.js b/packages/uni-mp-toutiao/dist/uni.mp.esm.js
index 0cddfda28..64b8d1ccb 100644
--- a/packages/uni-mp-toutiao/dist/uni.mp.esm.js
+++ b/packages/uni-mp-toutiao/dist/uni.mp.esm.js
@@ -625,7 +625,7 @@ function initCreateApp(parseAppOptions) {
     };
 }
 function initLocale(appVm) {
-    const locale = ref(uni.getSystemInfoSync().language || 'zh-Hans');
+    const locale = ref(tt.getSystemInfoSync().language || 'zh-Hans');
     Object.defineProperty(appVm, '$locale', {
         get() {
             return locale.value;
diff --git a/packages/uni-mp-weixin/dist/uni.api.esm.js b/packages/uni-mp-weixin/dist/uni.api.esm.js
index 73796b96e..4e420c580 100644
--- a/packages/uni-mp-weixin/dist/uni.api.esm.js
+++ b/packages/uni-mp-weixin/dist/uni.api.esm.js
@@ -698,7 +698,7 @@ const getLocale = () => {
     if (app && app.$vm) {
         return app.$vm.$locale;
     }
-    return uni.getSystemInfoSync().language || 'zh-Hans';
+    return wx.getSystemInfoSync().language || 'zh-Hans';
 };
 const setLocale = (locale) => {
     const app = getApp();
diff --git a/packages/uni-mp-weixin/dist/uni.mp.esm.js b/packages/uni-mp-weixin/dist/uni.mp.esm.js
index 4fcc49a7f..0f4d3d6e9 100644
--- a/packages/uni-mp-weixin/dist/uni.mp.esm.js
+++ b/packages/uni-mp-weixin/dist/uni.mp.esm.js
@@ -568,7 +568,7 @@ function initCreateApp(parseAppOptions) {
     };
 }
 function initLocale(appVm) {
-    const locale = ref(uni.getSystemInfoSync().language || 'zh-Hans');
+    const locale = ref(wx.getSystemInfoSync().language || 'zh-Hans');
     Object.defineProperty(appVm, '$locale', {
         get() {
             return locale.value;
diff --git a/packages/uni-quickapp-webview/dist/uni.api.esm.js b/packages/uni-quickapp-webview/dist/uni.api.esm.js
index 6ea9c382a..d35e435b2 100644
--- a/packages/uni-quickapp-webview/dist/uni.api.esm.js
+++ b/packages/uni-quickapp-webview/dist/uni.api.esm.js
@@ -734,7 +734,7 @@ const getLocale = () => {
     if (app && app.$vm) {
         return app.$vm.$locale;
     }
-    return uni.getSystemInfoSync().language || 'zh-Hans';
+    return qa.getSystemInfoSync().language || 'zh-Hans';
 };
 const setLocale = (locale) => {
     const app = getApp();
diff --git a/packages/uni-quickapp-webview/dist/uni.mp.esm.js b/packages/uni-quickapp-webview/dist/uni.mp.esm.js
index 81f7246fe..2f854f2a9 100644
--- a/packages/uni-quickapp-webview/dist/uni.mp.esm.js
+++ b/packages/uni-quickapp-webview/dist/uni.mp.esm.js
@@ -553,7 +553,7 @@ function initCreateApp(parseAppOptions) {
     };
 }
 function initLocale(appVm) {
-    const locale = ref(uni.getSystemInfoSync().language || 'zh-Hans');
+    const locale = ref(qa.getSystemInfoSync().language || 'zh-Hans');
     Object.defineProperty(appVm, '$locale', {
         get() {
             return locale.value;
-- 
GitLab