forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
Patch bad migration, sanitize bad value (#2179)
authored by
Eric Bailey
and committed by
GitHub
bae63f9b
3592f6f5
+18
-3
+12
src/locale/helpers.ts
+12
src/locale/helpers.ts
···
84
84
text,
85
85
)}`
86
86
}
87
+
88
+
export function sanitizeAppLanguageSetting(appLanguage: string) {
89
+
const langs = appLanguage.split(',').filter(Boolean)
90
+
91
+
for (const lang of langs) {
92
+
if (['en', 'hi'].includes(lang)) {
93
+
return lang
94
+
}
95
+
}
96
+
97
+
return 'en'
98
+
}
+2
-1
src/locale/i18n.ts
+2
-1
src/locale/i18n.ts
···
4
4
import {useLanguagePrefs} from '#/state/preferences'
5
5
import {messages as messagesEn} from '#/locale/locales/en/messages'
6
6
import {messages as messagesHi} from '#/locale/locales/hi/messages'
7
+
import {sanitizeAppLanguageSetting} from '#/locale/helpers'
7
8
8
9
export const locales = {
9
10
en: 'English',
···
26
27
export async function useLocaleLanguage() {
27
28
const {appLanguage} = useLanguagePrefs()
28
29
useEffect(() => {
29
-
dynamicActivate(appLanguage)
30
+
dynamicActivate(sanitizeAppLanguageSetting(appLanguage))
30
31
}, [appLanguage])
31
32
}
+2
-1
src/locale/i18n.web.ts
+2
-1
src/locale/i18n.web.ts
···
2
2
import {i18n} from '@lingui/core'
3
3
4
4
import {useLanguagePrefs} from '#/state/preferences'
5
+
import {sanitizeAppLanguageSetting} from '#/locale/helpers'
5
6
6
7
export const locales = {
7
8
en: 'English',
···
29
30
export async function useLocaleLanguage() {
30
31
const {appLanguage} = useLanguagePrefs()
31
32
useEffect(() => {
32
-
dynamicActivate(appLanguage)
33
+
dynamicActivate(sanitizeAppLanguageSetting(appLanguage))
33
34
}, [appLanguage])
34
35
}
+2
-1
src/state/persisted/legacy.ts
+2
-1
src/state/persisted/legacy.ts
···
94
94
legacy.preferences?.postLanguageHistory ||
95
95
defaults.languagePrefs.postLanguageHistory,
96
96
appLanguage:
97
-
legacy.preferences?.postLanguage || defaults.languagePrefs.appLanguage,
97
+
legacy.preferences?.primaryLanguage ||
98
+
defaults.languagePrefs.appLanguage,
98
99
},
99
100
requireAltTextEnabled:
100
101
legacy.preferences?.requireAltTextEnabled ||