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

Refactor LocalizableComponent

Browse Source
This commit is contained in:
hishamco 2020-12-08 16:37:55 +03:00
parent d953587e4b
commit df1d646083
6 changed files with 33 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Oqtane.Client/Modules/Controls/ActionDialog.razor
View File

@ -97,12 +97,9 @@
_iconSpan = $"<span class=\"oi oi-{IconName}\"></span>&nbsp;"; _iconSpan = $"<span class=\"oi oi-{IconName}\"></span>&nbsp;";
} }
if (IsLocalizable) Text = Localize(nameof(Text), Text);
{ Header = Localize(nameof(Header), Header);
Text = Localize(nameof(Text), Text); Message = Localize(nameof(Message), Message);
Header = Localize(nameof(Header), Header);
Message = Localize(nameof(Message), Message);
}
_authorized = IsAuthorized(); _authorized = IsAuthorized();
} }

6
Oqtane.Client/Modules/Controls/ActionLink.razor
View File

@ -95,11 +95,7 @@
} }
if (IsLocalizable) _text = Localize(nameof(Text), _text);
{
_text = Localize(nameof(Text), _text);
}
_url = EditUrl(Action, _parameters); _url = EditUrl(Action, _parameters);
_authorized = IsAuthorized(); _authorized = IsAuthorized();
} }

4
Oqtane.Client/Modules/Controls/Label.razor
View File

@ -45,11 +45,11 @@ else
if (IsLocalizable) if (IsLocalizable)
{ {
var value = Localize("Text");
var key = $"{ResourceKey}.Text"; var key = $"{ResourceKey}.Text";
var value = Localize(key);
if (!value.Equals(key)) if (!value.Equals(key))
{ {
ChildContent =@<text>@Localize("Text")</text>; ChildContent =@<text>@value</text>;
} }
HelpText = Localize(nameof(HelpText), HelpText); HelpText = Localize(nameof(HelpText), HelpText);

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

@ -15,27 +15,22 @@ namespace Oqtane.Modules.Controls
protected bool IsLocalizable { get; private set; } protected bool IsLocalizable { get; private set; }
protected string Localize(string name) protected string Localize(string name) => _localizer?[name] ?? 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 protected string Localize(string propertyName, string propertyValue)
{
if (!IsLocalizable) if (!IsLocalizable)
{ {
return name; return propertyValue;
} }
return _localizer?[key] ?? name; var key = $"{ResourceKey}.{propertyName}";
} var value = Localize(key);
protected string Localize(string name, string defaultValue)
{
var key = $"{ResourceKey}.{name}";
var value = Localize(name);
if (value == key) if (value == key)
{ {
return defaultValue; // Returns default property value (English version) instead of ResourceKey.PropertyName
return propertyValue;
} }
else else
{ {
@ -45,26 +40,21 @@ namespace Oqtane.Modules.Controls
protected override void OnParametersSet() protected override void OnParametersSet()
{ {
if (!String.IsNullOrEmpty(ResourceKey)) IsLocalizable = false;
if (!String.IsNullOrEmpty(ResourceKey) && ModuleState?.ModuleType != null)
{ {
if (ModuleState?.ModuleType != null) var moduleType = Type.GetType(ModuleState.ModuleType);
if (moduleType != null)
{ {
var moduleType = Type.GetType(ModuleState.ModuleType); using (var scope = ServiceActivator.GetScope())
if (moduleType != null)
{ {
using (var scope = ServiceActivator.GetScope()) var localizerFactory = scope.ServiceProvider.GetService<IStringLocalizerFactory>();
{ _localizer = localizerFactory.Create(moduleType);
var localizerFactory = scope.ServiceProvider.GetService<IStringLocalizerFactory>();
_localizer = localizerFactory.Create(moduleType); IsLocalizable = true;
}
} }
} }
IsLocalizable = true;
}
else
{
IsLocalizable = false;
} }
} }
} }

9
Oqtane.Client/Modules/Controls/Section.razor
View File

@ -46,11 +46,8 @@
{ {
base.OnParametersSet(); base.OnParametersSet();
if (IsLocalizable) _heading = !string.IsNullOrEmpty(Heading)
{ ? Localize(nameof(Heading), Heading)
_heading = !string.IsNullOrEmpty(Heading) : Localize(nameof(Name), Name);
? Localize(nameof(Heading), Heading)
: Localize(nameof(Name), Name);
}
} }
} }

15
Oqtane.Client/Modules/Controls/TabPanel.razor
View File

@ -40,16 +40,13 @@ else
{ {
base.OnParametersSet(); base.OnParametersSet();
if (IsLocalizable) if (string.IsNullOrEmpty(Heading))
{ {
if (string.IsNullOrEmpty(Heading)) Name = Localize(nameof(Name), Name);
{ }
Name = Localize(nameof(Name), Name); else
} {
else Heading = Localize(nameof(Heading), Heading);
{
Heading = Localize(nameof(Heading), Heading);
}
} }
} }