CultureInfo should independent from local computer settings (Lombiq Technologies: OCORE-86)

src/OrchardCore.Cms.Web/appsettings.json

@@ -223,6 +223,9 @@
     //  "TenantId": "",
     //  "CallbackPath": "/signin-oidc",
     //  "SaveTokens": false
-    //}
+    //},
+    "OrchardCore_Localization": {
+      "CultureSettings": 0 // 0 for default culture settings, 1 for user-selected culture settings.
+    }
   }
 }

src/OrchardCore.Modules/OrchardCore.Localization/CultureLocalizationOptions.cs

@@ -0,0 +1,6 @@
+namespace OrchardCore.Localization;
+
+public class CultureLocalizationOptions
+{
+    public CultureSettings CultureSettings { get; set; } = CultureSettings.Default;
+}

src/OrchardCore.Modules/OrchardCore.Localization/CultureSettings.cs

@@ -0,0 +1,7 @@
+namespace OrchardCore.Localization;
+
+public enum CultureSettings
+{
+    Default,
+    User
+}

src/OrchardCore.Modules/OrchardCore.Localization/Startup.cs

@@ -5,6 +5,7 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
 using OrchardCore.DisplayManagement.Handlers;
+using OrchardCore.Environment.Shell.Configuration;
 using OrchardCore.Localization.Drivers;
 using OrchardCore.Localization.Models;
 using OrchardCore.Localization.Services;
@@ -21,6 +22,13 @@ namespace OrchardCore.Localization
     /// </summary>
     public class Startup : StartupBase
     {
+        private readonly IShellConfiguration _shellConfiguration;
+
+        public Startup(IShellConfiguration shellConfiguration)
+        {
+            _shellConfiguration = shellConfiguration;
+        }
+
         public override int ConfigureOrder => -100;
 
         /// <inheritdocs />
@@ -35,6 +43,8 @@ public override void ConfigureServices(IServiceCollection services)
                 AddDataAnnotationsPortableObjectLocalization();
 
             services.Replace(ServiceDescriptor.Singleton<ILocalizationFileLocationProvider, ModularPoFileLocationProvider>());
+
+            services.Configure<CultureLocalizationOptions>(_shellConfiguration.GetSection("OrchardCore_Localization"));
         }
 
         /// <inheritdocs />
@@ -45,14 +55,15 @@ public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder ro
             var defaultCulture = localizationService.GetDefaultCultureAsync().GetAwaiter().GetResult();
             var supportedCultures = localizationService.GetSupportedCulturesAsync().GetAwaiter().GetResult();
 
-            var options = serviceProvider.GetService<IOptions<RequestLocalizationOptions>>().Value;
-            options.SetDefaultCulture(defaultCulture);
-            options
-                .AddSupportedCultures(supportedCultures)
-                .AddSupportedUICultures(supportedCultures)
-                ;
+            var requestLocalizationOptions = serviceProvider.GetService<IOptions<RequestLocalizationOptions>>().Value;
+            var cultureLocalizationOptions = serviceProvider.GetService<IOptions<CultureLocalizationOptions>>().Value;
+
+            requestLocalizationOptions
+                .SetDefaultCulture(defaultCulture)
+                .AddSupportedCultures(supportedCultures, cultureLocalizationOptions.CultureSettings == CultureSettings.User)
+                .AddSupportedUICultures(supportedCultures, cultureLocalizationOptions.CultureSettings == CultureSettings.User);
 
-            app.UseRequestLocalization(options);
+            app.UseRequestLocalization(requestLocalizationOptions);
         }
     }
 

src/OrchardCore/OrchardCore.Localization.Abstractions/Extensions/RequestLocalizationOptionsExtensions.cs

@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+
+namespace Microsoft.AspNetCore.Builder;
+
+/// <summary>
+/// Extension methods for the <see cref="RequestLocalizationOptions"/>.
+/// </summary>
+public static class RequestLocalizationOptionsExtensions
+{
+    /// <summary>
+    /// Adds the set of the supported cultures by the application.
+    /// </summary>
+    /// <param name="requestLocalizationOptions">The <see cref="RequestLocalizationOptions"/>.</param>
+    /// <param name="cultures">The cultures to be added.</param>
+    /// <param name="userUserSelectedCultureSettings">Whether to use the user-selected culture settings or not. Default to <c>false</c> which uses the default culture settings.</param>
+    /// <returns>The <see cref="RequestLocalizationOptions"/>.</returns>
+    public static RequestLocalizationOptions AddSupportedCultures(
+        this RequestLocalizationOptions requestLocalizationOptions,
+        string[] cultures,
+        bool userUserSelectedCultureSettings = false)
+    {
+        if (requestLocalizationOptions == null)
+        {
+            throw new ArgumentNullException(nameof(requestLocalizationOptions));
+        }
+
+        if (cultures is null)
+        {
+            throw new ArgumentNullException(nameof(cultures));
+        }
+
+        var supportedCultures = new List<CultureInfo>(cultures.Length);
+
+        foreach (var culture in cultures)
+        {
+            supportedCultures.Add(new CultureInfo(culture, userUserSelectedCultureSettings));
+        }
+
+        requestLocalizationOptions.SupportedCultures = supportedCultures;
+
+        return requestLocalizationOptions;
+    }
+
+    /// <summary>
+    /// Adds the set of the supported UI cultures by the application.
+    /// </summary>
+    /// <param name="requestLocalizationOptions">The <see cref="RequestLocalizationOptions"/>.</param>
+    /// <param name="cultures">The cultures to be added.</param>
+    /// <param name="userUserSelectedCultureSettings">Whether to use the user-selected culture settings or not. Default to <c>false</c> which uses the default culture settings.</param>
+    /// <returns>The <see cref="RequestLocalizationOptions"/>.</returns>
+    public static RequestLocalizationOptions AddSupportedUICultures(
+        this RequestLocalizationOptions requestLocalizationOptions,
+        string[] cultures,
+        bool userUserSelectedCultureSettings = false)
+    {
+        if (requestLocalizationOptions == null)
+        {
+            throw new ArgumentNullException(nameof(requestLocalizationOptions));
+        }
+
+        if (cultures is null)
+        {
+            throw new ArgumentNullException(nameof(cultures));
+        }
+
+        var supportedUICultures = new List<CultureInfo>(cultures.Length);
+
+        foreach (var culture in cultures)
+        {
+            supportedUICultures.Add(new CultureInfo(culture, userUserSelectedCultureSettings));
+        }
+
+        requestLocalizationOptions.SupportedUICultures = supportedUICultures;
+
+        return requestLocalizationOptions;
+    }
+}