From ad7963f8f51260f6741b1e74a3df73394b930735 Mon Sep 17 00:00:00 2001
From: alexsparkes <alexsparkes@gmail.com>
Date: Sat, 7 Feb 2026 21:28:55 +0000
Subject: [PATCH] fix: Implement fallback to en_GB in translation retrieval for
 improved language handling

---
 src/contexts/TranslationContext.jsx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/contexts/TranslationContext.jsx b/src/contexts/TranslationContext.jsx
index 48f9a44a..d2b97fd2 100644
--- a/src/contexts/TranslationContext.jsx
+++ b/src/contexts/TranslationContext.jsx
@@ -74,7 +74,16 @@ export function TranslationProvider({ children, initialLanguage, initialTranslat
       if (!i18nInstance.current) {
         return key;
       }
-      return i18nInstance.current.getMessage(currentLanguage, key, optional);
+      try {
+        return i18nInstance.current.getMessage(currentLanguage, key, optional);
+      } catch (error) {
+        // Fallback to en_GB if the current language is not loaded yet
+        try {
+          return i18nInstance.current.getMessage('en_GB', key, optional);
+        } catch {
+          return key;
+        }
+      }
     },
     [currentLanguage],
   );