@umituz/react-native-localization 3.1.2 → 3.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-localization",
-  "version": "3.1.2",
+  "version": "3.2.0",
   "description": "Generic localization system for React Native apps with i18n support",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
@@ -86,4 +86,4 @@
     "README.md",
     "LICENSE"
   ]
-}
+}

package/src/infrastructure/config/NamespaceResolver.ts

@@ -18,9 +18,27 @@ export class NamespaceResolver {
     const packageTranslations = TranslationLoader.loadPackageTranslations();
     const packageLang = packageTranslations[languageCode] || {};
 
+    let appNamespaces: string[] = [];
+
+    // Check if appTranslations has language keys (format: xx-XX)
+    const hasLanguageKeys = Object.keys(appTranslations).some(key =>
+      /^[a-z]{2}-[A-Z]{2}$/.test(key)
+    );
+
+    if (hasLanguageKeys) {
+      // If structured by language, get namespaces from the requested language
+      const langTranslations = appTranslations[languageCode];
+      if (langTranslations && typeof langTranslations === 'object') {
+        appNamespaces = Object.keys(langTranslations);
+      }
+    } else {
+      // If structured by namespace (legacy/simple), keys are namespaces
+      appNamespaces = Object.keys(appTranslations);
+    }
+
     const namespaces = new Set([
       ...Object.keys(packageLang),
-      ...Object.keys(appTranslations),
+      ...appNamespaces,
     ]);
 
     if (!namespaces.has(DEFAULT_NAMESPACE)) {

package/src/infrastructure/config/ResourceBuilder.ts

@@ -15,26 +15,43 @@ export class ResourceBuilder {
   ): Record<string, Record<string, any>> {
     const packageTranslations = TranslationLoader.loadPackageTranslations();
 
-    const resources: Record<string, Record<string, any>> = {
-      [languageCode]: {},
-    };
+    // Initialize with package translations
+    const resources: Record<string, Record<string, any>> = { ...packageTranslations };
 
-    const packageLang = packageTranslations[languageCode] || {};
-
-    // Add package namespaces
-    for (const [namespace, translations] of Object.entries(packageLang)) {
-      resources[languageCode][namespace] = translations;
+    // Ensure initial language exists
+    if (!resources[languageCode]) {
+      resources[languageCode] = {};
     }
 
-    // Merge app translations (app overrides package)
-    for (const [namespace, translations] of Object.entries(appTranslations)) {
-      if (resources[languageCode][namespace]) {
-        resources[languageCode][namespace] = TranslationLoader.mergeTranslations(
-          resources[languageCode][namespace],
-          translations
-        );
+    // Process app translations
+    for (const [key, value] of Object.entries(appTranslations)) {
+      // Check if the key is a language code (format: xx-XX)
+      const isLanguageKey = /^[a-z]{2}-[A-Z]{2}$/.test(key);
+
+      if (isLanguageKey) {
+        // It's a language key (e.g., "en-US")
+        const lang = key;
+        if (!resources[lang]) {
+          resources[lang] = {};
+        }
+
+        // Merge namespaces for this language
+        if (value && typeof value === 'object') {
+          for (const [namespace, translations] of Object.entries(value)) {
+            resources[lang][namespace] = TranslationLoader.mergeTranslations(
+              resources[lang][namespace] || {},
+              translations
+            );
+          }
+        }
       } else {
-        resources[languageCode][namespace] = translations;
+        // It's a namespace for the default/current language (backward compatibility)
+        if (value && typeof value === 'object') {
+          resources[languageCode][key] = TranslationLoader.mergeTranslations(
+            resources[languageCode][key] || {},
+            value
+          );
+        }
       }
     }