Merge remote-tracking branch 'origin/main'

src/locales/locale.ts

@@ -1,9 +1,12 @@
-import zhCN from './langs/zh-cn';
-import enUS from './langs/en-us';
+import localeZhCN from './langs/zh-cn';
+import localeEnUS from './langs/en-us';
+
+const fullZhCN = { ...localeZhCN, ...zhCN };
+const fullEnUS = { ...localeEnUS, ...enUS };
 
 const locales: Record<App.I18n.LangType, App.I18n.Schema> = {
-  'zh-CN': zhCN,
-  'en-US': enUS
+  'zh-CN': fullZhCN,
+  'en-US': fullEnUS
 };
 
 export default locales;

src/views/_builtin/login/index.vue

@@ -58,7 +58,7 @@ const bgColor = computed(() => {
         <header class="flex items-center justify-center relative w-full">
           <div class="flex items-center">
             <WifiOutlined class="text-64px text-primary lt-sm:text-48px" style="margin-left: 9px"/>
-            <h3 class="text-10px text-primary font-medium self-end">{{ "WANFi" }}</h3>
+            <h3 class="text-10px text-primary font-medium self-end">{{ $t('system.title') }}</h3>
           </div>
           <div class="absolute right-0">
             <LangSwitch :lang="appStore.locale" :lang-options="appStore.localeOptions" @change-lang="appStore.changeLocale" />