From 19236e19a8066db15212d9676ca9e157004a9d62 Mon Sep 17 00:00:00 2001 From: Max Peintner Date: Fri, 13 Jun 2025 09:15:22 +0200 Subject: [PATCH] deep merge with fallback --- apps/login/src/i18n/request.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/login/src/i18n/request.ts b/apps/login/src/i18n/request.ts index 71ccaebae5..36bf3f011e 100644 --- a/apps/login/src/i18n/request.ts +++ b/apps/login/src/i18n/request.ts @@ -21,7 +21,7 @@ export default getRequestConfig(async () => { organization: i18nOrganization, }); - translations. + console.log("Translations:", translations); const languageHeader = await (await headers()).get(LANGUAGE_HEADER_NAME); if (languageHeader) { @@ -38,12 +38,13 @@ export default getRequestConfig(async () => { } } - const userMessages = (await import(`../../locales/${locale}.json`)).default; + const customMessages = translations; + const localeMessages = (await import(`../../locales/${locale}.json`)).default; const fallbackMessages = (await import(`../../locales/${fallback}.json`)) .default; return { locale, - messages: deepmerge(fallbackMessages, userMessages), + messages: deepmerge(fallbackMessages, localeMessages, customMessages), }; });