diff --git a/frontend/packages/console-app/src/components/quick-starts/utils/quick-start-context.tsx b/frontend/packages/console-app/src/components/quick-starts/utils/quick-start-context.tsx index b1de1f66da5..4c8d9d8d077 100644 --- a/frontend/packages/console-app/src/components/quick-starts/utils/quick-start-context.tsx +++ b/frontend/packages/console-app/src/components/quick-starts/utils/quick-start-context.tsx @@ -160,8 +160,8 @@ export const useValuesForQuickStartContext = (): QuickStartContextValues => { [activeQuickStartID, setAllQuickStartStates, fireTelemetryEvent], ); - const language = getLastLanguage() || 'en'; - const resourceBundle = i18n.getResourceBundle(language, 'console-app'); + const language = i18n.resolvedLanguage || 'en'; + const resourceBundle = i18n.getResourceBundle(language, 'console-app') ?? {}; const processedResourceBundle = getProcessedResourceBundle(resourceBundle, language); // https://github.com/i18next/i18next-parser#caveats diff --git a/frontend/packages/console-app/src/components/user-preferences/language/useLanguage.ts b/frontend/packages/console-app/src/components/user-preferences/language/useLanguage.ts index 8ec5e388ab8..6562d37e590 100644 --- a/frontend/packages/console-app/src/components/user-preferences/language/useLanguage.ts +++ b/frontend/packages/console-app/src/components/user-preferences/language/useLanguage.ts @@ -10,12 +10,13 @@ export const useLanguage = (preferredLanguage: string, preferredLanguageLoaded: const { setResourceBundle } = useQuickStartContext(); useEffect(() => { - const onLanguageChange = (lng: string) => { + const onLanguageChange = () => { if (setResourceBundle) { // Update language resource of quick starts components - const resourceBundle = i18n.getResourceBundle(lng, 'console-app'); - const processedBundle = getProcessedResourceBundle(resourceBundle, lng); - setResourceBundle(processedBundle, lng); + const language = i18n.resolvedLanguage || 'en'; + const resourceBundle = i18n.getResourceBundle(language, 'console-app') ?? {}; + const processedBundle = getProcessedResourceBundle(resourceBundle, language); + setResourceBundle(processedBundle, language); } }; const preferredLanguageInStorage: string = getLastLanguage();