Merge pull request #3155 from sbwalker/dev

rollback #3125 and localize module component Title using LocalizerFactory
oqtane · Aug 17, 2023 · abeeda1 · abeeda1
2 parents 2777a09 + 9e6ea3f
commit abeeda1
Show file tree

Hide file tree

Showing 17 changed files with 20 additions and 61 deletions.
diff --git a/Oqtane.Client/Modules/Admin/Files/Details.razor b/Oqtane.Client/Modules/Admin/Files/Details.razor
@@ -66,12 +66,6 @@
 
     public override string Title => "File Management";
 
-    protected override void OnParametersSet()
-    {
-        base.OnParametersSet();
-        base.SetModuleTitle(Localizer["ModuleTitle.Text"]);
-    }
-
     protected override async Task OnInitializedAsync()
     {
         try

diff --git a/Oqtane.Client/Modules/Admin/Files/Edit.razor b/Oqtane.Client/Modules/Admin/Files/Edit.razor
@@ -112,11 +112,6 @@
 
     public override string Title => "Folder Management"; 
 
-    protected override void OnParametersSet()
-    {
-        base.OnParametersSet();
-        base.SetModuleTitle(Localizer["ModuleTitle.Text"]);
-    }
     protected override async Task OnInitializedAsync()
     {
         try

diff --git a/Oqtane.Client/Modules/Admin/Modules/Export.razor b/Oqtane.Client/Modules/Admin/Modules/Export.razor
@@ -22,12 +22,6 @@
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
     public override string Title => "Export Content";
 
-    protected override void OnParametersSet()
-    {
-        base.OnParametersSet();
-        base.SetModuleTitle(Localizer["ModuleTitle.Text"]);
-    }
-
     private async Task ExportModule()
     {
         try

diff --git a/Oqtane.Client/Modules/Admin/Modules/Import.razor b/Oqtane.Client/Modules/Admin/Modules/Import.razor
@@ -28,11 +28,6 @@
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
     public override string Title => "Import Content";
 
-    protected override void OnParametersSet()
-    {
-        base.OnParametersSet();
-        base.SetModuleTitle(Localizer["ModuleTitle.Text"]);
-    }
     private async Task ImportModule()
     {
         validated = true;

diff --git a/Oqtane.Client/Modules/Admin/Modules/Settings.razor b/Oqtane.Client/Modules/Admin/Modules/Settings.razor
@@ -130,11 +130,6 @@
     private string modifiedby;
     private DateTime modifiedon;
 
-    protected override void OnParametersSet()
-    {
-        base.OnParametersSet();
-        base.SetModuleTitle(Localizer["ModuleTitle.Text"]);
-    }
     protected override void OnInitialized()
     {
         _module = ModuleState.ModuleDefinition.Name;

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Add.razor b/Oqtane.Client/Modules/Admin/UserProfile/Add.razor
@@ -42,12 +42,6 @@
 
     public override string Title => "Send Notification";
 
-    protected override void OnParametersSet()
-    {
-        base.OnParametersSet();
-        base.SetModuleTitle(Localizer["ModuleTitle.Text"]);
-    }
-
     private async Task Send()
     {
         try

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/View.razor b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
@@ -110,11 +110,6 @@
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
     public override string Title => "View Notification";
 
-    protected override void OnParametersSet()
-    {
-        base.OnParametersSet();
-        base.SetModuleTitle(Localizer["ModuleTitle.Text"]);
-    }
     protected override async Task OnInitializedAsync()
     {
         try

diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor
@@ -68,12 +68,6 @@
 	private List<Models.HtmlText> _htmltexts;
 	private string _view = "";
 
-    protected override void OnParametersSet()
-    {
-        base.OnParametersSet();
-        base.SetModuleTitle(Localizer["ModuleTitle.Text"]);
-    }
-
 	protected override async Task OnInitializedAsync()
 	{
 		try

diff --git a/Oqtane.Client/Resources/Modules/Admin/Files/Details.resx b/Oqtane.Client/Resources/Modules/Admin/Files/Details.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -150,7 +150,7 @@
   <data name="Description.Text" xml:space="preserve">
     <value>Description:</value>
   </data>
-  <data name="ModuleTitle.Text" xml:space="preserve">
+  <data name="File Management" xml:space="preserve">
     <value>File Management</value>
   </data>
 </root>
diff --git a/Oqtane.Client/Resources/Modules/Admin/Files/Edit.resx b/Oqtane.Client/Resources/Modules/Admin/Files/Edit.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -192,7 +192,7 @@
   <data name="Public" xml:space="preserve">
     <value>Public</value>
   </data>
-  <data name="ModuleTitle.Text" xml:space="preserve">
+  <data name="Folder Management" xml:space="preserve">
     <value>Folder Management</value>
   </data>
 </root>
diff --git a/Oqtane.Client/Resources/Modules/Admin/Modules/Export.resx b/Oqtane.Client/Resources/Modules/Admin/Modules/Export.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -132,7 +132,7 @@
   <data name="Success.Content.Export" xml:space="preserve">
     <value>Content Exported Successfully</value>
   </data>
-  <data name="ModuleTitle.Text" xml:space="preserve">
+  <data name="Export Content" xml:space="preserve">
     <value>Export Content</value>
   </data>
 </root>
diff --git a/Oqtane.Client/Resources/Modules/Admin/Modules/Import.resx b/Oqtane.Client/Resources/Modules/Admin/Modules/Import.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -138,7 +138,7 @@
   <data name="Message.Required.ImportContent" xml:space="preserve">
     <value>You Must Enter Some Content To Import</value>
   </data>
-  <data name="ModuleTitle.Text" xml:space="preserve">
+  <data name="Import Content" xml:space="preserve">
     <value>Import Content</value>
   </data>
 </root>
diff --git a/Oqtane.Client/Resources/Modules/Admin/Modules/Settings.resx b/Oqtane.Client/Resources/Modules/Admin/Modules/Settings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -156,7 +156,7 @@
   <data name="Module.Text" xml:space="preserve">
     <value>Module:</value>
   </data>
-  <data name="ModuleTitle.Text" xml:space="preserve">
+  <data name="Module Settings" xml:space="preserve">
     <value>Module Settings</value>
   </data>
 </root>
diff --git a/Oqtane.Client/Resources/Modules/Admin/UserProfile/Add.resx b/Oqtane.Client/Resources/Modules/Admin/UserProfile/Add.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -141,7 +141,7 @@
   <data name="Subject.Text" xml:space="preserve">
     <value>Subject: </value>
   </data>
-  <data name="ModuleTitle.Text" xml:space="preserve">
+  <data name="Send Notification" xml:space="preserve">
     <value>Send Notification</value>
   </data>
 </root>
diff --git a/Oqtane.Client/Resources/Modules/Admin/UserProfile/View.resx b/Oqtane.Client/Resources/Modules/Admin/UserProfile/View.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -144,7 +144,7 @@
   <data name="OriginalMessage" xml:space="preserve">
     <value>Original Message</value>
   </data>
-  <data name="ModuleTitle.Text" xml:space="preserve">
+  <data name="View Notification" xml:space="preserve">
     <value>View Notification</value>
   </data>
 </root>
diff --git a/Oqtane.Client/Resources/Modules/HtmlText/Edit.resx b/Oqtane.Client/Resources/Modules/HtmlText/Edit.resx
@@ -156,7 +156,7 @@
   <data name="Message.Content.Restored" xml:space="preserve">
     <value>Version Restored</value>
   </data>
-  <data name="ModuleTitle.Text" xml:space="preserve">
+  <data name="Edit Html/Text" xml:space="preserve">
     <value>Edit Html/Text</value>
   </data>
   <data name="Restore.Header" xml:space="preserve">

diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
@@ -12,6 +12,7 @@
 @inject IUrlMappingService UrlMappingService
 @inject ILogService LogService
 @inject IJSRuntime JSRuntime
+@inject IStringLocalizerFactory LocalizerFactory
 @implements IHandleAfterRender
 
 @if (!string.IsNullOrEmpty(_error))
@@ -26,7 +27,7 @@
     private bool _isInternalNavigation = false;
     private bool _navigationInterceptionEnabled;
     private PageState _pagestate;
-    private string _error = "";
+    private string _error = "";    
 
     [Parameter]
     public string Runtime { get; set; }
@@ -387,6 +388,7 @@
     private (Page Page, List<Module> Modules) ProcessModules(Page page, List<Module> modules, int moduleid, string action, string defaultcontainertype, Alias alias)
     {
         var paneindex = new Dictionary<string, int>();
+
         foreach (Module module in modules)
         {
             // initialize module control properties
@@ -463,8 +465,9 @@
                     // additional metadata needed for admin components
                     if (module.ModuleId == moduleid && action != "")
                     {
+                        var localizer = LocalizerFactory.Create(module.ModuleType);
+                        module.ControlTitle = localizer[moduleobject.Title];
                         module.SecurityAccessLevel = moduleobject.SecurityAccessLevel;
-                        module.ControlTitle = moduleobject.Title;
                         module.Actions = moduleobject.Actions;
                         module.UseAdminContainer = moduleobject.UseAdminContainer;
                     }