Use RequestLocalizationOptions.CultureInfoUseUserOverride (OrchardCMS…

…#14716)
urbanit · Mar 18, 2024 · 225036d · 225036d
1 parent 1d9b428
commit 225036d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 87 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Localization/Startup.cs
@@ -49,15 +49,15 @@ public override async ValueTask ConfigureAsync(IApplicationBuilder app, IEndpoin
             var defaultCulture = await localizationService.GetDefaultCultureAsync();
             var supportedCultures = await localizationService.GetSupportedCulturesAsync();
 
-            var localizationOptions = serviceProvider.GetService<IOptions<RequestLocalizationOptions>>().Value;
-            var ignoreSystemSettings = serviceProvider.GetService<IOptions<CultureOptions>>().Value.IgnoreSystemSettings;
+            var cultureOptions = serviceProvider.GetService<IOptions<CultureOptions>>().Value;
 
-            new LocalizationOptionsUpdater(localizationOptions, ignoreSystemSettings)
-                .SetDefaultCulture(defaultCulture)
-                .AddSupportedCultures(supportedCultures)
-                .AddSupportedUICultures(supportedCultures);
-
-            app.UseRequestLocalization(localizationOptions);
+            app.UseRequestLocalization(options =>
+            {
+                options.CultureInfoUseUserOverride = !cultureOptions.IgnoreSystemSettings;
+                options.SetDefaultCulture(defaultCulture);
+                options.AddSupportedCultures(supportedCultures);
+                options.AddSupportedUICultures(supportedCultures);
+            });
         }
     }
 

diff --git a/src/OrchardCore.Modules/OrchardCore.Setup/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Setup/Startup.cs
@@ -49,18 +49,20 @@ public override void ConfigureServices(IServiceCollection services)
         public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
         {
             var localizationOptions = serviceProvider.GetService<IOptions<RequestLocalizationOptions>>().Value;
-            var ignoreSystemSettings = serviceProvider.GetService<IOptions<CultureOptions>>().Value.IgnoreSystemSettings;
+            var cultureOptions = serviceProvider.GetService<IOptions<CultureOptions>>().Value;
+
+            localizationOptions.CultureInfoUseUserOverride = !cultureOptions.IgnoreSystemSettings;
 
-            var localizationOptionsUpdater = new LocalizationOptionsUpdater(localizationOptions, ignoreSystemSettings);
             if (!string.IsNullOrEmpty(_defaultCulture))
             {
-                localizationOptionsUpdater.SetDefaultCulture(_defaultCulture);
+                localizationOptions.SetDefaultCulture(_defaultCulture);
+
                 _supportedCultures = _supportedCultures.Union(new[] { _defaultCulture }).ToArray();
             }
 
             if (_supportedCultures?.Length > 0)
             {
-                localizationOptionsUpdater
+                localizationOptions
                     .AddSupportedCultures(_supportedCultures)
                     .AddSupportedUICultures(_supportedCultures);
             }

diff --git a/src/OrchardCore/OrchardCore.Localization.Abstractions/LocalizationOptionsUpdater.cs b/src/OrchardCore/OrchardCore.Localization.Abstractions/LocalizationOptionsUpdater.cs