scott/crabfit
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Set language defaults on initial load

Browse source
This commit is contained in:
Ben Grant 2021-05-31 23:14:36 +10:00
parent 615f316be2
commit 2f23fcfd32
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
crabfit-frontend/src/components/Settings/Settings.tsx
View file

@ -16,6 +16,14 @@ import {
import locales from 'res/dayjs_locales'; import locales from 'res/dayjs_locales';
// Language specific options
const setDefaults = (lang, store) => {
if (locales.hasOwnProperty(lang)) {
store.setWeekStart(locales[lang].weekStart);
store.setTimeFormat(locales[lang].timeFormat);
}
};
const Settings = () => { const Settings = () => {
const theme = useTheme(); const theme = useTheme();
const store = useSettingsStore(); const store = useSettingsStore();
@ -36,12 +44,13 @@ const Settings = () => {
} }
}, [i18n.language, setLocale]); }, [i18n.language, setLocale]);
i18n.on('languageChanged', lang => { if (!i18n.options.storedLang) {
// Language specific options setDefaults(i18n.language, store);
if (locales.hasOwnProperty(lang)) { i18n.options.storedLang = i18n.language;
store.setWeekStart(locales[lang].weekStart);
store.setTimeFormat(locales[lang].timeFormat);
} }
i18n.on('languageChanged', lang => {
setDefaults(lang, store);
}); });
return ( return (

3
crabfit-frontend/src/i18n/index.ts
View file

@ -5,6 +5,8 @@ import Backend from 'i18next-http-backend';
import locales from 'res/dayjs_locales'; import locales from 'res/dayjs_locales';
const storedLang = localStorage.getItem('i18nextLng');
i18n i18n
.use(LanguageDetector) .use(LanguageDetector)
.use(Backend) .use(Backend)
@ -21,6 +23,7 @@ i18n
backend: { backend: {
loadPath: '/i18n/{{lng}}/{{ns}}.json', loadPath: '/i18n/{{lng}}/{{ns}}.json',
}, },
storedLang,
}).then(() => document.documentElement.setAttribute('lang', i18n.language)); }).then(() => document.documentElement.setAttribute('lang', i18n.language));
export default i18n; export default i18n;