diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor index 6589f770..eff54f48 100644 --- a/Oqtane.Client/Modules/Admin/Site/Index.razor +++ b/Oqtane.Client/Modules/Admin/Site/Index.razor @@ -60,7 +60,7 @@
-
+
diff --git a/Oqtane.Client/Modules/Controls/Section.razor b/Oqtane.Client/Modules/Controls/Section.razor index 22737d6c..91f91724 100644 --- a/Oqtane.Client/Modules/Controls/Section.razor +++ b/Oqtane.Client/Modules/Controls/Section.razor @@ -42,6 +42,8 @@ protected override void OnParametersSet() { + base.OnParametersSet(); // must be included to call method in LocalizableComponent + _heading = !string.IsNullOrEmpty(Heading) ? Localize(nameof(Heading), Heading) : Localize(nameof(Name), Name); _expanded = (!string.IsNullOrEmpty(Expanded)) ? Expanded.ToLower() : "false"; if (_expanded == "true") { _show = "show"; } diff --git a/Oqtane.Client/Themes/Controls/Container/ModuleTitle.razor b/Oqtane.Client/Themes/Controls/Container/ModuleTitle.razor index ff35f013..007f2d41 100644 --- a/Oqtane.Client/Themes/Controls/Container/ModuleTitle.razor +++ b/Oqtane.Client/Themes/Controls/Container/ModuleTitle.razor @@ -2,6 +2,7 @@ @namespace Oqtane.Themes.Controls @inherits ContainerBase @attribute [OqtaneIgnore] +@inject IStringLocalizer SharedLocalizer @((MarkupString)title) @@ -23,7 +24,7 @@ } else { - title = ModuleState.Title; + title = SharedLocalizer[ModuleState.Title]; } } diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor index 892a89d1..c2a61f64 100644 --- a/Oqtane.Client/UI/SiteRouter.razor +++ b/Oqtane.Client/UI/SiteRouter.razor @@ -126,7 +126,7 @@ } else { - NavigationManager.NavigateTo(_absoluteUri.Replace("?reload", ""), true); + NavigationManager.NavigateTo(_absoluteUri.Replace("?reload", "").Replace("&reload", ""), true); return; } } @@ -184,12 +184,20 @@ // reload client application if server was restarted or site runtime/rendermode was modified if (PageState != null && site != null && sync.SyncEvents.Exists(item => item.Action == SyncEventActions.Reload && ((item.EntityName == EntityNames.Host && site.Runtime != "Server") || (item.EntityName == EntityNames.Site && item.EntityId == site.SiteId)))) { - NavigationManager.NavigateTo(_absoluteUri, true); + if (!querystring.ContainsKey("reloaded")) + { + NavigationManager.NavigateTo(_absoluteUri + (!_absoluteUri.Contains("?") ? "?" : "&") + "reloaded", true); + return; + } } // reload client application if current user auth information has changed if (PageState != null && user != null && sync.SyncEvents.Exists(item => item.Action == SyncEventActions.Reload && item.EntityName == EntityNames.User && item.EntityId == user.UserId)) { - NavigationManager.NavigateTo(_absoluteUri, true); + if (!querystring.ContainsKey("reloaded")) + { + NavigationManager.NavigateTo(_absoluteUri + (!_absoluteUri.Contains("?") ? "?" : "&") + "reloaded", true); + return; + } } // when site information has changed the PageState needs to be refreshed if (sync.SyncEvents.Exists(item => item.EntityName == EntityNames.Site && item.EntityId == SiteState.Alias.SiteId))