feat: use settings saved lang

felixmosh · May 28, 2024 · f303f2a · f303f2a
1 parent 3c82378
commit f303f2a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/packages/ui/src/index.tsx b/packages/ui/src/index.tsx
@@ -5,6 +5,7 @@ import { BrowserRouter } from 'react-router-dom';
 import { App } from './App';
 import { ApiContext } from './hooks/useApi';
 import './index.css';
+import { useSettingsStore } from './hooks/useSettings';
 import { UIConfigContext } from './hooks/useUIConfig';
 import { Api } from './services/Api';
 import './theme.css';
@@ -18,7 +19,10 @@ const uiConfig = JSON.parse(
   document.getElementById('__UI_CONFIG__')?.textContent || '{}'
 ) as UIConfig;
 
-initI18n({ lng: uiConfig.locale?.lng || navigator.language || 'en-US', basePath }).then(() => {
+const settingsLang = useSettingsStore.getState().language;
+const lng = settingsLang || uiConfig.locale?.lng || navigator.language || 'en-US';
+
+initI18n({ lng, basePath }).then(() => {
   render(
     <BrowserRouter basename={basePath}>
       <UIConfigContext.Provider value={uiConfig}>