From 391fd5572130aef101dd1137f0afe2a0f2fa124c Mon Sep 17 00:00:00 2001 From: Muhammed Mustafa Date: Fri, 20 Oct 2023 18:55:25 +0530 Subject: [PATCH 1/2] fix: Fixed i18n fallback locale not loading issue --- packages/nc-gui/plugins/state.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/nc-gui/plugins/state.ts b/packages/nc-gui/plugins/state.ts index de92471e5b..a519e1ef32 100644 --- a/packages/nc-gui/plugins/state.ts +++ b/packages/nc-gui/plugins/state.ts @@ -25,6 +25,7 @@ const statePlugin = async (_nuxtApp) => { /** force load initial locale messages */ await loadLocaleMessages(currentLang) + await loadLocaleMessages('en') /** set i18n locale to stored language */ await setI18nLanguage(currentLang) From 7b7e53988f4877166b0e405f8106064ff14d9c20 Mon Sep 17 00:00:00 2001 From: Muhammed Mustafa Date: Fri, 20 Oct 2023 18:59:10 +0530 Subject: [PATCH 2/2] fix: Fixed i18n fallback locale not loading issue --- packages/nc-gui/plugins/state.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/nc-gui/plugins/state.ts b/packages/nc-gui/plugins/state.ts index a519e1ef32..0bd042af0b 100644 --- a/packages/nc-gui/plugins/state.ts +++ b/packages/nc-gui/plugins/state.ts @@ -24,8 +24,7 @@ const statePlugin = async (_nuxtApp) => { if (![...Object.keys(Language), ...Object.keys(LanguageAlias)].includes(currentLang)) state.lang.value = currentLang = 'en' /** force load initial locale messages */ - await loadLocaleMessages(currentLang) - await loadLocaleMessages('en') + await Promise.all([loadLocaleMessages(currentLang), loadLocaleMessages('en')]) /** set i18n locale to stored language */ await setI18nLanguage(currentLang)