Mirrors/cobalt
1
0
Fork 0
mirror of https://github.com/wukko/cobalt.git synced 2025-06-12 13:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

web: refactor and deduplicate locale preference logic

Browse Source
This commit is contained in:
dumbmoron
2024-07-20 14:37:52 +00:00
parent d4d4eded32
commit 8a080c55f6
7 changed files with 40 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
web/src/routes/+layout.ts
View File

@ -6,7 +6,6 @@ import { browser } from '$app/environment';
import { get } from 'svelte/store';
import type { Load } from '@sveltejs/kit';
import languages from '$i18n/languages.json';
import { loadTranslations, defaultLocale } from '$lib/i18n/translations';
export const load: Load = async ({ url }) => {
@ -15,22 +14,7 @@ export const load: Load = async ({ url }) => {
let preferredLocale = defaultLocale;
if (browser) {
const device = (await import('$lib/device')).device;
const settings = get((await import('$lib/state/settings')).default);
const deviceLanguage = device.prefers.language;
const settingsLanguage = settings.appearance.language;
const isValid = (lang: string) => (
Object.keys(languages).includes(lang)
);
if (settings.appearance.autoLanguage) {
if (isValid(deviceLanguage)) {
preferredLocale = deviceLanguage;
}
} else if (isValid(settingsLanguage)) {
preferredLocale = settingsLanguage
}
preferredLocale = get((await import('$lib/i18n/locale')).default);
}
await loadTranslations(preferredLocale, pathname);