Fix locale-related bugs and test it with screenshots

src/lib/i18n/index.ts

@@ -8,11 +8,23 @@ register('nl', () => import('../locales/nl.json'));
 register('es', () => import('../locales/es.json'));
 register('de', () => import('../locales/de.json'));
 
+const getInitialLocale = () => {
+	if (!browser) return defaultLocale;
+
+	// Check localStorage first
+	const storedLocale = localStorage.getItem('locale');
+	if (storedLocale) return storedLocale;
+
+	// Get browser locale and normalize it
+	const browserLocale = window.navigator.language;
+	const normalizedLocale = browserLocale.split('-')[0].toLowerCase();
+
+	// Check if we support this locale
+	const supportedLocales = ['en', 'nl', 'es', 'de'];
+	return supportedLocales.includes(normalizedLocale) ? normalizedLocale : defaultLocale;
+};
+
 init({
 	fallbackLocale: defaultLocale,
-	initialLocale: browser
-		? browser && localStorage.getItem('locale')
-			? localStorage.getItem('locale')
-			: window.navigator.language.slice(0, 2)
-		: defaultLocale
+	initialLocale: getInitialLocale()
 });

src/routes/+layout.svelte

@@ -17,6 +17,7 @@
 	import { page } from '$app/stores';
 	import { locale, locales, isLoading } from 'svelte-i18n';
 	import { ColorSchemeSwitcher } from '$lib/components';
+	import { derived } from 'svelte/store';
 
 	export const setLocale = (lang: string) => () => {
 		locale.set(lang);
@@ -45,13 +46,14 @@
 
 	let languageNames = {};
 
-	locale.subscribe(() => {
-		if ($locale) {
-			let newLanguageNames = new Intl.DisplayNames([$locale], { type: 'language' });
+	const currentLocale = derived(locale, ($locale) => $locale || 'en');
 
-			for (let l of $locales) {
-				languageNames[l] = newLanguageNames.of(l);
-			}
+	locale.subscribe(() => {
+		const localeToUse = $locale || 'en';
+		let newLanguageNames = new Intl.DisplayNames([localeToUse], { type: 'language' });
+
+		for (let l of $locales) {
+			languageNames[l] = newLanguageNames.of(l) || l;
 		}
 	});
 
@@ -95,7 +97,10 @@
 		</Nav>
 		{#if !$isLoading}
 			<Dropdown id="nav-language-dropdown" inNavbar class="me-3">
-				<DropdownToggle nav caret>{getFlagEmoji($locale)} {languageNames[$locale]}</DropdownToggle>
+				<DropdownToggle nav caret
+					>{getFlagEmoji($currentLocale)}
+					{languageNames[$currentLocale] || 'English'}</DropdownToggle
+				>
 				<DropdownMenu end>
 					{#each $locales as locale}
 						<DropdownItem on:click={setLocale(locale)}

src/routes/+layout.ts

@@ -6,10 +6,15 @@ import { locale, waitLocale } from 'svelte-i18n';
 import type { LayoutLoad } from './$types';
 
 export const load: LayoutLoad = async () => {
-	if (browser && localStorage.getItem('locale')) {
-		locale.set(localStorage.getItem('locale'));
-	} else if (browser) {
-		locale.set(window.navigator.language);
+	if (browser) {
+		if (localStorage.getItem('locale')) {
+			locale.set(localStorage.getItem('locale'));
+		} else {
+			// Normalize the browser locale
+			const browserLocale = window.navigator.language.split('-')[0].toLowerCase();
+			const supportedLocales = ['en', 'nl', 'es', 'de'];
+			locale.set(supportedLocales.includes(browserLocale) ? browserLocale : 'en');
+		}
 	}
 	await waitLocale();
 };