Fallback to English as default culture

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

View File

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

View File

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

View File

@ -28,6 +28,21 @@ namespace Oqtane.Modules.Controls
return _localizer?[key] ?? 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() protected override void OnParametersSet()
{ {
if (!String.IsNullOrEmpty(ResourceKey)) if (!String.IsNullOrEmpty(ResourceKey))

View File

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

View File

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