zoriya/flood
1
0
Fork 0
mirror of https://github.com/zoriya/flood.git synced 2026-06-03 19:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

i18n: properly handle language fallback

Browse Source
This commit is contained in:
Jesse Chan
2021-01-29 21:35:43 +08:00
parent 8b2b50529c
commit 008c083550
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.linguirc
-5
View File
@@ -31,11 +31,6 @@
"zh-Hant"
],
"sourceLocale": "en",
"fallbackLocales": {
"zh-Hans": "zh-Hant",
"zh-Hant": "zh-Hans",
"default": "en"
},
"catalogs": [
{
"path": "client/src/javascript/i18n/strings/{locale}",
client/src/javascript/i18n/languages.tsx
+1 -1
View File
@@ -64,7 +64,7 @@ const AsyncIntlProvider: FC<AsyncIntlProviderProps> = observer(({children}: Asyn
} else {
i18n.loadLocaleData(validatedLocale.locale, {plurals: plurals[validatedLocale.language]});
}
i18n.load(validatedLocale.locale, await getMessages(validatedLocale.language));
i18n.load(validatedLocale.locale, {...EN, ...(await getMessages(validatedLocale.language))});
i18n.activate(validatedLocale.locale);
})();
}, [language]);