Merge pull request #12093 from roc916/dev

fixed CultureHelper.GetBaseCultureName

framework/src/Volo.Abp.Core/Volo/Abp/Localization/CultureHelper.cs

@@ -57,8 +57,6 @@ public static class CultureHelper
 
     public static string GetBaseCultureName(string cultureName)
     {
-        return cultureName.Contains("-")
-            ? cultureName.Left(cultureName.IndexOf("-", StringComparison.Ordinal))
-            : cultureName;
+        return new CultureInfo(cultureName).Parent.Name;
     }
 }

framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/AbpLocalization_Tests.cs

@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using System.Linq;
 using Microsoft.Extensions.Localization;
 using Shouldly;
@@ -183,6 +183,60 @@ public class AbpLocalization_Tests : AbpIntegratedTest<AbpLocalization_Tests.Tes
         {
             _localizer["CarPlural"].Value.ShouldBe("Autos");
         }
+
+        using (CultureHelper.Use(CultureInfo.GetCultureInfo("zh-Hans")))
+        {
+            _localizer["Car"].Value.ShouldBe("汽车");
+        }
+        using (CultureHelper.Use(CultureInfo.GetCultureInfo("zh-Hans")))
+        {
+            _localizer["CarPlural"].Value.ShouldBe("汽车");
+        }
+
+        using (CultureHelper.Use(CultureInfo.GetCultureInfo("zh-CN")))
+        {
+            _localizer["Car"].Value.ShouldBe("汽车");
+        }
+        using (CultureHelper.Use(CultureInfo.GetCultureInfo("zh-CN")))
+        {
+            _localizer["CarPlural"].Value.ShouldBe("汽车");
+        }
+        
+        using (CultureHelper.Use(CultureInfo.GetCultureInfo("zh-Hans-CN")))
+        {
+            _localizer["Car"].Value.ShouldBe("汽车");
+        }
+        using (CultureHelper.Use(CultureInfo.GetCultureInfo("zh-Hans-CN")))
+        {
+            _localizer["CarPlural"].Value.ShouldBe("汽车");
+        }
+
+        using (CultureHelper.Use(CultureInfo.GetCultureInfo("zh-Hant")))
+        {
+            _localizer["Car"].Value.ShouldBe("汽車");
+        }
+        using (CultureHelper.Use(CultureInfo.GetCultureInfo("zh-Hant")))
+        {
+            _localizer["CarPlural"].Value.ShouldBe("汽車");
+        }
+        
+        using (CultureHelper.Use(CultureInfo.GetCultureInfo("zh-TW")))
+        {
+            _localizer["Car"].Value.ShouldBe("汽車");
+        }
+        using (CultureHelper.Use(CultureInfo.GetCultureInfo("zh-TW")))
+        {
+            _localizer["CarPlural"].Value.ShouldBe("汽車");
+        }
+        
+        using (CultureHelper.Use(CultureInfo.GetCultureInfo("zh-Hant-TW")))
+        {
+            _localizer["Car"].Value.ShouldBe("汽車");
+        }
+        using (CultureHelper.Use(CultureInfo.GetCultureInfo("zh-Hant-TW")))
+        {
+            _localizer["CarPlural"].Value.ShouldBe("汽車");
+        }
     }
 
     [Fact]