From 47b32a276796231c66f363d5c30a2c02e471be07 Mon Sep 17 00:00:00 2001
From: harrywan <harrywan@webank.com>
Date: Wed, 23 Oct 2024 11:25:00 +0800
Subject: [PATCH] =?UTF-8?q?fix(plugin-locale):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=AF=AD=E8=A8=80=E5=8F=96=E5=80=BC=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fes-plugin-locale/src/runtime/core.js.tpl  | 18 +++++++++++-------
 packages/fes-template/src/locales/en-US.js     |  2 +-
 packages/fes-template/src/locales/zh-CN.js     |  2 +-
 packages/fes-template/src/pages/index.vue      |  2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/fes-plugin-locale/src/runtime/core.js.tpl b/packages/fes-plugin-locale/src/runtime/core.js.tpl
index 5e662d9de..38dbf1ecf 100644
--- a/packages/fes-plugin-locale/src/runtime/core.js.tpl
+++ b/packages/fes-plugin-locale/src/runtime/core.js.tpl
@@ -19,18 +19,22 @@ const getDefaultLocale = () => {
     if (fes_locale) {
         return {
             locale: fes_locale,
-            fallbackLocale: fes_locale,
+            fallbackLocale: defaultOptions.fallbackLocale,
         };
     }
     if (BASE_NAVIGATOR) {
-        return {
-            locale: window.navigator.language,
-            fallbackLocale: window.navigator.language,
-        };
+        const keys = locales.map(item=> item.locale);
+        const findKey = keys.find(item=> item.includes(window.navigator.language))
+        if(findKey){
+            return {
+                locale: findKey,
+                fallbackLocale: defaultOptions.fallbackLocale,
+            };
+        }
     }
     return {
-        locale: 'zh-CN',
-        fallbackLocale: 'zh-CN',
+        locale: defaultOptions.locale,
+        fallbackLocale: defaultOptions.fallbackLocale,
     };
 };
 
diff --git a/packages/fes-template/src/locales/en-US.js b/packages/fes-template/src/locales/en-US.js
index 83d846978..a74ccafd4 100644
--- a/packages/fes-template/src/locales/en-US.js
+++ b/packages/fes-template/src/locales/en-US.js
@@ -4,6 +4,6 @@ export default {
     externalLink: 'externalLink',
     mock: 'mock',
     test: {
-        b: 1,
+        test: 'test',
     },
 };
diff --git a/packages/fes-template/src/locales/zh-CN.js b/packages/fes-template/src/locales/zh-CN.js
index d119327f0..66005531e 100644
--- a/packages/fes-template/src/locales/zh-CN.js
+++ b/packages/fes-template/src/locales/zh-CN.js
@@ -4,6 +4,6 @@ export default {
     externalLink: '外部链接',
     mock: '代理',
     test: {
-        b: 1,
+        test: '测试',
     },
 };
diff --git a/packages/fes-template/src/pages/index.vue b/packages/fes-template/src/pages/index.vue
index 6a1248629..4963e3395 100644
--- a/packages/fes-template/src/pages/index.vue
+++ b/packages/fes-template/src/pages/index.vue
@@ -13,7 +13,7 @@ import { FButton } from '@fesjs/fes-design';
 
 defineRouteMeta({
     name: 'index',
-    title: '$home',
+    title: '$test.test',
 });
 
 console.log('123123'.replaceAll('123', '234'));