Merge branch 'develop' into feat/OB-9802

Onlineberatung · Feb 28, 2024 · 1f940e0 · 1f940e0
2 parents 50d3eba + 97df5dd
commit 1f940e0
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/i18n.ts b/src/i18n.ts
@@ -92,11 +92,17 @@ export const init = async (
 		)
 	];
 
+	const mergeAndFlattenNamespace = (namespace) => {
+		if (Array.isArray(namespace)) {
+			return _.merge({}, ...namespace.map((ns) => flatten(ns)));
+		}
+		return flatten(namespace);
+	};
 	const flattenBaseResource = (resource) => {
 		if (!resource) return {};
 		return Object.keys(resource).reduce((acc, lng) => {
 			acc[lng] = Object.keys(resource[lng]).reduce((acc, ns) => {
-				acc[ns] = flatten(resource[lng][ns]);
+				acc[ns] = mergeAndFlattenNamespace(resource[lng][ns]);
 				return acc;
 			}, {});
 			return acc;