From 90199b5ff995e997bed21c1ea49bfd8afcb3b016 Mon Sep 17 00:00:00 2001
From: emergent-agent-e1 <github@emergent.sh>
Date: Sun, 9 Nov 2025 08:00:38 +0000
Subject: [PATCH] auto-commit for a0c02a50-54cd-4ff6-8aa2-2df41cae30b3

---
 frontend/src/config/i18n.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/frontend/src/config/i18n.ts b/frontend/src/config/i18n.ts
index f6e709f0..44804a12 100644
--- a/frontend/src/config/i18n.ts
+++ b/frontend/src/config/i18n.ts
@@ -97,10 +97,20 @@ const i18n = new I18n({
 });
 
 // Set default locale
-i18n.locale = Localization.locale;
 i18n.enableFallback = true;
 i18n.defaultLocale = 'en';
 
+// Get device locale safely (handle web platform)
+try {
+  const deviceLocale = Localization.locale || 'en';
+  // Extract language code (e.g., 'en-US' -> 'en')
+  const languageCode = deviceLocale.split('-')[0];
+  i18n.locale = languageCode;
+} catch (error) {
+  console.error('Error setting device locale:', error);
+  i18n.locale = 'en';
+}
+
 export const loadSavedLanguage = async () => {
   try {
     const savedLang = await AsyncStorage.getItem('appLanguage');