Feedback

Author: dariatiurina

src/Components/WebAssembly/WebAssembly/src/Hosting/WebAssemblyCultureProvider.cs

@@ -73,32 +73,45 @@ public virtual async ValueTask LoadCurrentCultureResourcesAsync()
         await WebAssemblyCultureProviderInterop.LoadSatelliteAssemblies(culturesToLoad);
     }
 
-    internal static string[] GetCultures(CultureInfo? cultureInfo, CultureInfo? uiCultureInfo = null)
+    internal static string[] GetCultures(CultureInfo cultureInfo, CultureInfo? uiCultureInfo = null)
     {
-        var culturesToLoad = new HashSet<string>();
-
         // Once WASM is ready, we have to use .NET's assembly loading to load additional assemblies.
         // First calculate all possible cultures that the application might want to load. We do this by
         // starting from the current culture and walking up the graph of parents.
         // At the end of the the walk, we'll have a list of culture names that look like
         // [ "fr-FR", "fr" ]
-        while (cultureInfo != null || uiCultureInfo != null)
+
+        var culturesToLoad = GetCultureHierarchy(cultureInfo);
+        if (cultureInfo != uiCultureInfo)
         {
-            if (cultureInfo != null && cultureInfo != CultureInfo.InvariantCulture)
+            foreach (var culture in GetCultureHierarchy(uiCultureInfo))
             {
-                culturesToLoad.Add(cultureInfo.Name);
+                if (!culturesToLoad.Contains(culture))
+                {
+                    culturesToLoad = culturesToLoad.Append(culture);
+                }
+                // If the culture is in the list, we can break because we found the common parent.
+                else
+                {
+                    break;
+                }
             }
+        }
+
+        return culturesToLoad.ToArray();
+    }
 
-            if (uiCultureInfo != null && uiCultureInfo.Name != cultureInfo?.Name && uiCultureInfo != CultureInfo.InvariantCulture)
+    private static IEnumerable<string> GetCultureHierarchy(CultureInfo? culture)
+    {
+        while (culture != CultureInfo.InvariantCulture && culture != null)
+        {
+            yield return culture.Name;
+            if (culture == culture.Parent)
             {
-                culturesToLoad.Add(uiCultureInfo.Name);
+                break;
             }
-
-            cultureInfo = (cultureInfo?.Parent == cultureInfo || cultureInfo == CultureInfo.InvariantCulture) ? null : cultureInfo?.Parent;
-            uiCultureInfo = (uiCultureInfo?.Parent == uiCultureInfo || uiCultureInfo == CultureInfo.InvariantCulture) ? null : uiCultureInfo?.Parent;
+            culture = culture.Parent;
         }
-
-        return culturesToLoad.ToList().ToArray();
     }
 
     private partial class WebAssemblyCultureProviderInterop

src/Components/WebAssembly/WebAssembly/test/Hosting/WebAssemblyCultureProviderTest.cs

@@ -25,7 +25,8 @@ public void GetCultures_ReturnsCultureClosure(string cultureName, string[] expec
     }
 
     [Theory]
-    [InlineData("fr-FR", "tzm-Latn-DZ", new[] { "fr-FR", "tzm-Latn-DZ", "fr", "tzm-Latn", "tzm" })]
+    [InlineData("fr-FR", "tzm-Latn-DZ", new[] { "fr-FR", "fr", "tzm-Latn-DZ", "tzm-Latn", "tzm" })]
+    [InlineData("en-US", "en-GB", new[] { "en-US", "en", "en-GB" })]
     [InlineData("fr-FR", null, new[] { "fr-FR", "fr" })]
     [InlineData(null, null, new string[0])]
     public void GetCultures_ReturnCultureClosureWithUICulture(string cultureName, string uiCultureName, string[] expected)