zio
/
bsky-app
2
0
Fork 0
Code Pull Requests Packages Releases Activity

Prevent invalid locale from being loaded (#2099)

zio/stable
Eric Bailey 2023-12-05 19:51:50 -06:00 committed by GitHub
parent fab9f839d0
commit a915a57b10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/locale/i18n.ts
View File

@ -1,8 +1,9 @@
import {useLanguagePrefs} from '#/state/preferences'
import {i18n} from '@lingui/core'
import {useEffect} from 'react'
import {messages as messagesEn} from './locales/en/messages'
import {messages as messagesHi} from './locales/hi/messages'
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'
export const locales = {
en: 'English',
@ -18,15 +19,10 @@ export const defaultLocale = 'en'
* @param locale any locale string
*/
export async function dynamicActivate(locale: string) {
if (locale === 'en') {
i18n.loadAndActivate({locale, messages: messagesEn})
return
} else if (locale === 'hi') {
if (locale === 'hi') {
i18n.loadAndActivate({locale, messages: messagesHi})
return
} else {
i18n.loadAndActivate({locale, messages: messagesEn})
return
}
}

16
src/locale/i18n.web.ts
View File

@ -1,6 +1,7 @@
import {useLanguagePrefs} from '#/state/preferences'
import {i18n} from '@lingui/core'
import {useEffect} from 'react'
import {i18n} from '@lingui/core'
import {useLanguagePrefs} from '#/state/preferences'
export const locales = {
en: 'English',
@ -16,8 +17,15 @@ export const defaultLocale = 'en'
* @param locale any locale string
*/
export async function dynamicActivate(locale: string) {
const {messages} = await import(`./locales/${locale}/messages`)
i18n.load(locale, messages)
let mod: any
if (locale === 'hi') {
mod = await import(`./locales/hi/messages`)
} else {
mod = await import(`./locales/en/messages`)
}
i18n.load(locale, mod.messages)
i18n.activate(locale)
}

4
src/view/screens/LanguageSettings.tsx
View File

@ -48,6 +48,7 @@ export function LanguageSettingsScreen(_props: Props) {
const onChangePrimaryLanguage = React.useCallback(
(value: Parameters<PickerSelectProps['onValueChange']>[0]) => {
if (!value) return
if (langPrefs.primaryLanguage !== value) {
setLangPrefs.setPrimaryLanguage(value)
}
@ -57,6 +58,7 @@ export function LanguageSettingsScreen(_props: Props) {
const onChangeAppLanguage = React.useCallback(
(value: Parameters<PickerSelectProps['onValueChange']>[0]) => {
if (!value) return
if (langPrefs.appLanguage !== value) {
setLangPrefs.setAppLanguage(value)
}
@ -100,6 +102,7 @@ export function LanguageSettingsScreen(_props: Props) {
<View style={{position: 'relative'}}>
<RNPickerSelect
placeholder={{}}
value={langPrefs.appLanguage}
onValueChange={onChangeAppLanguage}
items={APP_LANGUAGES.filter(l => Boolean(l.code2)).map(l => ({
@ -190,6 +193,7 @@ export function LanguageSettingsScreen(_props: Props) {
<View style={{position: 'relative'}}>
<RNPickerSelect
placeholder={{}}
value={langPrefs.primaryLanguage}
onValueChange={onChangePrimaryLanguage}
items={LANGUAGES.filter(l => Boolean(l.code2)).map(l => ({