language fix WIP

ShareBookCode · Feb 18, 2025 · 46e92e5 · 46e92e5
1 parent 84fd732
commit 46e92e5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/i18n.server.js b/i18n.server.js
@@ -15,7 +15,6 @@ export function createI18nInstance() {
     .use(LanguageDetector)
     .init({
       fallbackLng: "en",
-      preload: ["en", "ru"],
       ns: ["common", "auth", "chat"],
       defaultNS: "common",
       backend: {
@@ -24,6 +23,9 @@ export function createI18nInstance() {
       react: {
         useSuspense: false,
       },
+      detection: {
+        caches: ["cookie"],
+      },
     });
 
   return instance;

diff --git a/locales/en/chat.json b/locales/en/chat.json
@@ -0,0 +1,3 @@
+{
+  "title": "Chats"
+}
diff --git a/server.js b/server.js
@@ -66,11 +66,6 @@ app.use("*", async (req, res) => {
   try {
     const url = req.originalUrl.replace(base, "/");
 
-    const initialI18nStore = {};
-    req.i18n.languages.forEach((lng) => {
-      initialI18nStore[lng] = req.i18n.store.data[lng] || {};
-    });
-
     /** @type {string} */
     let template;
     /** @type {import('./src/entry-server.ts').render} */
@@ -96,7 +91,6 @@ app.use("*", async (req, res) => {
         `<!--i18n-head-->`,
         `
         <script>
-            window.initialI18nStore = ${JSON.stringify(initialI18nStore)};
             window.initialLanguage = '${req.i18n.language}';
         </script>
       `,

diff --git a/src/entry-client.tsx b/src/entry-client.tsx
@@ -10,13 +10,18 @@ i18next
   .use(LanguageDetector)
   .init(
     {
-      lng: window.initialLanguage,
-      fallbackLng: "en",
-      debug: false,
-      resources: window.initialI18nStore,
+      ns: ["common", "auth", "chat"],
+      defaultNS: "common",
+      fallbackLng: window.initialLanguage,
       react: {
         useSuspense: false,
       },
+      backend: {
+        loadPath: "/locales/{{lng}}/{{ns}}.json",
+      },
+      detection: {
+        caches: ["cookie"],
+      },
     },
     () => {
       const preloadedState = window.__PRELOADED_STATE__ || {};