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

Merge pull request #987 from hishamco/localizable-component

Browse Source 
Localizable Component Enhancement
This commit is contained in:
Shaun Walker 2020-12-09 09:54:15 -05:00 committed by GitHub
commit 3c13122c37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 45 additions and 64 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;";
}
if (IsLocalizable)
{
Text = Localize(nameof(Text), Text);
Header = Localize(nameof(Header), Header);
Message = Localize(nameof(Message), Message);
}
Text = Localize(nameof(Text), Text);
Header = Localize(nameof(Header), Header);
Message = Localize(nameof(Message), Message);
_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);
_authorized = IsAuthorized();
}

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

@ -43,16 +43,12 @@ else
_openLabel += ">";
if (IsLocalizable)
var text = Localize("Text", String.Empty);
if (text != String.Empty)
{
var value = Localize("Text");
var key = $"{ResourceKey}.Text";
if (!value.Equals(key))
{
ChildContent =@<text>@Localize("Text")</text>;
}
HelpText = Localize(nameof(HelpText), HelpText);
ChildContent =@<text>@text</text>;
}
HelpText = Localize(nameof(HelpText), HelpText);
}
}

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

@ -15,56 +15,54 @@ namespace Oqtane.Modules.Controls
protected bool IsLocalizable { get; private set; }
protected string Localize(string name)
{
var key = $"{ResourceKey}.{name}";
protected string Localize(string name) => _localizer?[name] ?? 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)
{
return name;
return propertyValue;
}
return _localizer?[key] ?? name;
}
protected string Localize(string name, string defaultValue)
{
var key = $"{ResourceKey}.{name}";
var value = Localize(name);
var key = $"{ResourceKey}.{propertyName}";
var value = Localize(key);
if (value == key)
{
return defaultValue;
// Returns default property value (English version) instead of ResourceKey.PropertyName
return propertyValue;
}
else
{
return value;
if (value == String.Empty)
{
// Returns default property value (English version)
return propertyValue;
}
else
{
return value;
}
}
}
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);
if (moduleType != null)
using (var scope = ServiceActivator.GetScope())
{
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();
if (IsLocalizable)
{
_heading = !string.IsNullOrEmpty(Heading)
? Localize(nameof(Heading), Heading)
: Localize(nameof(Name), Name);
}
_heading = !string.IsNullOrEmpty(Heading)
? Localize(nameof(Heading), Heading)
: Localize(nameof(Name), Name);
}
}

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

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