Merge pull request #118 from ErikApption/master

added support to split i18n files into multiple json files
AlexTeixeira · Dec 6, 2021 · 9404f5e · 9404f5e
2 parents aac274c + 5f33e2d
commit 9404f5e
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 23 deletions.
diff --git a/Askmethat.Aspnet.JsonLocalizer/Localizer/Modes/LocalizationI18NModeGenerator.cs b/Askmethat.Aspnet.JsonLocalizer/Localizer/Modes/LocalizationI18NModeGenerator.cs
@@ -29,8 +29,8 @@ public ConcurrentDictionary<string, LocalizatedFormat> ConstructLocalization(IEn
             _options = options;
 
             var enumerable = myFiles as string[] ?? myFiles.ToArray();
-            var neutralFile = enumerable.FirstOrDefault(file => Path.GetFileName(file)
-                .Count(s => s.CompareTo('.') == 0) == 1);
+            var neutralFiles = enumerable.Where(file => Path.GetFileName(file)
+                .Count(s => s.CompareTo('.') == 0) == 1).ToList();
             var isInvariantCulture =
                 currentCulture.DisplayName == CultureInfo.InvariantCulture.ThreeLetterISOLanguageName;
 
@@ -61,9 +61,10 @@ public ConcurrentDictionary<string, LocalizatedFormat> ConstructLocalization(IEn
             }
             else
             {
-                if (neutralFile != null)
+                if (neutralFiles.Any())
                 {
-                    AddValueToLocalization(options, neutralFile, true);
+                    foreach (var neutralFile in neutralFiles)
+                        AddValueToLocalization(options, neutralFile, true);
                 }
             }
 

diff --git a/test/Askmethat.Aspnet.JsonLocalizer.I18nTestSample/i18n/localization.en-US.json b/test/Askmethat.Aspnet.JsonLocalizer.I18nTestSample/i18n/localization.en-US.json
@@ -8,16 +8,8 @@
   "WeatherForecastDesc": "This component demonstrates fetching data from a service.",
   "Loading": "Loading...",
   "Date": "Date",
-  "TempC": "Temp. (C)",
-  "TempF": "Temp. (F)",
   "Summary": "Summary",
   "CurrentCount": "Current count",
   "ClickMe": "Click me",
-  "About": "About",
-  "Freezing": "Freezing",
-  "Bracing": "Bracing",
-  "Chilly": "Chilly",
-  "Cool": "Cool",
-  "Mild": "Mild",
-  "Warm": "Warm"
+  "About": "About"
 }
diff --git a/test/Askmethat.Aspnet.JsonLocalizer.I18nTestSample/i18n/localization.fr-FR.json b/test/Askmethat.Aspnet.JsonLocalizer.I18nTestSample/i18n/localization.fr-FR.json
@@ -8,16 +8,8 @@
   "WeatherForecastDesc": "Ce volet montre comment obtenir des données à partir d'un service.",
   "Loading": "Chargement...",
   "Date": "Date",
-  "TempC": "Temp. (C)",
-  "TempF": "Temp. (F)",
   "Summary": "Sommaire",
   "CurrentCount": "Valeur courante",
   "ClickMe": "Cliquer",
-  "About": "À propos de",
-  "Freezing": "Geler",
-  "Bracing": "Bracing",
-  "Chilly": "Froid",
-  "Cool": "Frais",
-  "Mild": "Doux",
-  "Warm": "Chaud"
+  "About": "À propos de"
 }
diff --git a/test/Askmethat.Aspnet.JsonLocalizer.I18nTestSample/i18n/temperatures.en-US.json b/test/Askmethat.Aspnet.JsonLocalizer.I18nTestSample/i18n/temperatures.en-US.json
@@ -0,0 +1,10 @@
+{
+  "TempC": "Temp. (C)",
+  "TempF": "Temp. (F)",
+  "Freezing": "Freezing",
+  "Bracing": "Bracing",
+  "Chilly": "Chilly",
+  "Cool": "Cool",
+  "Mild": "Mild",
+  "Warm": "Warm"
+}
diff --git a/test/Askmethat.Aspnet.JsonLocalizer.I18nTestSample/i18n/temperatures.fr-FR.json b/test/Askmethat.Aspnet.JsonLocalizer.I18nTestSample/i18n/temperatures.fr-FR.json
@@ -0,0 +1,10 @@
+{
+  "TempC": "Temp. (C)",
+  "TempF": "Temp. (F)",
+  "Freezing": "Geler",
+  "Bracing": "Bracing",
+  "Chilly": "Froid",
+  "Cool": "Frais",
+  "Mild": "Doux",
+  "Warm": "Chaud"
+}
diff --git a/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/I18nFallbackJsonFileTest.cs b/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/I18nFallbackJsonFileTest.cs
@@ -70,6 +70,26 @@ public void Should_Read_Color_FallbackToParent()
 
         }
 
+        [TestMethod]
+        public void Should_Read_Luminosity_FallbackToParent()
+        {
+            InitLocalizer("fr-FR");
+            LocalizedString result = localizer.GetString("Luminosity");
+            Assert.AreEqual("Luminosité", result);
+            Assert.IsFalse(result.ResourceNotFound);
+
+            InitLocalizer("en-NZ");
+            result = localizer.GetString("Luminosity");
+            Assert.AreEqual("Luminosity", result);
+            Assert.IsFalse(result.ResourceNotFound);
+
+            InitLocalizer("zh-CN");
+            result = localizer.GetString("Luminosity");
+            Assert.AreEqual("Luminosity", result);
+            Assert.IsFalse(result.ResourceNotFound);
+
+        }
+
         //[TestMethod]
         public void Should_Read_ResourceMissingCulture_FallbackToResourceName()
         {
@@ -97,7 +117,8 @@ public void Should_Read_AllStringsWithParentFallback()
             LocalizedString[] results = localizer.GetAllStrings(includeParentCultures: true).ToArray();
             LocalizedString[] expected = new[] {
                 new LocalizedString("Color", "Colour (specific)", false),
-                new LocalizedString("Empty", "Empty", false)
+                new LocalizedString("Empty", "Empty", false),
+                new LocalizedString("Luminosity", "Luminosity", false)
             };
             CollectionAssert.AreEqual(expected, results.OrderBy(s => s.Name).ToArray(), new LocalizedStringComparer());
         }

diff --git a/test/Askmethat.Aspnet.JsonLocalizer.Test/i18nFallback/localizationFile2.en.json b/test/Askmethat.Aspnet.JsonLocalizer.Test/i18nFallback/localizationFile2.en.json
@@ -0,0 +1,3 @@
+{
+  "Luminosity" : "Luminosity"
+}
diff --git a/test/Askmethat.Aspnet.JsonLocalizer.Test/i18nFallback/localizationFile2.fr.json b/test/Askmethat.Aspnet.JsonLocalizer.Test/i18nFallback/localizationFile2.fr.json
@@ -0,0 +1,3 @@
+{
+  "Luminosity": "Luminosité"
+}
diff --git a/test/Askmethat.Aspnet.JsonLocalizer.Test/i18nFallback/localizationFile2.json b/test/Askmethat.Aspnet.JsonLocalizer.Test/i18nFallback/localizationFile2.json
@@ -0,0 +1,3 @@
+{
+  "Luminosity" : "Luminosity"
+}