From 394b8f1ce67c8b2a9090674e3a2b46bcc7b7622f Mon Sep 17 00:00:00 2001 From: sbwalker Date: Thu, 17 Aug 2023 08:23:17 -0400 Subject: [PATCH] migrate LocalizerFactory logic from SiteRouter to ModuleTitle component --- Oqtane.Client/Themes/Controls/Container/ModuleTitle.razor | 4 +++- Oqtane.Client/UI/SiteRouter.razor | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Oqtane.Client/Themes/Controls/Container/ModuleTitle.razor b/Oqtane.Client/Themes/Controls/Container/ModuleTitle.razor index 007f2d41..c79e4325 100644 --- a/Oqtane.Client/Themes/Controls/Container/ModuleTitle.razor +++ b/Oqtane.Client/Themes/Controls/Container/ModuleTitle.razor @@ -3,6 +3,7 @@ @inherits ContainerBase @attribute [OqtaneIgnore] @inject IStringLocalizer SharedLocalizer +@inject IStringLocalizerFactory LocalizerFactory @((MarkupString)title) @@ -20,7 +21,8 @@ { if (!string.IsNullOrEmpty(ModuleState.ControlTitle)) { - title = ModuleState.ControlTitle; + var localizer = LocalizerFactory.Create(ModuleState.ModuleType); + title = localizer[ModuleState.ControlTitle]; } else { diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor index c9de574e..ce4325db 100644 --- a/Oqtane.Client/UI/SiteRouter.razor +++ b/Oqtane.Client/UI/SiteRouter.razor @@ -12,7 +12,6 @@ @inject IUrlMappingService UrlMappingService @inject ILogService LogService @inject IJSRuntime JSRuntime -@inject IStringLocalizerFactory LocalizerFactory @implements IHandleAfterRender @if (!string.IsNullOrEmpty(_error)) @@ -465,8 +464,7 @@ // additional metadata needed for admin components if (module.ModuleId == moduleid && action != "") { - var localizer = LocalizerFactory.Create(module.ModuleType); - module.ControlTitle = localizer[moduleobject.Title]; + module.ControlTitle = moduleobject.Title; module.SecurityAccessLevel = moduleobject.SecurityAccessLevel; module.Actions = moduleobject.Actions; module.UseAdminContainer = moduleobject.UseAdminContainer;