diff --git a/CHANGELOG.md b/CHANGELOG.md index 411fb657..592c8218 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ and this project adheres to ### Fixed +- 🐛(languages) fix currentLanguage in profile menu - ✨(mailboxes) enforce lowercase on mailboxes - 🐛(i18n) fix missing translations for status tag labels - 🚚(route) prioritize mail domains as default landing page diff --git a/src/frontend/apps/desk/src/features/language/LanguagePicker.tsx b/src/frontend/apps/desk/src/features/language/LanguagePicker.tsx index e91c5b0b..3752c5b3 100644 --- a/src/frontend/apps/desk/src/features/language/LanguagePicker.tsx +++ b/src/frontend/apps/desk/src/features/language/LanguagePicker.tsx @@ -10,11 +10,13 @@ export const LanguagePicker = () => { const { i18n } = useTranslation(); const { preload: languages } = i18n.options; Settings.defaultLocale = i18n.language; + const currentLanguage = Settings.defaultLocale; const optionsPicker = useMemo(() => { return (languages || []).map((lang) => ({ value: lang, label: LANGUAGES_ALLOWED[lang], + isChecked: lang === currentLanguage, render: () => ( { ), })); - }, [languages]); + }, [languages, currentLanguage]); useEffect(() => { if (typeof document !== 'undefined') { - document.documentElement.lang = i18n.language; + document.documentElement.lang = currentLanguage || i18n.language; } - }, [i18n.language]); + }, [currentLanguage, i18n.language]); return ( {