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

fix deepmerge strategy

Browse Source
This commit is contained in:
Max Peintner
2025-06-23 11:40:43 +02:00
parent 809d51dcf6
commit e2754c1d16
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,6 @@ export default getRequestConfig(async () => {
if (i18nJSON) { if (i18nJSON) {
translations = i18nJSON; translations = i18nJSON;
} }
console.log("Translations:", translations);
} catch (error) { } catch (error) {
console.warn("Error fetching custom translations:", error); console.warn("Error fetching custom translations:", error);
} }
@@ -48,14 +47,13 @@ export default getRequestConfig(async () => {
} }
} }
// const customMessages = translations; const customMessages = translations;
const customMessages = {};
const localeMessages = (await import(`../../locales/${locale}.json`)).default; 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, localeMessages, customMessages), messages: deepmerge.all([fallbackMessages, localeMessages, customMessages]),
}; };
}); });