From 9f075b13405c7711edbd9309ab521738b74a50c5 Mon Sep 17 00:00:00 2001 From: Stanislas Signoud Date: Tue, 31 Dec 2024 22:27:14 +0100 Subject: Localize lang selectors according to the app language (#6207) * Localize lang selectors according to the app language * Explicitly ignore RangeError when translating locale names --- src/screens/Settings/LanguageSettings.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/screens/Settings/LanguageSettings.tsx') diff --git a/src/screens/Settings/LanguageSettings.tsx b/src/screens/Settings/LanguageSettings.tsx index 096f92566..8fece7129 100644 --- a/src/screens/Settings/LanguageSettings.tsx +++ b/src/screens/Settings/LanguageSettings.tsx @@ -6,7 +6,7 @@ import {useLingui} from '@lingui/react' import {APP_LANGUAGES, LANGUAGES} from '#/lib/../locale/languages' import {CommonNavigatorParams, NativeStackScreenProps} from '#/lib/routes/types' -import {sanitizeAppLanguageSetting} from '#/locale/helpers' +import {languageName, sanitizeAppLanguageSetting} from '#/locale/helpers' import {useModalControls} from '#/state/modals' import {useLanguagePrefs, useLanguagePrefsApi} from '#/state/preferences' import {atoms as a, useTheme, web} from '#/alf' @@ -57,10 +57,10 @@ export function LanguageSettingsScreen({}: Props) { .map(lang => LANGUAGES.find(l => l.code2 === lang)) .filter(Boolean) // @ts-ignore - .map(l => l.name) + .map(l => languageName(l, langPrefs.appLanguage)) .join(', ') ) - }, [langPrefs.contentLanguages]) + }, [langPrefs.appLanguage, langPrefs.contentLanguages]) return ( @@ -179,7 +179,7 @@ export function LanguageSettingsScreen({}: Props) { value={langPrefs.primaryLanguage} onValueChange={onChangePrimaryLanguage} items={LANGUAGES.filter(l => Boolean(l.code2)).map(l => ({ - label: l.name, + label: languageName(l, langPrefs.appLanguage), value: l.code2, key: l.code2 + l.code3, }))} -- cgit 1.4.1