added extension method for creating a LocalizerFactory using a type name, refactored Pager and LocalizableComponent to use LocalizerFactory

Oqtane.Client/Extensions/OqtaneLocalizationExtensions.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace Microsoft.Extensions.Localization
 {
     public static class OqtaneLocalizationExtensions
@@ -18,5 +20,42 @@ namespace Microsoft.Extensions.Localization
             }
             return localizedValue;
         }
+
+        /// <summary>
+        /// Creates an IStringLocalizer based on a type name. This extension method is useful in scenarios where the default IStringLocalizer is unable to locate the resources.
+        /// </summary>
+        /// <param name="localizerFactory"></param>
+        /// <param name="fullTypeName">the full type name ie. GetType().FullName</param>
+        /// <returns></returns>
+        public static IStringLocalizer Create(this IStringLocalizerFactory localizerFactory, string fullTypeName)
+        {
+            var typename = fullTypeName;
+
+            // handle generic types
+            var type = Type.GetType(fullTypeName);
+            if (type.IsGenericType)
+            {
+                typename = type.GetGenericTypeDefinition().FullName;
+                typename = typename.Substring(0, typename.IndexOf("`")); // remove generic type info
+            }
+
+            // format typename
+            if (typename.Contains(","))
+            {
+                typename = typename.Substring(0, typename.IndexOf(",")); // remove assembly info
+            }
+
+            // remove rootnamespace
+            var rootnamespace = "";
+            var attributes = type.Assembly.GetCustomAttributes(typeof(RootNamespaceAttribute), false);
+            if (attributes.Length > 0)
+            {
+                rootnamespace = ((RootNamespaceAttribute)attributes[0]).RootNamespace;
+            }
+            typename = typename.Replace(rootnamespace + ".", "");
+
+            // create IStringLocalizer using factory
+            return localizerFactory.Create(typename, type.Assembly.GetName().Name);
+        }    
     }
 }

Oqtane.Client/Modules/Controls/LocalizableComponent.cs

@@ -1,16 +1,14 @@
 using System;
-using System.Text;
 using Microsoft.AspNetCore.Components;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
-using Oqtane.Shared;
 
 namespace Oqtane.Modules.Controls
 {
     public class LocalizableComponent : ModuleControlBase
     {
+        [Inject] public IStringLocalizerFactory LocalizerFactory { get; set; }
+
         private IStringLocalizer _localizer;
-        private IStringLocalizer _resourceLocalizer;
 
         [Parameter]
         public string ResourceKey { get; set; }
@@ -20,37 +18,6 @@ namespace Oqtane.Modules.Controls
 
         protected bool IsLocalizable { get; private set; }
 
-        protected IStringLocalizer T
-        {
-            get
-            {
-                if (_resourceLocalizer == null)
-                {
-                    using (var scope = ServiceActivator.GetScope())
-                    {
-                        var controlType = GetType();
-                        var controlTypeName = controlType.Name;
-                        var assemblyName = controlType.Assembly.GetName().Name;
-
-                        if (controlType.IsGenericType)
-                        {
-                            // Trim generic type suffix
-                            controlTypeName = controlTypeName[..controlTypeName.IndexOf('`')];
-                        }
-
-                        controlTypeName = controlType.FullName[..(controlType.FullName.IndexOf(controlTypeName) + controlTypeName.Length)];
-
-                        var baseName = GetBaseName(controlTypeName, assemblyName);
-                        var localizerFactory = scope.ServiceProvider.GetService<IStringLocalizerFactory>();
-
-                        _resourceLocalizer = localizerFactory.Create(baseName, assemblyName);
-                    }
-                }
-
-                return _resourceLocalizer;
-            }
-        }
-
         protected string Localize(string name) => _localizer?[name] ?? name;
 
         protected string Localize(string propertyName, string propertyValue)
@@ -63,22 +30,15 @@ namespace Oqtane.Modules.Controls
             var key = $"{ResourceKey}.{propertyName}";
             var value = Localize(key);
 
-            if (value == key)
+            if (value == key || value == String.Empty)
             {
-                // Returns default property value (English version) instead of ResourceKey.PropertyName
+                // return default property value if key does not exist in resource file or value is empty
                 return propertyValue;
             }
             else
             {
-                if (value == String.Empty)
+                // return localized value
-                {
+                return value;
-                    // Returns default property value (English version)
-                    return propertyValue;
-                }
-                else
-                {
-                    return value;
-                }
             }
         }
 
@@ -93,39 +53,9 @@ namespace Oqtane.Modules.Controls
 
             if (!String.IsNullOrEmpty(ResourceKey) && !String.IsNullOrEmpty(ResourceType))
             {
-                var moduleType = Type.GetType(ResourceType);
+                _localizer = LocalizerFactory.Create(ResourceType);
-                if (moduleType != null)
+                IsLocalizable = true;
-                {
-                    using (var scope = ServiceActivator.GetScope())
-                    {
-                        var localizerFactory = scope.ServiceProvider.GetService<IStringLocalizerFactory>();
-                        _localizer = localizerFactory.Create(moduleType);
-
-                        IsLocalizable = true;
-                    }
-                }
             }
         }
-
-        private static string GetBaseName(string typeName, string assemblyName)
-        {
-            var baseName = new StringBuilder(typeName);
-
-            var tokens = assemblyName.Split(".");
-
-            foreach (var token in tokens)
-            {
-                var index = baseName.ToString().IndexOf(token);
-
-                if (index == -1)
-                {
-                    continue;
-                }
-
-                baseName.Remove(index, token.Length + 1);
-            }
-
-            return baseName.ToString();
-        }
     }
 }

Oqtane.Client/Modules/Controls/Pager.razor

@@ -1,6 +1,6 @@
 @namespace Oqtane.Modules.Controls
-@inherits LocalizableComponent
+@inherits ModuleControlBase
-
+@inject IStringLocalizerFactory LocalizerFactory
 @typeparam TableItem
 
 @if (ItemList != null)
@@ -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;">@T["PageOfPages", _page, _pages]</a>
+                <a class="page-link" style="white-space: nowrap;">@Localizer["PageOfPages", _page, _pages]</a>
             </li>
         </ul>
     }
@@ -157,67 +157,73 @@
                 <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;">@T["PageOfPages", _page, _pages]</a>
+               <a class="page-link" style="white-space: nowrap;">@Localizer["PageOfPages", _page, _pages]</a>
             </li>
         </ul>
     }
 }
 
 @code {
-    private int _pages = 0;
+	private IStringLocalizer Localizer;
-    private int _page = 1;
+	private int _pages = 0;
-    private int _maxItems = 10;
+	private int _page = 1;
-    private int _displayPages = 5;
+	private int _maxItems = 10;
-    private int _startPage = 0;
+	private int _displayPages = 5;
-    private int _endPage = 0;
+	private int _startPage = 0;
-    private int _columns = 0;
+	private int _endPage = 0;
+	private int _columns = 0;
 
-    [Parameter]
+	[Parameter]
-    public string Format { get; set; } // Table or Grid
+	public string Format { get; set; } // Table or Grid
 
-    [Parameter]
+	[Parameter]
-    public string Toolbar { get; set; } // Top, Bottom or Both
+	public string Toolbar { get; set; } // Top, Bottom or Both
 
-    [Parameter]
+	[Parameter]
-    public RenderFragment Header { get; set; } = null; // only applicable to Table layouts
+	public RenderFragment Header { get; set; } = null; // only applicable to Table layouts
 
-    [Parameter]
+	[Parameter]
-    public RenderFragment<TableItem> Row { get; set; } = null; // required
+	public RenderFragment<TableItem> Row { get; set; } = null; // required
 
-    [Parameter]
+	[Parameter]
-    public RenderFragment<TableItem> Detail { get; set; } = null; // only applicable to Table layouts
+	public RenderFragment<TableItem> Detail { get; set; } = null; // only applicable to Table layouts
 
-    [Parameter]
+	[Parameter]
-    public IEnumerable<TableItem> Items { get; set; } // the IEnumerable data source
+	public IEnumerable<TableItem> Items { get; set; } // the IEnumerable data source
 
-    [Parameter]
+	[Parameter]
-    public string PageSize { get; set; } // number of items to display on a page
+	public string PageSize { get; set; } // number of items to display on a page
 
-    [Parameter]
+	[Parameter]
-    public string Columns { get; set; } // only applicable to Grid layouts - default is zero indicating use responsive behavior
+	public string Columns { get; set; } // only applicable to Grid layouts - default is zero indicating use responsive behavior
 
-    [Parameter]
+	[Parameter]
-    public string CurrentPage { get; set; } // sets the initial page to display
+	public string CurrentPage { get; set; } // sets the initial page to display
 
-    [Parameter]
+	[Parameter]
-    public string DisplayPages { get; set; } // maximum number of page numbers to display for user selection
+	public string DisplayPages { get; set; } // maximum number of page numbers to display for user selection
 
-    [Parameter]
+	[Parameter]
-    public string Class { get; set; } // class for the containing element - ie. <table> for Table or <div> for Grid
+	public string Class { get; set; } // class for the containing element - ie. <table> for Table or <div> for Grid
 
-    [Parameter]
+	[Parameter]
-    public string RowClass { get; set; } // class for row element - ie. <tr> for Table or <div> for Grid
+	public string RowClass { get; set; } // class for row element - ie. <tr> for Table or <div> for Grid
 
-    [Parameter]
+	[Parameter]
-    public string ColumnClass { get; set; } // class for column element - only applicable to Grid format
+	public string ColumnClass { get; set; } // class for column element - only applicable to Grid format
 
-    [Parameter]
+	[Parameter]
-    public Action<int> OnPageChange { get; set; } // a method to be executed in the calling component when the page changes
+	public Action<int> OnPageChange { get; set; } // a method to be executed in the calling component when the page changes
 
-    private IEnumerable<TableItem> ItemList { get; set; }
+	private IEnumerable<TableItem> ItemList { get; set; }
 
-    protected override void OnParametersSet()
+	protected override void OnInitialized()
-    {
+	{
+		Localizer = LocalizerFactory.Create(GetType().FullName);
+	}
+
+	protected override void OnParametersSet()
+	{
         if (string.IsNullOrEmpty(Format))
         {
             Format = "Table";