Patch bad migration, sanitize bad value (#2179)

zio/stable
Eric Bailey 2023-12-11 17:34:18 -06:00 committed by GitHub
parent 3592f6f50b
commit bae63f9bf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 3 deletions

View File

@ -84,3 +84,15 @@ export function getTranslatorLink(text: string, lang: string): string {
text,
)}`
}
export function sanitizeAppLanguageSetting(appLanguage: string) {
const langs = appLanguage.split(',').filter(Boolean)
for (const lang of langs) {
if (['en', 'hi'].includes(lang)) {
return lang
}
}
return 'en'
}

View File

@ -4,6 +4,7 @@ import {i18n} from '@lingui/core'
import {useLanguagePrefs} from '#/state/preferences'
import {messages as messagesEn} from '#/locale/locales/en/messages'
import {messages as messagesHi} from '#/locale/locales/hi/messages'
import {sanitizeAppLanguageSetting} from '#/locale/helpers'
export const locales = {
en: 'English',
@ -26,6 +27,6 @@ export async function dynamicActivate(locale: string) {
export async function useLocaleLanguage() {
const {appLanguage} = useLanguagePrefs()
useEffect(() => {
dynamicActivate(appLanguage)
dynamicActivate(sanitizeAppLanguageSetting(appLanguage))
}, [appLanguage])
}

View File

@ -2,6 +2,7 @@ import {useEffect} from 'react'
import {i18n} from '@lingui/core'
import {useLanguagePrefs} from '#/state/preferences'
import {sanitizeAppLanguageSetting} from '#/locale/helpers'
export const locales = {
en: 'English',
@ -29,6 +30,6 @@ export async function dynamicActivate(locale: string) {
export async function useLocaleLanguage() {
const {appLanguage} = useLanguagePrefs()
useEffect(() => {
dynamicActivate(appLanguage)
dynamicActivate(sanitizeAppLanguageSetting(appLanguage))
}, [appLanguage])
}

View File

@ -94,7 +94,8 @@ export function transform(legacy: Partial<LegacySchema>): Schema {
legacy.preferences?.postLanguageHistory ||
defaults.languagePrefs.postLanguageHistory,
appLanguage:
legacy.preferences?.postLanguage || defaults.languagePrefs.appLanguage,
legacy.preferences?.primaryLanguage ||
defaults.languagePrefs.appLanguage,
},
requireAltTextEnabled:
legacy.preferences?.requireAltTextEnabled ||