Avoid breaking changes

Oqtane.Client/Modules/Controls/ActionDialog.razor

@@ -105,9 +105,9 @@
             _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;
         _authorized = IsAuthorized();

Oqtane.Client/Modules/Controls/ActionLink.razor

@@ -116,7 +116,7 @@
 		}
 
 		_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);
         _authorized = IsAuthorized();
     }

Oqtane.Client/Modules/Controls/Label.razor

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

Oqtane.Client/Modules/Controls/LocalizableComponent.cs

@@ -19,27 +19,37 @@ namespace Oqtane.Modules.Controls
 
         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;
 
-            return _localizer[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>();
+
+                        _resourceLocalizer = localizerFactory.Create(baseName + controlTypeName, controlType.Assembly.GetName().Name);
+                    }
+                }
+
+                return _resourceLocalizer;
+            }
         }
 
-        protected string Localize(string name, params object[] arguments)
+        protected string Localize(string name) => _localizer?[name] ?? name;
-        {
-            if (_localizer == null)
-            {
-                _localizer = CreateLocalizer();
-            }
 
-            return _localizer[name, arguments];
+        protected string Localize(string propertyName, string propertyValue)
-        }
-
-        protected string LocalizeResource(string propertyName, string propertyValue)
         {
             if (!IsLocalizable)
             {
@@ -47,7 +57,7 @@ namespace Oqtane.Modules.Controls
             }
 
             var key = $"{ResourceKey}.{propertyName}";
-            var value = _resourceLocalizer?[key] ?? key;
+            var value = Localize(key);
 
             if (value == key)
             {
@@ -85,34 +95,12 @@ namespace Oqtane.Modules.Controls
                     using (var scope = ServiceActivator.GetScope())
                     {
                         var localizerFactory = scope.ServiceProvider.GetService<IStringLocalizerFactory>();
-                        _resourceLocalizer = localizerFactory.Create(moduleType);
+                        _localizer = localizerFactory.Create(moduleType);
 
                         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;
-        }
     }
 }

Oqtane.Client/Modules/Controls/Pager.razor

@@ -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>
             </li>
             <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>
         </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>
             </li>
             <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>
         </ul>
     }

Oqtane.Client/Modules/Controls/Section.razor

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

Oqtane.Client/Modules/Controls/TabPanel.razor

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