fix: english was not considered in the order of user-languages #152
Massimo Melina committed
Mar 14, 2023 at 11:48 UTC
bda34c3dd2ece62275a97bd32be490d0d16f1815
2 files changed
+3
-2
frontend/src/i18n.ts
+1
-1
@@ -26,7 +26,7 @@ export function tComponent(...par: Parameters<typeof t>) {
26
export function I18Nprovider({ embedded='en', ...props }) {
27
const langs = urlParams.lang?.split(',') || navigator.languages
28
state.embedded = embedded
29
- let all = useApi(langs[0] !== 'en' && 'load_lang', { lang: langs }, { noModal: true })
29
+ let all = useApi(langs[0] !== embedded && 'load_lang', { embedded, lang: langs }, { noModal: true })
30
useEffect(() => {
31
if (all instanceof Error)
32
all = undefined
src/frontEndApis.ts
+2
-1
@@ -73,11 +73,12 @@ export const frontEndApis: ApiHandlers = {
73
}
74
},
75
76
- async load_lang({ lang }) {
76
+ async load_lang({ lang, embedded }) {
77
const ret: any = {}
78
const langs = wantArray(lang)
79
for (let k of langs) {
80
k = k.toLowerCase()
81
+ if (k === embedded) break
82
try { ret[k] = JSON.parse(await readFile(`hfs-lang-${k}.json`, 'utf8')) }
83
catch {
84
while (1) {