Diplomarbeit-Absolventenverein/oqtane.framework-not-mirrored
Archived
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed comment and added defensive logic in the eent that the moduletype is not valid. Also changed default behavior to display the name if the key is missing. Will need an option in the future to enable the display of missing keys.

Browse Source
This commit is contained in:
Shaun Walker 2020-11-09 09:27:52 -05:00
parent a77aa5fe18
commit 41b30bfab2
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Oqtane.Client/Modules/Controls/LocalizableComponent.cs
View File

@ -17,14 +17,15 @@ namespace Oqtane.Modules.Controls
protected string Localize(string name)
{
var key = $"{ResourceKey}.{name}";
// TODO: we should have a ShowMissingResourceKeys option which developers/translators can enable to find missing translations which would display the key rather than the name
if (!IsLocalizable)
{
return name;
}
var key = $"{ResourceKey}.{name}";
return _localizer?[key] ?? key;
return _localizer?[key] ?? name;
}
protected override void OnParametersSet()
@ -34,12 +35,13 @@ namespace Oqtane.Modules.Controls
if (ModuleState?.ModuleType != null)
{
var moduleType = Type.GetType(ModuleState.ModuleType);
// HACK: Use ServiceActivator instead of injecting IHttpContextAccessor, because HttpContext throws NRE in WebAssembly runtime
using (var scope = ServiceActivator.GetScope())
if (moduleType != null)
{
var localizerFactory = scope.ServiceProvider.GetService<IStringLocalizerFactory>();
_localizer = localizerFactory.Create(moduleType);
using (var scope = ServiceActivator.GetScope())
{
var localizerFactory = scope.ServiceProvider.GetService<IStringLocalizerFactory>();
_localizer = localizerFactory.Create(moduleType);
}
}
}