Test and feedback

Author: dariatiurina

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

@@ -3,7 +3,6 @@
 
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
-using System.Linq;
 using System.Runtime.InteropServices.JavaScript;
 
 namespace Microsoft.AspNetCore.Components.WebAssembly.Hosting;
@@ -63,7 +62,7 @@ public virtual async ValueTask LoadCurrentCultureResourcesAsync()
             throw new PlatformNotSupportedException("This method is only supported in the browser.");
         }
 
-        var culturesToLoad = GetCultures(CultureInfo.CurrentCulture).Union(GetCultures(CultureInfo.CurrentUICulture)).ToArray();
+        var culturesToLoad = GetCultures(CultureInfo.CurrentCulture, CultureInfo.CurrentUICulture);
 
         if (culturesToLoad.Length == 0)
         {
@@ -73,25 +72,34 @@ public virtual async ValueTask LoadCurrentCultureResourcesAsync()
         await WebAssemblyCultureProviderInterop.LoadSatelliteAssemblies(culturesToLoad);
     }
 
-    internal static string[] GetCultures(CultureInfo cultureInfo)
+    internal static string[] GetCultures(CultureInfo? cultureInfo, CultureInfo? uiCultureInfo = null)
     {
         var culturesToLoad = new List<string>();
 
+        if (uiCultureInfo == null)
+        {
+            uiCultureInfo = cultureInfo;
+        }
+
         // 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 && cultureInfo != CultureInfo.InvariantCulture)
+        while ((cultureInfo != null && cultureInfo != CultureInfo.InvariantCulture) || (uiCultureInfo != null && uiCultureInfo != CultureInfo.InvariantCulture))
         {
-            culturesToLoad.Add(cultureInfo.Name);
+            if (cultureInfo != null && cultureInfo != CultureInfo.InvariantCulture)
+            {
+                culturesToLoad.Add(cultureInfo.Name);
+            }
 
-            if (cultureInfo.Parent == cultureInfo)
+            if (uiCultureInfo?.Name != cultureInfo?.Name && uiCultureInfo != null && uiCultureInfo != CultureInfo.InvariantCulture)
             {
-                break;
+                culturesToLoad.Add(uiCultureInfo.Name);
             }
 
-            cultureInfo = cultureInfo.Parent;
+            cultureInfo = cultureInfo?.Parent;
+            uiCultureInfo = uiCultureInfo?.Parent;
         }
 
         return culturesToLoad.ToArray();

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

@@ -24,6 +24,19 @@ public void GetCultures_ReturnsCultureClosure(string cultureName, string[] expec
         Assert.Equal(expected, actual);
     }
 
+    [Theory]
+    [InlineData("fr-FR", "tzm-Latn-DZ", new[] { "fr-FR", "tzm-Latn-DZ", "fr", "tzm-Latn", "tzm" })]
+    public void GetCultures_ReturnCultureClosureWithUICulture(string cultureName, string uiCultureName, string[] expected)
+    {
+        // Arrange
+        var culture = new CultureInfo(cultureName);
+        var uiCulture = new CultureInfo(uiCultureName);
+        // Act
+        var actual = WebAssemblyCultureProvider.GetCultures(culture, uiCulture);
+        // Assert
+        Assert.Equal(expected, actual);
+    }
+
     [Fact]
     public void ThrowIfCultureChangeIsUnsupported_ThrowsIfCulturesAreDifferentAndICUShardingIsUsed()
     {