github-mirrors/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2026-05-18 03:10:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(web): normalize underscore locale codes in dynamic language selection (#27900)

Browse Source 
Co-authored-by: Daniel Dietzler <mail@ddietzler.dev>
This commit is contained in:
Junghwan
2026-04-22 22:28:33 +09:00
committed by GitHub
parent 1fb5f13237
commit 317afe9e3b
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/lib/i18n.spec.ts
+8
View File
@@ -50,5 +50,13 @@ describe('i18n', () => {
expect(getClosestAvailableLocale(['zh'], allLocales)).toBeUndefined(); expect(getClosestAvailableLocale(['zh'], allLocales)).toBeUndefined();
expect(getClosestAvailableLocale(['de', 'zh', 'en-US'], allLocales)).toBe('en-US'); expect(getClosestAvailableLocale(['de', 'zh', 'en-US'], allLocales)).toBe('en-US');
}); });
it('matches underscore-based stored locale codes against normalized locale lists', () => {
const allLocales = ['de-CH', 'pt-BR', 'sr-Cyrl', 'zh-Hant'];
expect(getClosestAvailableLocale(['de_CH'], allLocales)).toBe('de_CH');
expect(getClosestAvailableLocale(['pt_BR'], allLocales)).toBe('pt_BR');
expect(getClosestAvailableLocale(['sr_Cyrl'], allLocales)).toBe('sr_Cyrl');
expect(getClosestAvailableLocale(['zh_Hant'], allLocales)).toBe('zh_Hant');
});
}); });
}); });
web/src/lib/utils/i18n.ts
+3 -3
View File
@@ -19,20 +19,20 @@ const fileCodes = Object.keys(modules)
.map((path) => path.match(/\/(\w+)\.json$/)?.[1]) .map((path) => path.match(/\/(\w+)\.json$/)?.[1])
.filter(Boolean) as string[]; .filter(Boolean) as string[];
const convertBCP47 = (code: string) => code.replace('_', '-'); const convertBCP47 = (code: string) => code.replaceAll('_', '-');
export const langCodes = fileCodes.map((code) => convertBCP47(code)); export const langCodes = fileCodes.map((code) => convertBCP47(code));
// https://github.com/kaisermann/svelte-i18n/blob/780932a3e1270d521d348aac8ba03be9df309f04/src/runtime/stores/locale.ts#L11 // https://github.com/kaisermann/svelte-i18n/blob/780932a3e1270d521d348aac8ba03be9df309f04/src/runtime/stores/locale.ts#L11
const getSubLocales = (locale: string) => { const getSubLocales = (locale: string) => {
return locale return convertBCP47(locale)
.split('-') .split('-')
.map((_, i, arr) => arr.slice(0, i + 1).join('-')) .map((_, i, arr) => arr.slice(0, i + 1).join('-'))
.reverse(); .reverse();
}; };
export const getClosestAvailableLocale = (locales: readonly string[], allLocales: readonly string[]) => { export const getClosestAvailableLocale = (locales: readonly string[], allLocales: readonly string[]) => {
const allLocalesSet = new Set(allLocales); const allLocalesSet = new Set(allLocales.map((locale) => convertBCP47(locale)));
return locales.find((locale) => getSubLocales(locale).some((subLocale) => allLocalesSet.has(subLocale))); return locales.find((locale) => getSubLocales(locale).some((subLocale) => allLocalesSet.has(subLocale)));
}; };