From 4b42e40817527f0ea5a85350656f64d3b1adfe6a Mon Sep 17 00:00:00 2001 From: Xylight Date: Thu, 1 Aug 2024 09:50:12 -0700 Subject: [PATCH] i18n: add language aliasing --- src/lib/i18n/en.json | 13 +------- src/lib/translations.ts | 20 ++++++++++++ src/routes/+layout.server.ts | 6 ++-- src/routes/+layout.ts | 6 ++-- src/routes/settings/+page.svelte | 52 +++++++++++++++++++++++++++----- 5 files changed, 71 insertions(+), 26 deletions(-) diff --git a/src/lib/i18n/en.json b/src/lib/i18n/en.json index 825b5170..2028027f 100644 --- a/src/lib/i18n/en.json +++ b/src/lib/i18n/en.json @@ -629,19 +629,8 @@ "lang": { "title": "Language", "description": "The language used for Photon's UI.", - "note": "Languages other than English and Hebrew are community translated, and may be incomplete.", - "en": "English", - "en-US": "English", - "he": "Hebrew", - "et": "Estonian", - "fr": "French", - "de": "German", - "fi": "Finnish", - "pt": "Portuguese", - "zh": "Chinese", - "zh-Hans": "Chinese (Simplified)", - "zh-Hant": "Chinese (Traditional)", "auto": "Auto", + "community": "Community", "credits": "Credits", "useRtl": { "title": "Use RTL layout", diff --git a/src/lib/translations.ts b/src/lib/translations.ts index 4a5709fe..fa289360 100644 --- a/src/lib/translations.ts +++ b/src/lib/translations.ts @@ -51,6 +51,26 @@ const config: Config = { fallbackLocale: 'en', } +export const aliases = new Map([ + ['zh-CN', 'zh-Hans'], + ['zh-TW', 'zh-Hant'], + ['en-US', 'en'], + ['en-GB', 'en'], + ['en-AU', 'en'], + ['en-CA', 'en'], + ['fr-FR', 'fr'], + ['fr-CA', 'fr'], + ['fr-BE', 'fr'], + ['de-DE', 'de'], + ['de-AT', 'de'], + ['de-CH', 'de'], + ['pt-BR', 'pt'], + ['pt-PT', 'pt'], + ['fi-FI', 'fi'], + ['et-EE', 'et'], + ['he-IL', 'he'], +]) + export const { t, locale, locales, loading, loadTranslations } = new i18n( config ) diff --git a/src/routes/+layout.server.ts b/src/routes/+layout.server.ts index 747d1d80..1de191b4 100644 --- a/src/routes/+layout.server.ts +++ b/src/routes/+layout.server.ts @@ -1,4 +1,4 @@ -import { loadTranslations, locales } from '$lib/translations.js' +import { aliases, loadTranslations, locales } from '$lib/translations.js' import { get } from 'svelte/store' export const load = async ({ url, request }) => { @@ -13,8 +13,8 @@ export const load = async ({ url, request }) => { } for (const lang of languages.reverse()) { const splitLang = lang.split(';')[0] - if (availableLangs.includes(splitLang)) { - preferredLanguage = splitLang + if (availableLangs.includes(splitLang) || aliases.get(splitLang)) { + preferredLanguage = aliases.get(splitLang) || splitLang } } await loadTranslations(preferredLanguage) diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index 53021d84..96d352ff 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -1,7 +1,7 @@ import { browser } from '$app/environment' import { env } from '$env/dynamic/public' import { userSettings } from '$lib/settings.js' -import { loadTranslations } from '$lib/translations.js' +import { aliases, loadTranslations } from '$lib/translations.js' import { get } from 'svelte/store' export let ssr = (env.PUBLIC_SSR_ENABLED?.toLowerCase() ?? 'false') == 'true' @@ -11,9 +11,9 @@ export const load = async ({}) => { const initLocale = get(userSettings)?.language ?? navigator?.language ?? 'en' - console.log(`Loading locale ${initLocale}`) + console.log(`Loading locale ${aliases.get(initLocale) ?? initLocale}`) - await loadTranslations(initLocale) + await loadTranslations(aliases.get(initLocale) ?? initLocale) } return diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte index 6299807c..f7fb8a64 100644 --- a/src/routes/settings/+page.svelte +++ b/src/routes/settings/+page.svelte @@ -29,6 +29,7 @@ ChevronRight, GlobeAmericas, Icon, + Language, Plus, Trash, } from 'svelte-hero-icons' @@ -47,6 +48,25 @@ let pin: string = '' let importing = false let importText = '' + + let localeMap: Map< + string, + { + name: string + translated: number + flag: string + } + > = new Map([ + ['en', { name: 'English', translated: 1, flag: '🇺🇸' }], + ['et', { name: 'Eesti keel', translated: 0.25, flag: '🇪🇪' }], + ['fi', { name: 'Suomi', translated: 0.99, flag: '🇫🇮' }], + ['fr', { name: 'Français', translated: 0.76, flag: '🇫🇷' }], + ['de', { name: 'Deutsch', translated: 0.81, flag: '🇩🇪' }], + ['he', { name: 'עברית', translated: 0.39, flag: '🇮🇱' }], + ['pt', { name: 'Português', translated: 0.87, flag: '🇵🇹' }], + ['zh-Hans', { name: '简体中文', translated: 0.96, flag: '🇨🇳' }], + ['zh-Hant', { name: '繁體中文', translated: 0.27, flag: '🇭🇰' }], + ]) @@ -207,23 +227,32 @@

{$t('settings.app.lang.description')} - - {$t('settings.app.lang.note')} - {$t('settings.app.lang.credits')}

+ {#if $locale == 'he'} @@ -605,3 +634,10 @@ /> + +