From 07d3bb2bb9cfafd7a4a0a813c6b1a013458c296c Mon Sep 17 00:00:00 2001 From: callmeyan Date: Sat, 25 Jan 2025 15:02:45 +0800 Subject: [PATCH] =?UTF-8?q?fixed:=20=E7=BC=96=E8=AF=91=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/config.ts | 3 ++- src/routes/index.tsx | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/i18n/config.ts b/src/i18n/config.ts index 0a0e201..a13dcbf 100644 --- a/src/i18n/config.ts +++ b/src/i18n/config.ts @@ -3,9 +3,10 @@ import {initReactI18next} from 'react-i18next'; import LangEN from './translations/en-US.json'; import LangCN from './translations/zh-CN.json'; -console.log('AppConfig',AppMode) +console.log('AppConfig',AppMode,AppConfig) i18next.use(initReactI18next).init({ debug: true, + lng: (AppConfig.APP_LANG || 'zh-CN').trim(), fallbackLng: 'en-US', resources: { 'en-US': {translation:LangEN}, diff --git a/src/routes/index.tsx b/src/routes/index.tsx index c33ff43..aa978ea 100644 --- a/src/routes/index.tsx +++ b/src/routes/index.tsx @@ -31,16 +31,16 @@ const router = createBrowserRouter([ const {globalConfig} = useGlobalConfig(); // future={{v7_startTransition: true,v7_relativeSplatPath: true}} const AppRouter = () => { - const {t,i18n:langConfig} = useTranslation(); - const {i18n} = useConfig(); + const {t,i18n} = useTranslation(); + useEffect(() => { - if (i18n && i18n == 'zh-CN') { + if (i18n && i18n.language == 'zh-CN') { dayjs.locale('zh-cn'); }else{ dayjs.locale('en') } - globalConfig.i18n = i18n - langConfig.changeLanguage(i18n).then(()=>console.log('change lang to ',i18n)) + globalConfig.i18n = i18n.language + // i18n.changeLanguage(i18n).then(()=>console.log('change lang to ',i18n)) }, [i18n]) return (