kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3155 from sbwalker/dev

Browse Source 
rollback #3125 and localize module component Title using LocalizerFactory
This commit is contained in:
Shaun Walker 2023-08-17 07:56:58 -04:00 committed by GitHub
commit abeeda1a2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 20 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Oqtane.Client/Modules/Admin/Files/Details.razor
View File

@ -66,12 +66,6 @@
public override string Title => "File Management"; public override string Title => "File Management";
protected override void OnParametersSet()
{
base.OnParametersSet();
base.SetModuleTitle(Localizer["ModuleTitle.Text"]);
}
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
try try

5
Oqtane.Client/Modules/Admin/Files/Edit.razor
View File

@ -112,11 +112,6 @@
public override string Title => "Folder Management"; public override string Title => "Folder Management";
protected override void OnParametersSet()
{
base.OnParametersSet();
base.SetModuleTitle(Localizer["ModuleTitle.Text"]);
}
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
try try

6
Oqtane.Client/Modules/Admin/Modules/Export.razor
View File

@ -22,12 +22,6 @@
public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit; public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
public override string Title => "Export Content"; public override string Title => "Export Content";
protected override void OnParametersSet()
{
base.OnParametersSet();
base.SetModuleTitle(Localizer["ModuleTitle.Text"]);
}
private async Task ExportModule() private async Task ExportModule()
{ {
try try

5
Oqtane.Client/Modules/Admin/Modules/Import.razor
View File

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

5
Oqtane.Client/Modules/Admin/Modules/Settings.razor
View File

@ -130,11 +130,6 @@
private string modifiedby; private string modifiedby;
private DateTime modifiedon; private DateTime modifiedon;
protected override void OnParametersSet()
{
base.OnParametersSet();
base.SetModuleTitle(Localizer["ModuleTitle.Text"]);
}
protected override void OnInitialized() protected override void OnInitialized()
{ {
_module = ModuleState.ModuleDefinition.Name; _module = ModuleState.ModuleDefinition.Name;

6
Oqtane.Client/Modules/Admin/UserProfile/Add.razor
View File

@ -42,12 +42,6 @@
public override string Title => "Send Notification"; public override string Title => "Send Notification";
protected override void OnParametersSet()
{
base.OnParametersSet();
base.SetModuleTitle(Localizer["ModuleTitle.Text"]);
}
private async Task Send() private async Task Send()
{ {
try try

5
Oqtane.Client/Modules/Admin/UserProfile/View.razor
View File

@ -110,11 +110,6 @@
public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View; public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
public override string Title => "View Notification"; public override string Title => "View Notification";
protected override void OnParametersSet()
{
base.OnParametersSet();
base.SetModuleTitle(Localizer["ModuleTitle.Text"]);
}
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
try try

6
Oqtane.Client/Modules/HtmlText/Edit.razor
View File

@ -68,12 +68,6 @@
private List<Models.HtmlText> _htmltexts; private List<Models.HtmlText> _htmltexts;
private string _view = ""; private string _view = "";
protected override void OnParametersSet()
{
base.OnParametersSet();
base.SetModuleTitle(Localizer["ModuleTitle.Text"]);
}
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
try try

4
Oqtane.Client/Resources/Modules/Admin/Files/Details.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
@ -150,7 +150,7 @@
<data name="Description.Text" xml:space="preserve"> <data name="Description.Text" xml:space="preserve">
<value>Description:</value> <value>Description:</value>
</data> </data>
<data name="ModuleTitle.Text" xml:space="preserve"> <data name="File Management" xml:space="preserve">
<value>File Management</value> <value>File Management</value>
</data> </data>
</root> </root>

4
Oqtane.Client/Resources/Modules/Admin/Files/Edit.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
@ -192,7 +192,7 @@
<data name="Public" xml:space="preserve"> <data name="Public" xml:space="preserve">
<value>Public</value> <value>Public</value>
</data> </data>
<data name="ModuleTitle.Text" xml:space="preserve"> <data name="Folder Management" xml:space="preserve">
<value>Folder Management</value> <value>Folder Management</value>
</data> </data>
</root> </root>

4
Oqtane.Client/Resources/Modules/Admin/Modules/Export.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
@ -132,7 +132,7 @@
<data name="Success.Content.Export" xml:space="preserve"> <data name="Success.Content.Export" xml:space="preserve">
<value>Content Exported Successfully</value> <value>Content Exported Successfully</value>
</data> </data>
<data name="ModuleTitle.Text" xml:space="preserve"> <data name="Export Content" xml:space="preserve">
<value>Export Content</value> <value>Export Content</value>
</data> </data>
</root> </root>

4
Oqtane.Client/Resources/Modules/Admin/Modules/Import.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
@ -138,7 +138,7 @@
<data name="Message.Required.ImportContent" xml:space="preserve"> <data name="Message.Required.ImportContent" xml:space="preserve">
<value>You Must Enter Some Content To Import</value> <value>You Must Enter Some Content To Import</value>
</data> </data>
<data name="ModuleTitle.Text" xml:space="preserve"> <data name="Import Content" xml:space="preserve">
<value>Import Content</value> <value>Import Content</value>
</data> </data>
</root> </root>

4
Oqtane.Client/Resources/Modules/Admin/Modules/Settings.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
@ -156,7 +156,7 @@
<data name="Module.Text" xml:space="preserve"> <data name="Module.Text" xml:space="preserve">
<value>Module:</value> <value>Module:</value>
</data> </data>
<data name="ModuleTitle.Text" xml:space="preserve"> <data name="Module Settings" xml:space="preserve">
<value>Module Settings</value> <value>Module Settings</value>
</data> </data>
</root> </root>

4
Oqtane.Client/Resources/Modules/Admin/UserProfile/Add.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
@ -141,7 +141,7 @@
<data name="Subject.Text" xml:space="preserve"> <data name="Subject.Text" xml:space="preserve">
<value>Subject: </value> <value>Subject: </value>
</data> </data>
<data name="ModuleTitle.Text" xml:space="preserve"> <data name="Send Notification" xml:space="preserve">
<value>Send Notification</value> <value>Send Notification</value>
</data> </data>
</root> </root>

4
Oqtane.Client/Resources/Modules/Admin/UserProfile/View.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
@ -144,7 +144,7 @@
<data name="OriginalMessage" xml:space="preserve"> <data name="OriginalMessage" xml:space="preserve">
<value>Original Message</value> <value>Original Message</value>
</data> </data>
<data name="ModuleTitle.Text" xml:space="preserve"> <data name="View Notification" xml:space="preserve">
<value>View Notification</value> <value>View Notification</value>
</data> </data>
</root> </root>

2
Oqtane.Client/Resources/Modules/HtmlText/Edit.resx
View File

@ -156,7 +156,7 @@
<data name="Message.Content.Restored" xml:space="preserve"> <data name="Message.Content.Restored" xml:space="preserve">
<value>Version Restored</value> <value>Version Restored</value>
</data> </data>
<data name="ModuleTitle.Text" xml:space="preserve"> <data name="Edit Html/Text" xml:space="preserve">
<value>Edit Html/Text</value> <value>Edit Html/Text</value>
</data> </data>
<data name="Restore.Header" xml:space="preserve"> <data name="Restore.Header" xml:space="preserve">

5
Oqtane.Client/UI/SiteRouter.razor
View File

@ -12,6 +12,7 @@
@inject IUrlMappingService UrlMappingService @inject IUrlMappingService UrlMappingService
@inject ILogService LogService @inject ILogService LogService
@inject IJSRuntime JSRuntime @inject IJSRuntime JSRuntime
@inject IStringLocalizerFactory LocalizerFactory
@implements IHandleAfterRender @implements IHandleAfterRender
@if (!string.IsNullOrEmpty(_error)) @if (!string.IsNullOrEmpty(_error))
@ -387,6 +388,7 @@
private (Page Page, List<Module> Modules) ProcessModules(Page page, List<Module> modules, int moduleid, string action, string defaultcontainertype, Alias alias) 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>(); var paneindex = new Dictionary<string, int>();
foreach (Module module in modules) foreach (Module module in modules)
{ {
// initialize module control properties // initialize module control properties
@ -463,8 +465,9 @@
// additional metadata needed for admin components // additional metadata needed for admin components
if (module.ModuleId == moduleid && action != "") if (module.ModuleId == moduleid && action != "")
{ {
var localizer = LocalizerFactory.Create(module.ModuleType);
module.ControlTitle = localizer[moduleobject.Title];
module.SecurityAccessLevel = moduleobject.SecurityAccessLevel; module.SecurityAccessLevel = moduleobject.SecurityAccessLevel;
module.ControlTitle = moduleobject.Title;
module.Actions = moduleobject.Actions; module.Actions = moduleobject.Actions;
module.UseAdminContainer = moduleobject.UseAdminContainer; module.UseAdminContainer = moduleobject.UseAdminContainer;
} }