From 176bd229e6368b7db05f0e9fa447e231bac586e7 Mon Sep 17 00:00:00 2001
From: sbwalker <shaun.walker@siliqon.com>
Date: Mon, 7 Aug 2023 12:13:53 -0400
Subject: [PATCH 1/3] fix #3094 - localization of admin module titles

---
 Oqtane.Client/Themes/Controls/Container/ModuleTitle.razor | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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<SharedResources> SharedLocalizer
 
 <span class="app-moduletitle">
     @((MarkupString)title)
@@ -23,7 +24,7 @@
 		}
 		else
 		{
-			title = ModuleState.Title;
+            title = SharedLocalizer[ModuleState.Title];
 		}
 	}
 

From 258f2dbe8fc931a479587e03eb32dc3c758c4975 Mon Sep 17 00:00:00 2001
From: sbwalker <shaun.walker@siliqon.com>
Date: Mon, 7 Aug 2023 15:39:44 -0400
Subject: [PATCH 2/3] improve reload in router to prevent looping

---
 Oqtane.Client/UI/SiteRouter.razor | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

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))

From 13b17d91a96b97268144024d8c184d81b6d233e5 Mon Sep 17 00:00:00 2001
From: sbwalker <shaun.walker@siliqon.com>
Date: Mon, 7 Aug 2023 17:11:17 -0400
Subject: [PATCH 3/3] fix Section component localizatioon

---
 Oqtane.Client/Modules/Admin/Site/Index.razor | 2 +-
 Oqtane.Client/Modules/Controls/Section.razor | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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 @@
             </div>
         </div>
         <br />
-        <Section Name="Appearance" ResourceKey="Appearance">
+        <Section Name="Appearance" Heading="Appearance" ResourceKey="Appearance">
             <div class="container">
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="logo" HelpText="Specify a logo for the site" ResourceKey="Logo">Logo: </Label>
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"; }