From b0408a8929be980c4081bf858fb31e358c6efab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Tue, 14 Oct 2025 21:08:27 +0200 Subject: [PATCH] Fix i18n --- packages/webapp/src/@types/i18next.d.ts | 4 +++- packages/webapp/src/i18n/en.ts | 1 + packages/webapp/src/i18n/fr.ts | 1 + packages/webapp/src/i18n/index.ts | 2 ++ packages/webapp/src/routes/__root.tsx | 4 ++-- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/webapp/src/@types/i18next.d.ts b/packages/webapp/src/@types/i18next.d.ts index 987a982..794ab16 100644 --- a/packages/webapp/src/@types/i18next.d.ts +++ b/packages/webapp/src/@types/i18next.d.ts @@ -1,8 +1,10 @@ -import type { resources } from "@/i18n" +import type { defaultNS, resources } from "@/i18n" declare module "i18next" { interface CustomTypeOptions { + enableSelector: true + defaultNS: typeof defaultNS resources: typeof resources["en"] } } diff --git a/packages/webapp/src/i18n/en.ts b/packages/webapp/src/i18n/en.ts index c8f4599..406780e 100644 --- a/packages/webapp/src/i18n/en.ts +++ b/packages/webapp/src/i18n/en.ts @@ -1,4 +1,5 @@ export const en = { + common: {}, nav: { gitRepos: "Git repositories", sourceCode: "Source code", diff --git a/packages/webapp/src/i18n/fr.ts b/packages/webapp/src/i18n/fr.ts index afa2cce..3cabeb3 100644 --- a/packages/webapp/src/i18n/fr.ts +++ b/packages/webapp/src/i18n/fr.ts @@ -2,6 +2,7 @@ import type { en } from "./en" export const fr = { + common: {}, nav: { gitRepos: "Dépôts Git", sourceCode: "Code source", diff --git a/packages/webapp/src/i18n/index.ts b/packages/webapp/src/i18n/index.ts index aae6326..1461ec5 100644 --- a/packages/webapp/src/i18n/index.ts +++ b/packages/webapp/src/i18n/index.ts @@ -5,6 +5,7 @@ import { en } from "./en" import { fr } from "./fr" +export const defaultNS = "common" export const resources = { en, fr } as const await i18n @@ -12,6 +13,7 @@ await i18n .use(LanguageDetector) .init({ supportedLngs: ["en", "fr"], + defaultNS, resources, interpolation: { escapeValue: false diff --git a/packages/webapp/src/routes/__root.tsx b/packages/webapp/src/routes/__root.tsx index 9582c82..c9935e7 100644 --- a/packages/webapp/src/routes/__root.tsx +++ b/packages/webapp/src/routes/__root.tsx @@ -18,11 +18,11 @@ function RootComponent() {