From 998b4de2900f8eda27984026bfcdcafdda59fcf7 Mon Sep 17 00:00:00 2001
From: thisconnect <this@shiftcrypto.ch>
Date: Fri, 15 Nov 2024 10:43:36 +0100
Subject: [PATCH] frontend: ensure falling back to native langauge

---
 frontends/web/src/components/guide/entry.tsx |  2 +-
 frontends/web/src/i18n/i18n.ts               | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/frontends/web/src/components/guide/entry.tsx b/frontends/web/src/components/guide/entry.tsx
index d9f898ab93..b1b10523df 100644
--- a/frontends/web/src/components/guide/entry.tsx
+++ b/frontends/web/src/components/guide/entry.tsx
@@ -55,7 +55,7 @@ export const Entry = (props: TProps) => {
       <div className={[style.entryContent, shown ? style.expanded : ''].join(' ')}>
         {shown ? (
           <div className="flex-1">
-            {entry.text.trim().split('\n').map((p, idx) => <p key={idx}>{p}</p>)}
+            {entry?.text?.trim().split('\n').map((p, idx) => <p key={idx}>{p}</p>)}
             {entry.link && (
               <p>
                 <A
diff --git a/frontends/web/src/i18n/i18n.ts b/frontends/web/src/i18n/i18n.ts
index 43b91f528c..918f4beee6 100644
--- a/frontends/web/src/i18n/i18n.ts
+++ b/frontends/web/src/i18n/i18n.ts
@@ -91,9 +91,6 @@ i18Init.init({
   }
 });
 
-// load the default language first
-loadLanguage(defaultLang);
-
 i18n.on('languageChanged', async (lng) => {
   // changei18nLanguage triggers languageChanged, thus this check to prevent loop
   if (isChangingLanguage) {
@@ -127,4 +124,12 @@ i18n.on('languageChanged', async (lng) => {
   }
 });
 
+i18n.on('initialized', () => {
+  languageFromConfig.detect((lang) => {
+    if (lang && typeof lang === 'string') {
+      changei18nLanguage(localeMainLanguage(lang));
+    }
+  });
+});
+
 export { i18n };