diff --git a/Oqtane.Client/Program.cs b/Oqtane.Client/Program.cs index 43dc617a..fcc03099 100644 --- a/Oqtane.Client/Program.cs +++ b/Oqtane.Client/Program.cs @@ -94,7 +94,7 @@ namespace Oqtane.Client var host = builder.Build(); var jsRuntime = host.Services.GetRequiredService(); var interop = new Interop(jsRuntime); - var culture = await interop.getCulture(); + var culture = await interop.GetLocalStorage("OqtaneCulture"); if (culture != null) { var cultureInfo = CultureInfo.GetCultureInfo(culture); diff --git a/Oqtane.Client/Themes/Controls/LanguageSwitcher.razor b/Oqtane.Client/Themes/Controls/LanguageSwitcher.razor index e14e8a8e..4b0a3acd 100644 --- a/Oqtane.Client/Themes/Controls/LanguageSwitcher.razor +++ b/Oqtane.Client/Themes/Controls/LanguageSwitcher.razor @@ -26,7 +26,7 @@ protected override async Task OnParametersSetAsync() { var interop = new Interop(JSRuntime); - _selectedCulture = await interop.getCulture(); + _selectedCulture = await interop.GetLocalStorage("OqtaneCulture"); _supportedCultures = await LocalizationService.GetSupportedCultures(); } @@ -35,7 +35,7 @@ if (culture != CultureInfo.CurrentUICulture.Name) { var interop = new Interop(JSRuntime); - await interop.setCulture(culture); + await interop.SetLocalStorage("OqtaneCulture", culture); NavigationManager.NavigateTo(NavigationManager.Uri, forceLoad: true); } diff --git a/Oqtane.Client/UI/Interop.cs b/Oqtane.Client/UI/Interop.cs index 83a88ad5..10c37d44 100644 --- a/Oqtane.Client/UI/Interop.cs +++ b/Oqtane.Client/UI/Interop.cs @@ -234,13 +234,13 @@ namespace Oqtane.UI } } - public async Task getCulture() + public async Task GetLocalStorage(string name) { try { - var culture = await _jsRuntime.InvokeAsync("Oqtane.Interop.getCulture"); + var value = await _jsRuntime.InvokeAsync("Oqtane.Interop.getLocalStorage", name); - return culture; + return value; } catch { @@ -248,11 +248,11 @@ namespace Oqtane.UI } } - public Task setCulture(string culture) + public Task SetLocalStorage(string name, string value) { try { - _jsRuntime.InvokeVoidAsync("Oqtane.Interop.setCulture", culture); + _jsRuntime.InvokeVoidAsync("Oqtane.Interop.setLocalStorage", name, value); return Task.CompletedTask; } diff --git a/Oqtane.Server/wwwroot/js/interop.js b/Oqtane.Server/wwwroot/js/interop.js index dc3f0394..e71f4b81 100644 --- a/Oqtane.Server/wwwroot/js/interop.js +++ b/Oqtane.Server/wwwroot/js/interop.js @@ -363,10 +363,10 @@ Oqtane.Interop = { window.location.href = url; }, wait * 1000); }, - getCulture: function () { - return window.localStorage['OqtaneCulture']; + getLocalStorage: function (name) { + return window.localStorage[name]; }, - setCulture: function (culture) { - window.localStorage['OqtaneCulture'] = culture; + setLocalStorage: function (name, value) { + window.localStorage[name] = value; } };