From 008c08355007c4990958e4f4184d807a2b0ceb7b Mon Sep 17 00:00:00 2001
From: Jesse Chan <jc@linux.com>
Date: Fri, 29 Jan 2021 21:35:43 +0800
Subject: [PATCH] i18n: properly handle language fallback

---
 .linguirc                                | 5 -----
 client/src/javascript/i18n/languages.tsx | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.linguirc b/.linguirc
index 95f26abd..c3fd472e 100644
--- a/.linguirc
+++ b/.linguirc
@@ -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}",
diff --git a/client/src/javascript/i18n/languages.tsx b/client/src/javascript/i18n/languages.tsx
index 2ac0af60..7bd38c2c 100644
--- a/client/src/javascript/i18n/languages.tsx
+++ b/client/src/javascript/i18n/languages.tsx
@@ -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]);