Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use RequestLocalizationOptions.CultureInfoUseUserOverride #14716

Merged
merged 4 commits into from
Dec 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/OrchardCore.Modules/OrchardCore.Localization/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
}
}

Expand Down
10 changes: 6 additions & 4 deletions src/OrchardCore.Modules/OrchardCore.Setup/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

This file was deleted.