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

Fallback to English as default culture

Browse Source
This commit is contained in:
hishamco 2020-11-17 22:28:17 +03:00
parent 2b371b2a9f
commit d8d1412a8f
5 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,8 +99,8 @@
if (IsLocalizable)
{
Header = Localize(nameof(Header));
Message = Localize(nameof(Message));
Header = Localize(nameof(Header), Header);
Message = Localize(nameof(Message), Message);
}
_authorized = IsAuthorized();

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

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

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

@ -24,10 +24,25 @@ namespace Oqtane.Modules.Controls
{
return name;
}
return _localizer?[key] ?? name;
}
protected string Localize(string name, string defaultValue)
{
var key = $"{ResourceKey}.{name}";
var value = Localize(name);
if (value == key)
{
return defaultValue;
}
else
{
return value;
}
}
protected override void OnParametersSet()
{
if (!String.IsNullOrEmpty(ResourceKey))

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

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

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

@ -44,11 +44,11 @@ else
{
if (string.IsNullOrEmpty(Heading))
{
Name = Localize(nameof(Name));
Name = Localize(nameof(Name), Name);
}
else
{
Heading = Localize(nameof(Heading));
Heading = Localize(nameof(Heading), Heading);
}
}
}