Diplomarbeit-Absolventenverein/oqtane.framework
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow LanguageSwitcher to support culture and ui culture

Browse Source
This commit is contained in:
sbwalker
2026-02-20 15:11:54 -05:00
parent 12f06a7662
commit 0d4d51448e
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Oqtane.Client/Services/LocalizationCookieService.cs
View File

@@ -14,8 +14,9 @@ namespace Oqtane.Services
/// Set the localization cookie
/// </summary>
/// <param name="culture"></param>
/// <param name="uiCulture"></param>
/// <returns></returns>
Task SetLocalizationCookieAsync(string culture);
Task SetLocalizationCookieAsync(string culture, string uiCulture);
}
[PrivateApi("Don't show in the documentation, as everything should use the Interface")]
@@ -23,7 +24,7 @@ namespace Oqtane.Services
{
public LocalizationCookieService(HttpClient http, SiteState siteState) : base(http, siteState) { }
public Task SetLocalizationCookieAsync(string culture)
public Task SetLocalizationCookieAsync(string culture, string uiCulture)
{
return Task.CompletedTask; // only used in server side rendering
}

4
Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor
View File

@@ -56,7 +56,7 @@
var culture = PageState.QueryString["culture"];
if (PageState.Site.Languages.Any(item => item.Code == culture))
{
await LocalizationCookieService.SetLocalizationCookieAsync(culture);
await LocalizationCookieService.SetLocalizationCookieAsync(PageState.Site.CultureCode, culture);
}
NavigationManager.NavigateTo(NavigationManager.Uri.Replace($"?culture={culture}", ""));
}
@@ -66,7 +66,7 @@
{
if (culture != CultureInfo.CurrentUICulture.Name)
{
var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture));
var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(PageState.Site.CultureCode, culture));
var interop = new Interop(JSRuntime);
await interop.SetCookie(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue, 360, true, "Lax");
NavigationManager.NavigateTo(NavigationManager.Uri, true);

1
Oqtane.Server/Infrastructure/LocalizationManager.cs
View File

@@ -4,7 +4,6 @@ using System.IO;
using System.Linq;
using System.Reflection;
using Microsoft.Extensions.Options;
using Oqtane.Models;
using Oqtane.Shared;
namespace Oqtane.Infrastructure

2
Oqtane.Server/Migrations/Tenant/10010002_AddCultureCode.cs
View File

@@ -18,9 +18,11 @@ namespace Oqtane.Migrations.Tenant
{
var siteEntityBuilder = new SiteEntityBuilder(migrationBuilder, ActiveDatabase);
siteEntityBuilder.AddStringColumn("CultureCode", 10, true);
siteEntityBuilder.UpdateData("CultureCode", $"'{Shared.Constants.DefaultCulture}'");
var userEntityBuilder = new UserEntityBuilder(migrationBuilder, ActiveDatabase);
userEntityBuilder.AddStringColumn("CultureCode", 10, true);
userEntityBuilder.UpdateData("CultureCode", $"'{Shared.Constants.DefaultCulture}'");
}
protected override void Down(MigrationBuilder migrationBuilder)

4
Oqtane.Server/Services/LocalizationCookieService.cs
View File

@@ -16,9 +16,9 @@ namespace Oqtane.Services
_accessor = accessor;
}
public Task SetLocalizationCookieAsync(string culture)
public Task SetLocalizationCookieAsync(string culture, string uiCulture)
{
var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture));
var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture, uiCulture));
_accessor.HttpContext.Response.Cookies.Append(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue, new CookieOptions
{