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

Merge pull request #3156 from sbwalker/dev

Browse Source 
migrate LocalizerFactory logic from SiteRouter to ModuleTitle component
This commit is contained in:
Shaun Walker 2023-08-17 08:23:30 -04:00 committed by GitHub
commit 4c5460fc9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Oqtane.Client/Themes/Controls/Container/ModuleTitle.razor
View File

@ -3,6 +3,7 @@
@inherits ContainerBase @inherits ContainerBase
@attribute [OqtaneIgnore] @attribute [OqtaneIgnore]
@inject IStringLocalizer<SharedResources> SharedLocalizer @inject IStringLocalizer<SharedResources> SharedLocalizer
@inject IStringLocalizerFactory LocalizerFactory
<span class="app-moduletitle"> <span class="app-moduletitle">
@((MarkupString)title) @((MarkupString)title)
@ -20,7 +21,8 @@
{ {
if (!string.IsNullOrEmpty(ModuleState.ControlTitle)) if (!string.IsNullOrEmpty(ModuleState.ControlTitle))
{ {
title = ModuleState.ControlTitle; var localizer = LocalizerFactory.Create(ModuleState.ModuleType);
title = localizer[ModuleState.ControlTitle];
} }
else else
{ {

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

@ -12,7 +12,6 @@
@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))
@ -465,8 +464,7 @@
// 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 = moduleobject.Title;
module.ControlTitle = localizer[moduleobject.Title];
module.SecurityAccessLevel = moduleobject.SecurityAccessLevel; module.SecurityAccessLevel = moduleobject.SecurityAccessLevel;
module.Actions = moduleobject.Actions; module.Actions = moduleobject.Actions;
module.UseAdminContainer = moduleobject.UseAdminContainer; module.UseAdminContainer = moduleobject.UseAdminContainer;