Improvements

Author: dariatiurina

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

@@ -76,11 +76,6 @@ internal static string[] GetCultures(CultureInfo? cultureInfo, CultureInfo? uiCu
     {
         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.
@@ -98,8 +93,8 @@ internal static string[] GetCultures(CultureInfo? cultureInfo, CultureInfo? uiCu
                 culturesToLoad.Add(uiCultureInfo.Name);
             }
 
-            cultureInfo = cultureInfo?.Parent;
-            uiCultureInfo = uiCultureInfo?.Parent;
+            cultureInfo = (cultureInfo?.Parent == cultureInfo) ? null : cultureInfo?.Parent;
+            uiCultureInfo = (uiCultureInfo?.Parent == uiCultureInfo) ? null : uiCultureInfo?.Parent;
         }
 
         return culturesToLoad.ToArray();

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

@@ -26,11 +26,13 @@ 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", null, new[] { "fr-FR", "fr" })]
+    [InlineData(null, null, new string[0])]
     public void GetCultures_ReturnCultureClosureWithUICulture(string cultureName, string uiCultureName, string[] expected)
     {
         // Arrange
-        var culture = new CultureInfo(cultureName);
-        var uiCulture = new CultureInfo(uiCultureName);
+        var culture = cultureName != null ? new CultureInfo(cultureName) : null;
+        var uiCulture = uiCultureName != null ? new CultureInfo(uiCultureName) : null;
         // Act
         var actual = WebAssemblyCultureProvider.GetCultures(culture, uiCulture);
         // Assert