From 0d7da0ada3ccd039c538b568319a4df425011a0c Mon Sep 17 00:00:00 2001
From: Nevo David <me@nevos.io>
Date: Sun, 1 Jun 2025 16:08:14 +0700
Subject: [PATCH] feat: fix direction

---
 .../src/components/layout/html.component.tsx  | 10 +++---
 apps/frontend/src/middleware.ts               |  1 -
 .../get.transation.service.client.ts          | 33 +++++++++++--------
 .../src/translation/i18next.ts                |  1 -
 4 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/apps/frontend/src/components/layout/html.component.tsx b/apps/frontend/src/components/layout/html.component.tsx
index c4afc02c..ad44e157 100644
--- a/apps/frontend/src/components/layout/html.component.tsx
+++ b/apps/frontend/src/components/layout/html.component.tsx
@@ -1,16 +1,18 @@
 'use client';
 import { FC, ReactNode, useEffect, useState } from 'react';
-import i18next from '@gitroom/react/translation/i18next';
+import { useTranslationSettings } from '@gitroom/react/translation/get.transation.service.client';
 
 export const HtmlComponent: FC<{ className: string; children: ReactNode }> = (
   props
 ) => {
   const { className } = props;
-  const [dir, setDir] = useState(i18next.dir());
+  const settings = useTranslationSettings();
+  const [dir, setDir] = useState(settings.dir());
 
   useEffect(() => {
-    i18next.on('languageChanged', (lng) => {
-      setDir(i18next.dir());
+    setDir(settings.dir());
+    settings.on('languageChanged', (lng) => {
+      setDir(settings.dir());
     });
   }, []);
 
diff --git a/apps/frontend/src/middleware.ts b/apps/frontend/src/middleware.ts
index d6c786a7..a79c30ae 100644
--- a/apps/frontend/src/middleware.ts
+++ b/apps/frontend/src/middleware.ts
@@ -24,7 +24,6 @@ export async function middleware(request: NextRequest) {
       : acceptLanguage.get(request.headers.get('Accept-Language'))) ||
     fallbackLng;
 
-  console.log(request.cookies.has(cookieName));
   const headers = new Headers(request.headers);
   headers.set(headerName, lng);
   if (
diff --git a/libraries/react-shared-libraries/src/translation/get.transation.service.client.ts b/libraries/react-shared-libraries/src/translation/get.transation.service.client.ts
index 78de1f66..00db9bcb 100644
--- a/libraries/react-shared-libraries/src/translation/get.transation.service.client.ts
+++ b/libraries/react-shared-libraries/src/translation/get.transation.service.client.ts
@@ -10,25 +10,32 @@ import {
   fallbackLng,
 } from '@gitroom/react/translation/i18n.config';
 import { useVariables } from '@gitroom/react/helpers/variable.context';
-const runsOnServerSide = typeof window === 'undefined';
+
 export function useT(ns?: string, options?: UseTranslationOptions<any>) {
   const { language } = useVariables();
   const [lng] = useCookie(cookieName, language || fallbackLng);
   if (typeof lng !== 'string') {
     throw new Error('useT is only available inside /app/[lng]');
   }
-  const [activeLng, setActiveLng] = useState(i18next.resolvedLanguage);
   const { t } = useTranslation(ns, options);
-  useEffect(() => {
-    if (activeLng === i18next.resolvedLanguage) return;
-    setActiveLng(i18next.resolvedLanguage);
-  }, [activeLng]);
-  useEffect(() => {
-    if (!lng || i18next.resolvedLanguage === lng) return;
-    i18next.changeLanguage(lng);
-  }, [lng]);
-  if (runsOnServerSide && i18next.resolvedLanguage !== lng) {
-    i18next.changeLanguage(lng);
-  }
   return t;
 }
+
+export function useTranslationSettings() {
+  const { language } = useVariables();
+  const [lng] = useCookie(cookieName, language || fallbackLng);
+  const [savedI18next, setSavedI18next] = useState(i18next);
+
+  if (typeof lng !== 'string') {
+    throw new Error('useT is only available inside /app/[lng]');
+  }
+  useEffect(() => {
+    if (lng !== i18next.resolvedLanguage) {
+      i18next.changeLanguage(lng).then(() => {
+        setSavedI18next(i18next);
+      });
+    }
+  }, [lng]);
+
+  return savedI18next;
+}
diff --git a/libraries/react-shared-libraries/src/translation/i18next.ts b/libraries/react-shared-libraries/src/translation/i18next.ts
index c255e07f..9077b0ca 100644
--- a/libraries/react-shared-libraries/src/translation/i18next.ts
+++ b/libraries/react-shared-libraries/src/translation/i18next.ts
@@ -10,7 +10,6 @@ i18next
   .use(LanguageDetector)
   .use(
     resourcesToBackend((language: any, namespace: any) => {
-      console.log(namespace, language);
       return import(`./locales/${language}/${namespace}.json`);
     })
   )