TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 11:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

deep merge with fallback

Browse Source
This commit is contained in:
Max Peintner
2025-06-13 09:15:22 +02:00
parent 5513eb8841
commit 19236e19a8
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/login/src/i18n/request.ts
View File

@@ -21,7 +21,7 @@ export default getRequestConfig(async () => {
organization: i18nOrganization, organization: i18nOrganization,
}); });
translations. console.log("Translations:", translations);
const languageHeader = await (await headers()).get(LANGUAGE_HEADER_NAME); const languageHeader = await (await headers()).get(LANGUAGE_HEADER_NAME);
if (languageHeader) { 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`)) const fallbackMessages = (await import(`../../locales/${fallback}.json`))
.default; .default;
return { return {
locale, locale,
messages: deepmerge(fallbackMessages, userMessages), messages: deepmerge(fallbackMessages, localeMessages, customMessages),
}; };
}); });