x

apps/website/src/components/ClientProviders.tsx

@@ -7,11 +7,13 @@ import i18n from '../lib/i18n';
 
 export default function ClientProviders({ children }: { children: ReactNode }) {
   useEffect(() => {
-    const savedLang = localStorage.getItem('homaroma_lang')
-
-    // Hydrate from the user's persisted language only after the first client render.
-    if (savedLang && savedLang !== i18n.language) {
-      void i18n.changeLanguage(savedLang)
+    // With Locale Routing, the URL is the source of truth for language.
+    // Sync i18n to match the current URL if needed.
+    const pathLang = window.location.pathname.split('/')[1];
+    const targetLang = pathLang && ['th', 'en', 'ja', 'zh', 'vi', 'ko'].includes(pathLang) ? pathLang : 'th';
+    
+    if (targetLang !== i18n.language) {
+      void i18n.changeLanguage(targetLang);
     }
   }, [])