From 2a2108fe5628b9229265c6ebd8c9bd58f2f84187 Mon Sep 17 00:00:00 2001 From: Oli Juhl <59018053+olivermrbl@users.noreply.github.com> Date: Fri, 15 Sep 2023 17:08:01 +0200 Subject: [PATCH] fix(admin-ui): Case sensitive locale detection in prod (#5082) * fix(admin-ui): Admin path in i18n * lowercase locale --- .../ui/public/locales/{pt-br => pt}/translation.json | 0 packages/admin-ui/ui/src/i18n/index.ts | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename packages/admin-ui/ui/public/locales/{pt-br => pt}/translation.json (100%) diff --git a/packages/admin-ui/ui/public/locales/pt-br/translation.json b/packages/admin-ui/ui/public/locales/pt/translation.json similarity index 100% rename from packages/admin-ui/ui/public/locales/pt-br/translation.json rename to packages/admin-ui/ui/public/locales/pt/translation.json diff --git a/packages/admin-ui/ui/src/i18n/index.ts b/packages/admin-ui/ui/src/i18n/index.ts index 096c621c67..0081f02f1e 100644 --- a/packages/admin-ui/ui/src/i18n/index.ts +++ b/packages/admin-ui/ui/src/i18n/index.ts @@ -13,15 +13,15 @@ export const supportedLanguages = [ name: "Français", }, { - locale: "pt-BR", + locale: "pt", name: "Português (Brasil)", }, ] const backendUrl = window.location.origin -const adminPath = process.env.ADMIN_PATH ? `${process.env.ADMIN_PATH}` : "" +const adminPath = process.env.ADMIN_PATH ? `${process.env.ADMIN_PATH}/` : "/" -const pathToLoadFrom = `${backendUrl}${adminPath}locales/{{lng}}/{{ns}}.json` +const pathToLoadFrom = `${backendUrl}${adminPath}public/locales/{{lng}}/{{ns}}.json` void i18n .use(Backend) @@ -30,7 +30,7 @@ void i18n // https://www.i18next.com/overview/configuration-options .init({ backend: { - loadPath: pathToLoadFrom + loadPath: pathToLoadFrom, }, supportedLngs: supportedLanguages.map((l) => l.locale), fallbackLng: "en",