to: gh-100 locales not loaded when using base path.

riccox · Dec 25, 2023 · 864afed · 864afed
1 parent 18f5e36
commit 864afed
Show file tree

Hide file tree

Showing 23 changed files with 10 additions and 23 deletions.
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "fuse.js": "^7.0.0",
     "i18next": "^23.6.0",
     "i18next-browser-languagedetector": "^7.1.0",
-    "i18next-http-backend": "^2.3.1",
+    "i18next-resources-to-backend": "^1.2.0",
     "immer": "^10.0.3",
     "lodash": "^4.17.21",
     "meilisearch": "^0.35.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/public/locales/en/common.json → src/locales/en/common.json b/public/locales/en/common.json → src/locales/en/common.json
diff --git a/public/locales/en/dashboard.json → src/locales/en/dashboard.json b/public/locales/en/dashboard.json → src/locales/en/dashboard.json
diff --git a/public/locales/en/document.json → src/locales/en/document.json b/public/locales/en/document.json → src/locales/en/document.json
diff --git a/public/locales/en/footer.json → src/locales/en/footer.json b/public/locales/en/footer.json → src/locales/en/footer.json
diff --git a/public/locales/en/header.json → src/locales/en/header.json b/public/locales/en/header.json → src/locales/en/header.json
diff --git a/public/locales/en/instance.json → src/locales/en/instance.json b/public/locales/en/instance.json → src/locales/en/instance.json
diff --git a/public/locales/en/key.json → src/locales/en/key.json b/public/locales/en/key.json → src/locales/en/key.json
diff --git a/public/locales/en/sys.json → src/locales/en/sys.json b/public/locales/en/sys.json → src/locales/en/sys.json
diff --git a/public/locales/en/task.json → src/locales/en/task.json b/public/locales/en/task.json → src/locales/en/task.json
diff --git a/public/locales/en/upload.json → src/locales/en/upload.json b/public/locales/en/upload.json → src/locales/en/upload.json
diff --git a/public/locales/zh/common.json → src/locales/zh/common.json b/public/locales/zh/common.json → src/locales/zh/common.json
diff --git a/public/locales/zh/dashboard.json → src/locales/zh/dashboard.json b/public/locales/zh/dashboard.json → src/locales/zh/dashboard.json
diff --git a/public/locales/zh/document.json → src/locales/zh/document.json b/public/locales/zh/document.json → src/locales/zh/document.json
diff --git a/public/locales/zh/footer.json → src/locales/zh/footer.json b/public/locales/zh/footer.json → src/locales/zh/footer.json
diff --git a/public/locales/zh/header.json → src/locales/zh/header.json b/public/locales/zh/header.json → src/locales/zh/header.json
diff --git a/public/locales/zh/instance.json → src/locales/zh/instance.json b/public/locales/zh/instance.json → src/locales/zh/instance.json
diff --git a/public/locales/zh/key.json → src/locales/zh/key.json b/public/locales/zh/key.json → src/locales/zh/key.json
diff --git a/public/locales/zh/sys.json → src/locales/zh/sys.json b/public/locales/zh/sys.json → src/locales/zh/sys.json
diff --git a/public/locales/zh/task.json → src/locales/zh/task.json b/public/locales/zh/task.json → src/locales/zh/task.json
diff --git a/public/locales/zh/upload.json → src/locales/zh/upload.json b/public/locales/zh/upload.json → src/locales/zh/upload.json
diff --git a/src/utils/i18n.ts b/src/utils/i18n.ts
@@ -1,7 +1,7 @@
 import i18n from 'i18next';
 import { initReactI18next } from 'react-i18next';
-import Backend from 'i18next-http-backend';
 import LanguageDetector from 'i18next-browser-languagedetector';
+import resourcesToBackend from 'i18next-resources-to-backend';
 
 export const SUPPORTED_LANGUAGES = ['en', 'zh'] as const;
 export type SUPPORTED_LANGUAGE = (typeof SUPPORTED_LANGUAGES)[number];
@@ -22,18 +22,15 @@ export const NAMESPACES = [
 ] as const;
 
 i18n
-  .use(Backend)
+  // .use(Backend)
+  .use(resourcesToBackend((language: string, namespace: string) => import(`../locales/${language}/${namespace}.json`)))
   .use(LanguageDetector)
   .use(initReactI18next) // passes i18n down to react-i18next
   .init({
     debug: true,
     fallbackLng: SUPPORTED_LANGUAGES[0],
     ns: NAMESPACES,
     fallbackNS: NAMESPACES[0],
-    backend: {
-      // fs backend options
-      loadPath: '/locales/{{lng}}/{{ns}}.json',
-    },
     interpolation: {
       escapeValue: false, // react already safes from xss
     },