diff --git a/Oqtane.Client/Modules/Controls/Label.razor b/Oqtane.Client/Modules/Controls/Label.razor index c54ccc41..3869d8b4 100644 --- a/Oqtane.Client/Modules/Controls/Label.razor +++ b/Oqtane.Client/Modules/Controls/Label.razor @@ -43,7 +43,10 @@ else _openLabel += ">"; - ChildContent =@@Localize("Text"); - HelpText = Localize(nameof(HelpText)); + if (IsLocalizable) + { + ChildContent =@@Localize("Text"); + HelpText = Localize(nameof(HelpText)); + } } } diff --git a/Oqtane.Client/Modules/Controls/LocalizableComponent.cs b/Oqtane.Client/Modules/Controls/LocalizableComponent.cs index 328ba8d5..19e1aa46 100644 --- a/Oqtane.Client/Modules/Controls/LocalizableComponent.cs +++ b/Oqtane.Client/Modules/Controls/LocalizableComponent.cs @@ -12,10 +12,17 @@ namespace Oqtane.Modules.Controls [Parameter] public string ResourceKey { get; set; } + protected bool IsLocalizable { get; private set; } + protected string Localize(string name) { - var key = $"{ResourceKey}.{name}"; + if (!IsLocalizable) + { + return null; + } + var key = $"{ResourceKey}.{name}"; + return _localizer?[key] ?? key; } @@ -35,6 +42,12 @@ namespace Oqtane.Modules.Controls _localizer = (IStringLocalizer)scope.ServiceProvider.GetService(localizerType); } } + + IsLocalizable = true; + } + else + { + IsLocalizable = false; } } }