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

Avoid breaking changes

Browse Source
This commit is contained in:
Hisham Bin Ateya
2022-05-31 10:40:42 +03:00
parent aa98508e57
commit a83ed40ec4
7 changed files with 39 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,9 +105,9 @@
_iconSpan = $"<span class=\"{IconName}\"></span>&nbsp;"; _iconSpan = $"<span class=\"{IconName}\"></span>&nbsp;";
} }
Text = LocalizeResource(nameof(Text), Text); Text = Localize(nameof(Text), Text);
Header = LocalizeResource(nameof(Header), Header); Header = Localize(nameof(Header), Header);
Message = LocalizeResource(nameof(Message), Message); Message = Localize(nameof(Message), Message);
_permissions = (string.IsNullOrEmpty(Permissions)) ? ModuleState.Permissions : Permissions; _permissions = (string.IsNullOrEmpty(Permissions)) ? ModuleState.Permissions : Permissions;
_authorized = IsAuthorized(); _authorized = IsAuthorized();

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

@ -116,7 +116,7 @@
} }
_permissions = (string.IsNullOrEmpty(Permissions)) ? ModuleState.Permissions : Permissions; _permissions = (string.IsNullOrEmpty(Permissions)) ? ModuleState.Permissions : Permissions;
_text = LocalizeResource(nameof(Text), _text); _text = Localize(nameof(Text), _text);
_url = (ModuleId == -1) ? EditUrl(Action, _parameters) : EditUrl(ModuleId, Action, _parameters); _url = (ModuleId == -1) ? EditUrl(Action, _parameters) : EditUrl(ModuleId, Action, _parameters);
_authorized = IsAuthorized(); _authorized = IsAuthorized();
} }

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

@ -35,7 +35,7 @@ else
if (!string.IsNullOrEmpty(HelpText)) if (!string.IsNullOrEmpty(HelpText))
{ {
_helptext = LocalizeResource(nameof(HelpText), HelpText); _helptext = Localize(nameof(HelpText), HelpText);
_labelclass = "form-label"; _labelclass = "form-label";
var spanclass = (!string.IsNullOrEmpty(Class)) ? " " + Class : ""; var spanclass = (!string.IsNullOrEmpty(Class)) ? " " + Class : "";
@ -47,7 +47,7 @@ else
_labelclass = "form-label" + labelclass; _labelclass = "form-label" + labelclass;
} }
var text = LocalizeResource("Text", String.Empty); var text = Localize("Text", String.Empty);
if (!string.IsNullOrEmpty(text)) if (!string.IsNullOrEmpty(text))
{ {
ChildContent =@<text>@text</text>; ChildContent =@<text>@text</text>;

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

@ -19,27 +19,37 @@ namespace Oqtane.Modules.Controls
protected bool IsLocalizable { get; private set; } protected bool IsLocalizable { get; private set; }
protected string Localize(string name) protected IStringLocalizer T
{ {
if (_localizer == null) get
{ {
_localizer = CreateLocalizer(); if (_resourceLocalizer == null)
{
using (var scope = ServiceActivator.GetScope())
{
var controlType = GetType();
var controlTypeName = controlType.Name;
// Remove `1 if the control is generic type
if (controlTypeName.EndsWith("`1"))
{
controlTypeName = controlTypeName.TrimEnd('`', '1');
} }
return _localizer[name]; var baseName = controlType.FullName[0..controlType.FullName.IndexOf(controlTypeName)].Substring("Oqtane.".Length);
var localizerFactory = scope.ServiceProvider.GetService<IStringLocalizerFactory>();
_resourceLocalizer = localizerFactory.Create(baseName + controlTypeName, controlType.Assembly.GetName().Name);
}
} }
protected string Localize(string name, params object[] arguments) return _resourceLocalizer;
{ }
if (_localizer == null)
{
_localizer = CreateLocalizer();
} }
return _localizer[name, arguments]; protected string Localize(string name) => _localizer?[name] ?? name;
}
protected string LocalizeResource(string propertyName, string propertyValue) protected string Localize(string propertyName, string propertyValue)
{ {
if (!IsLocalizable) if (!IsLocalizable)
{ {
@ -47,7 +57,7 @@ namespace Oqtane.Modules.Controls
} }
var key = $"{ResourceKey}.{propertyName}"; var key = $"{ResourceKey}.{propertyName}";
var value = _resourceLocalizer?[key] ?? key; var value = Localize(key);
if (value == key) if (value == key)
{ {
@ -85,34 +95,12 @@ namespace Oqtane.Modules.Controls
using (var scope = ServiceActivator.GetScope()) using (var scope = ServiceActivator.GetScope())
{ {
var localizerFactory = scope.ServiceProvider.GetService<IStringLocalizerFactory>(); var localizerFactory = scope.ServiceProvider.GetService<IStringLocalizerFactory>();
_resourceLocalizer = localizerFactory.Create(moduleType); _localizer = localizerFactory.Create(moduleType);
IsLocalizable = true; IsLocalizable = true;
} }
} }
} }
} }
private IStringLocalizer CreateLocalizer()
{
using (var scope = ServiceActivator.GetScope())
{
var controlType = GetType();
var controlTypeName = controlType.Name;
// Remove `1 if the control is generic type
if (controlTypeName.EndsWith("`1"))
{
controlTypeName = controlTypeName.TrimEnd('`', '1');
}
var baseName = controlType.FullName[0..controlType.FullName.IndexOf(controlTypeName)].Substring("Oqtane.".Length);
var localizerFactory = scope.ServiceProvider.GetService<IStringLocalizerFactory>();
_localizer = localizerFactory.Create(baseName + controlTypeName, controlType.Assembly.GetName().Name);
}
return _localizer;
}
} }
} }

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

@ -49,7 +49,7 @@
<a class="page-link" @onclick=@(async () => UpdateList(_pages))><span class="oi oi-media-step-forward" title="end" aria-hidden="true"></span></a> <a class="page-link" @onclick=@(async () => UpdateList(_pages))><span class="oi oi-media-step-forward" title="end" aria-hidden="true"></span></a>
</li> </li>
<li class="page-item disabled"> <li class="page-item disabled">
<a class="page-link" style="white-space: nowrap;">@Localize("PageOfPages", _page, _pages)</a> <a class="page-link" style="white-space: nowrap;">@T["PageOfPages", _page, _pages]</a>
</li> </li>
</ul> </ul>
} }
@ -157,7 +157,7 @@
<a class="page-link" @onclick=@(async () => UpdateList(_pages))><span class="oi oi-media-step-forward" title="end" aria-hidden="true"></span></a> <a class="page-link" @onclick=@(async () => UpdateList(_pages))><span class="oi oi-media-step-forward" title="end" aria-hidden="true"></span></a>
</li> </li>
<li class="page-item disabled"> <li class="page-item disabled">
<a class="page-link" style="white-space: nowrap;">@Localize("PageOfPages", _page, _pages)</a> <a class="page-link" style="white-space: nowrap;">@T["PageOfPages", _page, _pages]</a>
</li> </li>
</ul> </ul>
} }

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

@ -49,7 +49,7 @@
base.OnParametersSet(); base.OnParametersSet();
_heading = !string.IsNullOrEmpty(Heading) _heading = !string.IsNullOrEmpty(Heading)
? LocalizeResource(nameof(Heading), Heading) ? Localize(nameof(Heading), Heading)
: LocalizeResource(nameof(Name), Name); : Localize(nameof(Name), Name);
} }
} }

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

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