Merge remote-tracking branch 'origin/main'

2025-06-18 19:55:01 +08:00
parent 39c2e05121 9c2d91ba96
commit d2890a25b6
6 changed files with 21 additions and 6 deletions
--- a/src/locales/locale.ts
+++ b/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;