diff --git a/backend/main.py b/backend/main.py index c0406301e..df3f884b3 100644 --- a/backend/main.py +++ b/backend/main.py @@ -99,7 +99,6 @@ from config import ( CHANGELOG, FRONTEND_BUILD_DIR, UPLOAD_DIR, - CACHE_DIR, STATIC_DIR, DEFAULT_LOCALE, diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index bd5d5a904..68c1e1596 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -92,16 +92,15 @@ // Initialize i18n even if we didn't get a backend config, // so `/error` can show something that's not `undefined`. - const languages = await getLanguages(); - const browserLanguages = navigator.languages - ? navigator.languages - : [navigator.language || navigator.userLanguage]; - const lang = backendConfig.default_locale - ? backendConfig.default_locale - : bestMatchingLanguage(languages, browserLanguages, 'en-US'); - initI18n(); if (!localStorage.locale) { + const languages = await getLanguages(); + const browserLanguages = navigator.languages + ? navigator.languages + : [navigator.language || navigator.userLanguage]; + const lang = backendConfig.default_locale + ? backendConfig.default_locale + : bestMatchingLanguage(languages, browserLanguages, 'en-US'); $i18n.changeLanguage(lang); }