Merge pull request #2222 from hishamco/pager

Pager should inherits from LocalizableComponent

Oqtane.Client/Modules/Controls/LocalizableComponent.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Text;
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
@@ -9,6 +10,7 @@ namespace Oqtane.Modules.Controls
     public class LocalizableComponent : ModuleControlBase
     {
         private IStringLocalizer _localizer;
+        private IStringLocalizer _resourceLocalizer;
 
         [Parameter]
         public string ResourceKey { get; set; }
@@ -18,6 +20,37 @@ 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)
@@ -53,12 +86,12 @@ namespace Oqtane.Modules.Controls
         {
             IsLocalizable = false;
 
-            if (string.IsNullOrEmpty(ResourceType))
+            if (String.IsNullOrEmpty(ResourceType))
             {
                 ResourceType = ModuleState?.ModuleType;
             }
 
-            if (!String.IsNullOrEmpty(ResourceKey) && !string.IsNullOrEmpty(ResourceType))
+            if (!String.IsNullOrEmpty(ResourceKey) && !String.IsNullOrEmpty(ResourceType))
             {
                 var moduleType = Type.GetType(ResourceType);
                 if (moduleType != null)
@@ -73,5 +106,26 @@ namespace Oqtane.Modules.Controls
                 }
             }
         }
+
+        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 ModuleControlBase
+@inherits LocalizableComponent
-@inject IStringLocalizer<SharedResources> Localizer
+
 @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;">@Localizer["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;">@Localizer["PageOfPages", @_page, @_pages]</a>
+               <a class="page-link" style="white-space: nowrap;">@T["PageOfPages", _page, _pages]</a>
             </li>
         </ul>
     }
@@ -208,7 +208,7 @@
     [Parameter]
     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
 
     [Parameter]

Oqtane.Client/Resources/Modules/Controls/Pager.resx

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="PageOfPages" xml:space="preserve">
+    <value>Page {0} of {1}</value>
+  </data>
+</root>