Introduce DefaultCultureAliasProvider

src/OrchardCore.Modules/OrchardCore.Indexing/Drivers/ContentIndexProfileDisplayDriver.cs

@@ -36,7 +36,7 @@ public override IDisplayResult Edit(IndexProfile indexProfile, BuildEditorContex
             model.IndexLatest = metadata.IndexLatest;
             model.IndexedContentTypes = metadata.IndexedContentTypes;
             model.Culture = metadata.Culture;
-            model.Cultures = ILocalizationService.GetAllCulturesAndAliases()
+            model.Cultures = CultureInfoWrapper.GetCultures()
             .Select(culture => new SelectListItem
             {
                 Text = $"{culture.Name} ({culture.DisplayName})",

src/OrchardCore.Modules/OrchardCore.Indexing/OrchardCore.Indexing.csproj

@@ -15,6 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\OrchardCore\OrchardCore\OrchardCore.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Admin.Abstractions\OrchardCore.Admin.Abstractions.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.ContentPreview.Abstractions\OrchardCore.ContentPreview.Abstractions.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.ContentTypes.Abstractions\OrchardCore.ContentTypes.Abstractions.csproj" />

src/OrchardCore.Modules/OrchardCore.Localization/Drivers/LocalizationSettingsDisplayDriver.cs

@@ -67,7 +67,7 @@ public override async Task<IDisplayResult> EditAsync(ISite site, LocalizationSet
 
         return Initialize<LocalizationSettingsViewModel>("LocalizationSettings_Edit", model =>
         {
-            model.Cultures = ILocalizationService.GetAllCulturesAndAliases()
+            model.Cultures = CultureInfoWrapper.GetCultures()
                 .Select(cultureInfo =>
                 {
                     return new CultureEntry

src/OrchardCore.Modules/OrchardCore.Localization/OrchardCore.Localization.csproj

@@ -17,6 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\OrchardCore\OrchardCore\OrchardCore.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Admin.Abstractions\OrchardCore.Admin.Abstractions.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Apis.GraphQL.Abstractions\OrchardCore.Apis.GraphQL.Abstractions.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.ContentManagement.GraphQL\OrchardCore.ContentManagement.GraphQL.csproj" />

src/OrchardCore/OrchardCore.Abstractions/Localization/ICultureAliasProvider.cs

@@ -0,0 +1,8 @@
+using System.Globalization;
+
+namespace OrchardCore.Localization;
+
+public interface ICultureAliasProvider
+{
+    IEnumerable<CultureInfo> GetCultureAliases();
+}

src/OrchardCore/OrchardCore.Abstractions/Localization/ILocalizationService.cs

@@ -28,9 +28,7 @@ public interface ILocalizationService
     /// </summary>
     bool FallBackToParentCultures { get; }
 
-    /// <summary>
-    /// Gets all cultures recognized by .NET, including culture aliases.
-    /// </summary>
+    [Obsolete("This method is deprecated and will be removed in a future version. Use CultureInfoWrapper.GetAllCulturesAndAliases() instead.")]
     static CultureInfo[] GetAllCulturesAndAliases()
     {
         var cultures = CultureInfo.GetCultures(CultureTypes.AllCultures)

src/OrchardCore/OrchardCore/Localization/CultureInfoWrapper.cs

@@ -0,0 +1,27 @@
+using System.Globalization;
+using Microsoft.Extensions.DependencyInjection;
+using OrchardCore.Environment.Shell.Scope;
+
+namespace OrchardCore.Localization;
+
+public static class CultureInfoWrapper
+{
+    /// <summary>
+    /// Gets all cultures recognized by .NET, including culture aliases.
+    /// </summary>
+    public static CultureInfo[] GetCultures()
+    {
+        var cultureAliasProviders = ShellScope.Current.ServiceProvider.GetServices<ICultureAliasProvider>();
+
+        var cultures = CultureInfo.GetCultures(CultureTypes.AllCultures).AsEnumerable();
+
+        if (cultureAliasProviders.Any())
+        {
+            cultures = cultures.Union(cultureAliasProviders.SelectMany(provider => provider.GetCultureAliases()));
+        }
+
+        return cultures
+            .OrderBy(c => c.Name)
+            .ToArray();
+    }
+}

src/OrchardCore/OrchardCore/Localization/DefaultCultureAliasProvider.cs

@@ -0,0 +1,14 @@
+using System.Globalization;
+
+namespace OrchardCore.Localization;
+
+public sealed class DefaultCultureAliasProvider : ICultureAliasProvider
+{
+    private static readonly CultureInfo[] _cultureAliases =
+    [
+        CultureInfo.GetCultureInfo("zh-CN"),
+        CultureInfo.GetCultureInfo("zh-TW")
+    ];
+
+    public IEnumerable<CultureInfo> GetCultureAliases() => _cultureAliases;
+}

src/OrchardCore/OrchardCore/Modules/Extensions/ServiceCollectionExtensions.cs

@@ -147,6 +147,7 @@ private static void AddDefaultServices(OrchardCoreBuilder builder)
         services.AddScoped<ILocalizationService, DefaultLocalizationService>();
         services.AddScoped<ICalendarManager, DefaultCalendarManager>();
         services.AddScoped<ICalendarSelector, DefaultCalendarSelector>();
+        services.AddScoped<ICultureAliasProvider, DefaultCultureAliasProvider>();
 
         services.AddSingleton<IPoweredByMiddlewareOptions, PoweredByMiddlewareOptions>();
         services.AddTransient<IConfigureOptions<DocumentJsonSerializerOptions>, DocumentJsonSerializerOptionsConfiguration>();

test/OrchardCore.Tests/Localization/LocalizationServiceTests.cs → test/OrchardCore.Tests/Localization/DefaultCultureAliasProviderTests.cs

@@ -2,13 +2,16 @@
 
 namespace OrchardCore.Tests.Localization;
 
-public class LocalizationService
+public class DefaultCultureAliasProviderTests
 {
     [Fact]
     public void GetAllCulturesAndAliases_ShouldContainsChineseCultures()
     {
+        // Arrange
+        var provider = new DefaultCultureAliasProvider();
+
         // Act
-        var cultures = ILocalizationService.GetAllCulturesAndAliases();
+        var cultures = provider.GetCultureAliases();
 
         // Assert
         Assert.Single(cultures, c => c.Name == "zh-CN");