From e1b02ee405f57d88c1a65a53e7514fe44e0c81d5 Mon Sep 17 00:00:00 2001
From: hishamco <hishamco_2007@yahoo.com>
Date: Fri, 20 Nov 2020 00:53:55 +0300
Subject: [PATCH 1/2] Localize components for the logs pages

---
 Oqtane.Client/Modules/Admin/Logs/Detail.razor | 30 +++++++++----------
 Oqtane.Client/Modules/Admin/Logs/Index.razor  |  4 +--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Logs/Detail.razor b/Oqtane.Client/Modules/Admin/Logs/Detail.razor
index 1baac265..03c0d629 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Detail.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Detail.razor
@@ -1,4 +1,4 @@
-@namespace Oqtane.Modules.Admin.Logs
+@namespace Oqtane.Modules.Admin.Logs
 @using System.Globalization
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
@@ -10,7 +10,7 @@
     <table class="table table-borderless">
         <tr>
             <td>
-                <Label For="dateTime" HelpText="The date and time of this log">Date/Time: </Label>
+                <Label For="dateTime" HelpText="The date and time of this log" ResourceKey="DateTime">Date/Time: </Label>
             </td>
             <td>
                 <input id="dateTime" class="form-control" @bind="@_logDate" readonly />
@@ -18,7 +18,7 @@
         </tr>
         <tr>
             <td>
-                <Label For="level" HelpText="The level of this log">Level: </Label>
+                <Label For="level" HelpText="The level of this log" ResourceKey="Level">Level: </Label>
             </td>
             <td>
                 <input id="level" class="form-control" @bind="@_level" readonly />
@@ -26,7 +26,7 @@
         </tr>
         <tr>
             <td>
-                <Label For="feature" HelpText="The feature that was affected">Feature: </Label>
+                <Label For="feature" HelpText="The feature that was affected" ResourceKey="Feature">Feature: </Label>
             </td>
             <td>
                 <input id="feature" class="form-control" @bind="@_feature" readonly />
@@ -34,7 +34,7 @@
         </tr>
         <tr>
             <td>
-                <Label For="function" HelpText="The function that was performed">Function: </Label>
+                <Label For="function" HelpText="The function that was performed" ResourceKey="Function">Function: </Label>
             </td>
             <td>
                 <input id="function" class="form-control" @bind="@_function" readonly />
@@ -42,7 +42,7 @@
         </tr>
         <tr>
             <td>
-                <Label For="category" HelpText="The categories that were affected">Category: </Label>
+                <Label For="category" HelpText="The categories that were affected" ResourceKey="Category">Category: </Label>
             </td>
             <td>
                 <input id="category" class="form-control" @bind="@_category" readonly />
@@ -52,7 +52,7 @@
         {
             <tr>
                 <td>
-                    <Label For="page" HelpText="The page that was affected">Page: </Label>
+                    <Label For="page" HelpText="The page that was affected" ResourceKey="Page">Page: </Label>
                 </td>
                 <td>
                     <input id="page" class="form-control" @bind="@_pageName" readonly />
@@ -63,7 +63,7 @@
         {
             <tr>
                 <td>
-                    <Label For="module" HelpText="The module that was affected">Module: </Label>
+                    <Label For="module" HelpText="The module that was affected" ResourceKey="Module">Module: </Label>
                 </td>
                 <td>
                     <input id="module" class="form-control" @bind="@_moduleTitle" readonly />
@@ -74,7 +74,7 @@
         {
             <tr>
                 <td>
-                    <Label For="user" HelpText="The user that caused this log">User: </Label>
+                    <Label For="user" HelpText="The user that caused this log" ResourceKey="User">User: </Label>
                 </td>
                 <td>
                     <input id="user" class="form-control" @bind="@_username" readonly />
@@ -83,7 +83,7 @@
         }
         <tr>
             <td>
-                <Label For="url" HelpText="The url the log comes from">Url: </Label>
+                <Label For="url" HelpText="The url the log comes from" ResourceKey="Url">Url: </Label>
             </td>
             <td>
                 <input id="url" class="form-control" @bind="@_url" readonly />
@@ -91,7 +91,7 @@
         </tr>
         <tr>
             <td>
-                <Label For="template" HelpText="What the log is about">Template: </Label>
+                <Label For="template" HelpText="What the log is about" ResourceKey="Template">Template: </Label>
             </td>
             <td>
                 <input id="template" class="form-control" @bind="@_template" readonly />
@@ -99,7 +99,7 @@
         </tr>
         <tr>
             <td>
-                <Label For="message" HelpText="The message that the system generated"class="control-label">Message: </Label>
+                <Label For="message" HelpText="The message that the system generated"class="control-label" ResourceKey="Message">Message: </Label>
             </td>
             <td>
                 <textarea id="message" class="form-control" @bind="@_message" rows="5" readonly></textarea>
@@ -109,7 +109,7 @@
         {
             <tr>
                 <td>
-                    <Label For="exception" HelpText="The exceptions generated by the system">Exception: </Label>
+                    <Label For="exception" HelpText="The exceptions generated by the system" ResourceKey="Exception">Exception: </Label>
                 </td>
                 <td>
                     <textarea id="exception" class="form-control" @bind="@_exception" rows="5" readonly></textarea>
@@ -118,7 +118,7 @@
         }
         <tr>
             <td>
-                <Label For="properties" HelpText="The properties that were affected">Properties: </Label>
+                <Label For="properties" HelpText="The properties that were affected" ResourceKey="Properties">Properties: </Label>
             </td>
             <td>
                 <textarea id="properties" class="form-control" @bind="@_properties" rows="5" readonly></textarea>
@@ -126,7 +126,7 @@
         </tr>
         <tr>
             <td>
-                <Label For="server" HelpText="The server that was affected">Server: </Label>
+                <Label For="server" HelpText="The server that was affected" ResourceKey="Server">Server: </Label>
             </td>
             <td>
                 <input id="server" class="form-control" @bind="@_server" readonly />
diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor
index 3fcb0fb5..f4ae994e 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor
@@ -1,4 +1,4 @@
-@namespace Oqtane.Modules.Admin.Logs
+@namespace Oqtane.Modules.Admin.Logs
 @inherits ModuleBase
 @inject ILogService LogService
 
@@ -56,7 +56,7 @@ else
                 <th>Function</th>
             </Header>
             <Row>
-                <td class="@GetClass(context.Function)"><ActionLink Action="Detail" Parameters="@($"id=" + context.LogId.ToString())" /></td>
+                <td class="@GetClass(context.Function)"><ActionLink Action="Detail" Parameters="@($"id=" + context.LogId.ToString())" ResourceKey="LogDetails" /></td>
                 <td class="@GetClass(context.Function)">@context.LogDate</td>
                 <td class="@GetClass(context.Function)">@context.Level</td>
                 <td class="@GetClass(context.Function)">@context.Feature</td>

From db6e550c86cddbc701e77a644ddfc93a14eb5495 Mon Sep 17 00:00:00 2001
From: hishamco <hishamco_2007@yahoo.com>
Date: Fri, 20 Nov 2020 00:56:37 +0300
Subject: [PATCH 2/2] Localize non components for the logs pages

---
 Oqtane.Client/Modules/Admin/Logs/Detail.razor | 215 +++++++++---------
 Oqtane.Client/Modules/Admin/Logs/Index.razor  |  33 +--
 2 files changed, 125 insertions(+), 123 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Logs/Detail.razor b/Oqtane.Client/Modules/Admin/Logs/Detail.razor
index 03c0d629..7c2c1303 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Detail.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Detail.razor
@@ -6,134 +6,135 @@
 @inject IPageService PageService
 @inject IPageModuleService PageModuleService
 @inject IUserService UserService
+@inject IStringLocalizer<Index> Localizer
 
-    <table class="table table-borderless">
+<table class="table table-borderless">
+    <tr>
+        <td>
+            <Label For="dateTime" HelpText="The date and time of this log" ResourceKey="DateTime">Date/Time: </Label>
+        </td>
+        <td>
+            <input id="dateTime" class="form-control" @bind="@_logDate" readonly />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="level" HelpText="The level of this log" ResourceKey="Level">Level: </Label>
+        </td>
+        <td>
+            <input id="level" class="form-control" @bind="@_level" readonly />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="feature" HelpText="The feature that was affected" ResourceKey="Feature">Feature: </Label>
+        </td>
+        <td>
+            <input id="feature" class="form-control" @bind="@_feature" readonly />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="function" HelpText="The function that was performed" ResourceKey="Function">Function: </Label>
+        </td>
+        <td>
+            <input id="function" class="form-control" @bind="@_function" readonly />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="category" HelpText="The categories that were affected" ResourceKey="Category">Category: </Label>
+        </td>
+        <td>
+            <input id="category" class="form-control" @bind="@_category" readonly />
+        </td>
+    </tr>
+    @if (_pageName != string.Empty)
+    {
         <tr>
             <td>
-                <Label For="dateTime" HelpText="The date and time of this log" ResourceKey="DateTime">Date/Time: </Label>
+                <Label For="page" HelpText="The page that was affected" ResourceKey="Page">Page: </Label>
             </td>
             <td>
-                <input id="dateTime" class="form-control" @bind="@_logDate" readonly />
+                <input id="page" class="form-control" @bind="@_pageName" readonly />
             </td>
         </tr>
+    }
+    @if (_moduleTitle != string.Empty)
+    {
         <tr>
             <td>
-                <Label For="level" HelpText="The level of this log" ResourceKey="Level">Level: </Label>
+                <Label For="module" HelpText="The module that was affected" ResourceKey="Module">Module: </Label>
             </td>
             <td>
-                <input id="level" class="form-control" @bind="@_level" readonly />
+                <input id="module" class="form-control" @bind="@_moduleTitle" readonly />
             </td>
         </tr>
+    }
+    @if (_username != string.Empty)
+    {
         <tr>
             <td>
-                <Label For="feature" HelpText="The feature that was affected" ResourceKey="Feature">Feature: </Label>
+                <Label For="user" HelpText="The user that caused this log" ResourceKey="User">User: </Label>
             </td>
             <td>
-                <input id="feature" class="form-control" @bind="@_feature" readonly />
+                <input id="user" class="form-control" @bind="@_username" readonly />
             </td>
         </tr>
+    }
+    <tr>
+        <td>
+            <Label For="url" HelpText="The url the log comes from" ResourceKey="Url">Url: </Label>
+        </td>
+        <td>
+            <input id="url" class="form-control" @bind="@_url" readonly />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="template" HelpText="What the log is about" ResourceKey="Template">Template: </Label>
+        </td>
+        <td>
+            <input id="template" class="form-control" @bind="@_template" readonly />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="message" HelpText="The message that the system generated" class="control-label" ResourceKey="Message">Message: </Label>
+        </td>
+        <td>
+            <textarea id="message" class="form-control" @bind="@_message" rows="5" readonly></textarea>
+        </td>
+    </tr>
+    @if (!string.IsNullOrEmpty(_exception))
+    {
         <tr>
             <td>
-                <Label For="function" HelpText="The function that was performed" ResourceKey="Function">Function: </Label>
+                <Label For="exception" HelpText="The exceptions generated by the system" ResourceKey="Exception">Exception: </Label>
             </td>
             <td>
-                <input id="function" class="form-control" @bind="@_function" readonly />
+                <textarea id="exception" class="form-control" @bind="@_exception" rows="5" readonly></textarea>
             </td>
         </tr>
-        <tr>
-            <td>
-                <Label For="category" HelpText="The categories that were affected" ResourceKey="Category">Category: </Label>
-            </td>
-            <td>
-                <input id="category" class="form-control" @bind="@_category" readonly />
-            </td>
-        </tr>
-        @if (_pageName != string.Empty)
-        {
-            <tr>
-                <td>
-                    <Label For="page" HelpText="The page that was affected" ResourceKey="Page">Page: </Label>
-                </td>
-                <td>
-                    <input id="page" class="form-control" @bind="@_pageName" readonly />
-                </td>
-            </tr>
-        }
-        @if (_moduleTitle != string.Empty)
-        {
-            <tr>
-                <td>
-                    <Label For="module" HelpText="The module that was affected" ResourceKey="Module">Module: </Label>
-                </td>
-                <td>
-                    <input id="module" class="form-control" @bind="@_moduleTitle" readonly />
-                </td>
-            </tr>
-        }
-        @if (_username != string.Empty)
-        {
-            <tr>
-                <td>
-                    <Label For="user" HelpText="The user that caused this log" ResourceKey="User">User: </Label>
-                </td>
-                <td>
-                    <input id="user" class="form-control" @bind="@_username" readonly />
-                </td>
-            </tr>
-        }
-        <tr>
-            <td>
-                <Label For="url" HelpText="The url the log comes from" ResourceKey="Url">Url: </Label>
-            </td>
-            <td>
-                <input id="url" class="form-control" @bind="@_url" readonly />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="template" HelpText="What the log is about" ResourceKey="Template">Template: </Label>
-            </td>
-            <td>
-                <input id="template" class="form-control" @bind="@_template" readonly />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="message" HelpText="The message that the system generated"class="control-label" ResourceKey="Message">Message: </Label>
-            </td>
-            <td>
-                <textarea id="message" class="form-control" @bind="@_message" rows="5" readonly></textarea>
-            </td>
-        </tr>
-        @if (!string.IsNullOrEmpty(_exception))
-        {
-            <tr>
-                <td>
-                    <Label For="exception" HelpText="The exceptions generated by the system" ResourceKey="Exception">Exception: </Label>
-                </td>
-                <td>
-                    <textarea id="exception" class="form-control" @bind="@_exception" rows="5" readonly></textarea>
-                </td>
-            </tr>
-        }
-        <tr>
-            <td>
-                <Label For="properties" HelpText="The properties that were affected" ResourceKey="Properties">Properties: </Label>
-            </td>
-            <td>
-                <textarea id="properties" class="form-control" @bind="@_properties" rows="5" readonly></textarea>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="server" HelpText="The server that was affected" ResourceKey="Server">Server: </Label>
-            </td>
-            <td>
-                <input id="server" class="form-control" @bind="@_server" readonly />
-            </td>
-        </tr>
-    </table>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+    }
+    <tr>
+        <td>
+            <Label For="properties" HelpText="The properties that were affected" ResourceKey="Properties">Properties: </Label>
+        </td>
+        <td>
+            <textarea id="properties" class="form-control" @bind="@_properties" rows="5" readonly></textarea>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="server" HelpText="The server that was affected" ResourceKey="Server">Server: </Label>
+        </td>
+        <td>
+            <input id="server" class="form-control" @bind="@_server" readonly />
+        </td>
+    </tr>
+</table>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
 
 @code {
     private int _logId;
@@ -167,7 +168,7 @@
                 _feature = log.Feature;
                 _function = log.Function;
                 _category = log.Category;
-                
+
                 if (log.PageId != null)
                 {
                     var page = await PageService.GetPageAsync(log.PageId.Value);
@@ -176,7 +177,7 @@
                         _pageName = page.Name;
                     }
                 }
-                
+
                 if (log.PageId != null && log.ModuleId != null)
                 {
                     var pagemodule = await PageModuleService.GetPageModuleAsync(log.PageId.Value, log.ModuleId.Value);
@@ -185,7 +186,7 @@
                         _moduleTitle = pagemodule.Title;
                     }
                 }
-                
+
                 if (log.UserId != null)
                 {
                     var user = await UserService.GetUserAsync(log.UserId.Value, PageState.Site.SiteId);
@@ -194,7 +195,7 @@
                         _username = user.Username;
                     }
                 }
-                
+
                 _url = log.Url;
                 _template = log.MessageTemplate;
                 _message = log.Message;
diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor
index f4ae994e..59830a0d 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor
@@ -1,17 +1,18 @@
 @namespace Oqtane.Modules.Admin.Logs
 @inherits ModuleBase
 @inject ILogService LogService
+@inject IStringLocalizer<Index> Localizer 
 
 @if (_logs == null)
 {
-    <p><em>Loading...</em></p>
+    <p><em>@Localizer["Loading..."]</em></p>
 }
 else
 {
     <table class="table table-borderless">
         <tr>
             <td>
-                <label>Level: </label>
+                <label>@Localizer["Level:"] </label>
                 <select class="form-control" @onchange="(e => LevelChanged(e))">
                     <option value="-">&lt;All Levels&gt;</option>
                     <option value="Trace">Trace</option>
@@ -23,19 +24,19 @@ else
                 </select>
             </td>
             <td>
-                <label>Function: </label>
+                <label>@Localizer["Function:"] </label>
                 <select class="form-control" @onchange="(e => FunctionChanged(e))">
-                    <option value="-">&lt;All Functions&gt;</option>
-                    <option value="Create">Create</option>
-                    <option value="Read">Read</option>
-                    <option value="Update">Update</option>
-                    <option value="Delete">Delete</option>
-                    <option value="Security">Security</option>
-                    <option value="Other">Other</option>
+                    <option value="-">&lt;@Localizer["All Functions"]&gt;</option>
+                    <option value="Create">@Localizer["Create"]</option>
+                    <option value="Read">@Localizer["Read"]</option>
+                    <option value="Update">@Localizer["Update"]</option>
+                    <option value="Delete">@Localizer["Delete"]</option>
+                    <option value="Security">@Localizer["Security"]</option>
+                    <option value="Other">@Localizer["Other"]</option>
                 </select>
             </td>
             <td>
-                <label>Rows: </label>
+                <label>@Localizer["Rows:"] </label>
                 <select class="form-control" @onchange="(e => RowsChanged(e))">
                     <option value="10">10</option>
                     <option value="50">50</option>
@@ -50,10 +51,10 @@ else
         <Pager Items="@_logs">
             <Header>
                 <th style="width: 1px;">&nbsp;</th>
-                <th>Date</th>
-                <th>Level</th>
-                <th>Feature</th>
-                <th>Function</th>
+                <th>@Localizer["Date"]</th>
+                <th>@Localizer["Level"]</th>
+                <th>@Localizer["Feature"]</th>
+                <th>@Localizer["Function"]</th>
             </Header>
             <Row>
                 <td class="@GetClass(context.Function)"><ActionLink Action="Detail" Parameters="@($"id=" + context.LogId.ToString())" ResourceKey="LogDetails" /></td>
@@ -66,7 +67,7 @@ else
     }
     else
     {
-        <p><em>No Logs Match The Criteria Specified</em></p>
+        <p><em>@Localizer["No Logs Match The Criteria Specified"]</em></p>
     }
 }