helpy4/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2026-08-15 13:03:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: web i18n (#29175)

Browse source
This commit is contained in:
Daniel Dietzler 2026-06-17 18:36:48 +02:00 • committed by GitHub
parent 14f6f2c04f
commit ad9817c582
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
web/src/lib/components/shared-components/settings/SettingsLanguageSelector.svelte
View file

@ -3,7 +3,7 @@
import Combobox from '$lib/components/shared-components/Combobox.svelte';
import { defaultLang } from '$lib/constants';
import { lang } from '$lib/stores/preferences.store';
import { getClosestAvailableLocale, langCodes, langs } from '$lib/utils/i18n';
import { convertBCP47, getClosestAvailableLocale, langCodes, langs } from '$lib/utils/i18n';
import { Label, Text } from '@immich/ui';
import { locale as i18nLocale, t } from 'svelte-i18n';
@ -13,14 +13,14 @@
let { showSettingDescription = false }: Props = $props();
const langOptions = langs.map((lang) => ({ label: lang.name, value: lang.code }));
const langOptions = langs.map((lang) => ({ label: lang.name, value: convertBCP47(lang.code) }));
const defaultLangOption = { label: defaultLang.name, value: defaultLang.code };
const handleLanguageChange = async (newLang: string | undefined) => {
if (newLang) {
$lang = newLang;
await i18nLocale.set(newLang);
await i18nLocale.set(convertBCP47(newLang));
await invalidateAll();
}
};

6
web/src/lib/stores/preferences.store.ts
View file

@ -1,12 +1,12 @@
import { persisted } from 'svelte-persisted-store';
import { browser } from '$app/environment';
import { defaultLang } from '$lib/constants';
import { getPreferredLocale } from '$lib/utils/i18n';
import { convertBCP47, getPreferredLocale } from '$lib/utils/i18n';
// Locale to use for formatting dates, numbers, etc.
export const locale = persisted('locale', 'default', {
serializer: {
parse: (text) => text || 'default',
parse: (text) => convertBCP47(text) || 'default',
stringify: (object) => object ?? '',
},
});
@ -14,7 +14,7 @@ export const locale = persisted('locale', 'default', {
const preferredLocale = browser ? getPreferredLocale() : undefined;
export const lang = persisted<string>('lang', preferredLocale || defaultLang.code, {
serializer: {
parse: (text) => text,
parse: (text) => convertBCP47(text),
stringify: (object) => object ?? '',
},
});

4
web/src/lib/utils.ts
View file

@ -28,7 +28,7 @@ import { downloadManager } from '$lib/managers/download-manager.svelte';
import { alwaysLoadOriginalFile, lang } from '$lib/stores/preferences.store';
import { isWebCompatibleImage } from '$lib/utils/asset-utils';
import { handleError } from '$lib/utils/handle-error';
import { langs } from '$lib/utils/i18n';
import { convertBCP47, langs } from '$lib/utils/i18n';
interface DownloadRequestOptions<T = unknown> {
method?: 'GET' | 'POST' | 'PUT' | 'DELETE';
@ -47,7 +47,7 @@ interface DateFormatter {
export const initLanguage = async () => {
const preferenceLang = get(lang);
for (const { code, loader } of langs) {
register(code, loader);
register(convertBCP47(code), loader);
}
await init({ fallbackLocale: preferenceLang === 'dev' ? 'dev' : defaultLang.code, initialLocale: preferenceLang });

2
web/src/lib/utils/i18n.ts
View file

@ -19,7 +19,7 @@ const fileCodes = Object.keys(modules)
.map((path) => path.match(/\/(\w+)\.json$/)?.[1])
.filter(Boolean) as string[];
const convertBCP47 = (code: string) => code.replaceAll('_', '-');
export const convertBCP47 = (code: string) => code.replaceAll('_', '-');
export const langCodes = fileCodes.map((code) => convertBCP47(code));