From bc570de9e6fea86684c04d62b5244d6fa2934be3 Mon Sep 17 00:00:00 2001
From: hishamco <hishamco_2007@yahoo.com>
Date: Fri, 20 Nov 2020 01:06:57 +0300
Subject: [PATCH 1/2] Localize components for jobs pages

---
 Oqtane.Client/Modules/Admin/Jobs/Add.razor   | 16 ++++++++--------
 Oqtane.Client/Modules/Admin/Jobs/Edit.razor  | 18 +++++++++---------
 Oqtane.Client/Modules/Admin/Jobs/Index.razor | 12 ++++++------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Jobs/Add.razor b/Oqtane.Client/Modules/Admin/Jobs/Add.razor
index 65361e41..c216d83d 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Add.razor
@@ -1,4 +1,4 @@
-@namespace Oqtane.Modules.Admin.Jobs
+@namespace Oqtane.Modules.Admin.Jobs
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IJobService JobService
@@ -6,7 +6,7 @@
 <table class="table table-borderless">
     <tr>
         <td>
-            <Label For="name" HelpText="Enter the job name">Name: </Label>
+            <Label For="name" HelpText="Enter the job name" ResourceKey="Name">Name: </Label>
         </td>
         <td>
             <input id="name" class="form-control" @bind="@_name" />
@@ -14,7 +14,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="type" HelpText="Enter the job type">Type: </Label>
+            <Label For="type" HelpText="Enter the job type" ResourceKey="Type">Type: </Label>
         </td>
         <td>
             <input id="type" class="form-control" @bind="@_jobType" />
@@ -22,7 +22,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="enabled" HelpText="Select whether you want the job enabled or not">Enabled? </Label>
+            <Label For="enabled" HelpText="Select whether you want the job enabled or not" ResourceKey="Enabled">Enabled? </Label>
         </td>
         <td>
             <select id="enabled" class="form-control" @bind="@_isEnabled">
@@ -33,7 +33,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="runs-every" HelpText="Select how often you want the job to run">Runs Every: </Label>
+            <Label For="runs-every" HelpText="Select how often you want the job to run" ResourceKey="RunsEvery">Runs Every: </Label>
         </td>
         <td>
             <input id="runs-every" class="form-control" @bind="@_interval" />
@@ -47,7 +47,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="starting" HelpText="What time do you want the job to start">Starting: </Label>
+            <Label For="starting" HelpText="What time do you want the job to start" ResourceKey="Starting">Starting: </Label>
         </td>
         <td>
             <input id="starting" class="form-control" @bind="@_startDate" />
@@ -55,7 +55,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="ending" HelpText="When do you want the job to end">Ending: </Label>
+            <Label For="ending" HelpText="When do you want the job to end" ResourceKey="Ending">Ending: </Label>
         </td>
         <td>
             <input id="ending" class="form-control" @bind="@_endDate" />
@@ -63,7 +63,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="retention-log" HelpText="What items do you want in the retention log">Retention Log (Items): </Label>
+            <Label For="retention-log" HelpText="What items do you want in the retention log" ResourceKey="RetentionLog">Retention Log (Items): </Label>
         </td>
         <td>
             <input id="retention-log" class="form-control" @bind="@_retentionHistory" />
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
index 25d8e4fb..8fbed632 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
@@ -1,4 +1,4 @@
-@namespace Oqtane.Modules.Admin.Jobs
+@namespace Oqtane.Modules.Admin.Jobs
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IJobService JobService
@@ -6,7 +6,7 @@
 <table class="table table-borderless">
     <tr>
         <td>
-            <Label For="name" HelpText="Enter the job name">Name: </Label>
+            <Label For="name" HelpText="Enter the job name" ResourceKey="Name">Name: </Label>
         </td>
         <td>
             <input id="name" class="form-control" @bind="@_name" />
@@ -14,7 +14,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="type" HelpText="Enter the job type">Type: </Label>
+            <Label For="type" HelpText="Enter the job type" ResourceKey="Type">Type: </Label>
         </td>
         <td>
             <input id="type" class="form-control" @bind="@_jobType" />
@@ -22,7 +22,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="enabled" HelpText="Select whether you want the job enabled or not">Enabled? </Label>
+            <Label For="enabled" HelpText="Select whether you want the job enabled or not" ResourceKey="Enabled">Enabled? </Label>
         </td>
         <td>
             <select id="enabled" class="form-control" @bind="@_isEnabled">
@@ -33,7 +33,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="runs-every" HelpText="Select how often you want the job to run">Runs Every: </Label>
+            <Label For="runs-every" HelpText="Select how often you want the job to run" ResourceKey="RunsEvery">Runs Every: </Label>
         </td>
         <td>
             <input id="runs-every" class="form-control" @bind="@_interval" />
@@ -47,7 +47,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="starting" HelpText="What time do you want the job to start">Starting: </Label>
+            <Label For="starting" HelpText="What time do you want the job to start" ResourceKey="Starting">Starting: </Label>
         </td>
         <td>
             <input id="starting" class="form-control" @bind="@_startDate" />
@@ -55,7 +55,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="ending" HelpText="When do you want the job to end">Ending: </Label>
+            <Label For="ending" HelpText="When do you want the job to end" ResourceKey="Ending">Ending: </Label>
         </td>
         <td>
             <input id="ending" class="form-control" @bind="@_endDate" />
@@ -63,7 +63,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="retention" HelpText="Number of log entries to retain for this job">Retention Log (Items): </Label>
+            <Label For="retention" HelpText="Number of log entries to retain for this job" ResourceKey="RetentionLog">Retention Log (Items): </Label>
         </td>
         <td>
             <input id="retention" class="form-control" @bind="@_retentionHistory" />
@@ -71,7 +71,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="next" HelpText="Next execution for this job.">Next Execution: </Label>
+            <Label For="next" HelpText="Next execution for this job." ResourceKey="NextExecution">Next Execution: </Label>
         </td>
         <td>
             <input id="next" class="form-control" @bind="@_nextExecution" />
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Index.razor b/Oqtane.Client/Modules/Admin/Jobs/Index.razor
index 6ba8c69b..e99a09b0 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Index.razor
@@ -1,4 +1,4 @@
-@namespace Oqtane.Modules.Admin.Jobs
+@namespace Oqtane.Modules.Admin.Jobs
 @inherits ModuleBase
 @inject IJobService JobService
 
@@ -8,8 +8,8 @@
 }
 else
 {
-    <ActionLink Action="Add" Text="Add Job" />
-    <ActionLink Action="Log" Class="btn btn-secondary" Text="View Logs" />
+    <ActionLink Action="Add" Text="Add Job" ResourceKey="AddJob" />
+    <ActionLink Action="Log" Class="btn btn-secondary" Text="View Logs" ResourceKey="ViewJobs" />
     <button type="button" class="btn btn-secondary" @onclick="(async () => await Refresh())">Refresh</button>
     <br /><br />
 
@@ -25,9 +25,9 @@ else
             <th style="width: 1px;">&nbsp;</th>
         </Header>
         <Row>
-            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.JobId.ToString())" /></td>
-            <td><ActionDialog Header="Delete Job" Message="@("Are You Sure You Wish To Delete This Job?")" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteJob(context))" /></td>
-            <td><ActionLink Action="Log" Class="btn btn-secondary" Parameters="@($"id=" + context.JobId.ToString())" /></td>
+            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.JobId.ToString())" ResourceKey="EditJob" /></td>
+            <td><ActionDialog Header="Delete Job" Message="@("Are You Sure You Wish To Delete This Job?")" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteJob(context))" ResourceKey="DeleteJob" /></td>
+            <td><ActionLink Action="Log" Class="btn btn-secondary" Parameters="@($"id=" + context.JobId.ToString())" ResourceKey="JobLog" /></td>
             <td>@context.Name</td>
             <td>@DisplayStatus(context.IsEnabled, context.IsExecuting)</td>
             <td>@DisplayFrequency(context.Interval, context.Frequency)</td>

From 177dcad5a10abe2e5bc9c5c06d6f9036e046f5bf Mon Sep 17 00:00:00 2001
From: hishamco <hishamco_2007@yahoo.com>
Date: Fri, 20 Nov 2020 01:12:15 +0300
Subject: [PATCH 2/2] Localize non components for the jobs pages

---
 Oqtane.Client/Modules/Admin/Jobs/Add.razor   | 17 +++++++++--------
 Oqtane.Client/Modules/Admin/Jobs/Edit.razor  | 19 ++++++++++---------
 Oqtane.Client/Modules/Admin/Jobs/Index.razor | 14 +++++++-------
 Oqtane.Client/Modules/Admin/Jobs/Log.razor   | 13 +++++++------
 4 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Jobs/Add.razor b/Oqtane.Client/Modules/Admin/Jobs/Add.razor
index c216d83d..fde389bf 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Add.razor
@@ -2,6 +2,7 @@
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IJobService JobService
+@inject IStringLocalizer<Add> Localizer
 
 <table class="table table-borderless">
     <tr>
@@ -26,8 +27,8 @@
         </td>
         <td>
             <select id="enabled" class="form-control" @bind="@_isEnabled">
-                <option value="True">Yes</option>
-                <option value="False">No</option>
+                <option value="True">@Localizer["Yes"]</option>
+                <option value="False">@Localizer["No"]</option>
             </select>
         </td>
     </tr>
@@ -38,10 +39,10 @@
         <td>
             <input id="runs-every" class="form-control" @bind="@_interval" />
             <select id="runs-every" class="form-control" @bind="@_frequency">
-                <option value="m">Minute(s)</option>
-                <option value="H">Hour(s)</option>
-                <option value="d">Day(s)</option>
-                <option value="M">Month(s)</option>
+                <option value="m">@Localizer["Minute(s)"]</option>
+                <option value="H">@Localizer["Hour(s)"]</option>
+                <option value="d">@Localizer["Day(s)"]</option>
+                <option value="M">@Localizer["Month(s)"]</option>
             </select>
         </td>
     </tr>
@@ -70,8 +71,8 @@
         </td>
     </tr>
 </table>
-<button type="button" class="btn btn-success" @onclick="SaveJob">Save</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+<button type="button" class="btn btn-success" @onclick="SaveJob">@Localizer["Save"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
 
 @code {
     private string _name = string.Empty;
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
index 8fbed632..62929440 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
@@ -2,6 +2,7 @@
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IJobService JobService
+@inject IStringLocalizer<Edit> Localizer
 
 <table class="table table-borderless">
     <tr>
@@ -26,8 +27,8 @@
         </td>
         <td>
             <select id="enabled" class="form-control" @bind="@_isEnabled">
-                <option value="True">Yes</option>
-                <option value="False">No</option>
+                <option value="True">@Localizer["Yes"]</option>
+                <option value="False">@Localizer["No"]</option>
             </select>
         </td>
     </tr>
@@ -38,10 +39,10 @@
         <td>
             <input id="runs-every" class="form-control" @bind="@_interval" />
             <select id="runs-every" class="form-control" @bind="@_frequency">
-                <option value="m">Minute(s)</option>
-                <option value="H">Hour(s)</option>
-                <option value="d">Day(s)</option>
-                <option value="M">Month(s)</option>
+                <option value="m">@Localizer["Minute(s)"]</option>
+                <option value="H">@Localizer["Hour(s)"]</option>
+                <option value="d">@Localizer["Day(s)"]</option>
+                <option value="M">@Localizer["Month(s)"]</option>
             </select>
         </td>
     </tr>
@@ -78,8 +79,8 @@
         </td>
     </tr>
 </table>
-<button type="button" class="btn btn-success" @onclick="SaveJob">Save</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+<button type="button" class="btn btn-success" @onclick="SaveJob">@Localizer["Save"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
 
 @code {
     private int _jobId;
@@ -158,7 +159,7 @@
             {
                 job.NextExecution = DateTime.Parse(_nextExecution);
             }
-            
+
             job.RetentionHistory = int.Parse(_retentionHistory);
 
             try
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Index.razor b/Oqtane.Client/Modules/Admin/Jobs/Index.razor
index e99a09b0..cbc137f7 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Index.razor
@@ -4,7 +4,7 @@
 
 @if (_jobs == null)
 {
-    <p><em>Loading...</em></p>
+    <p><em>@Localizer["Loading..."]</em></p>
 }
 else
 {
@@ -18,10 +18,10 @@ else
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
-            <th>Name</th>
-            <th>Status</th>
-            <th>Frequency</th>
-            <th>Next Execution</th>
+            <th>@Localizer["Name"]</th>
+            <th>@Localizer["Status"]</th>
+            <th>@Localizer["Frequency"]</th>
+            <th>@Localizer["Next Execution"]</th>
             <th style="width: 1px;">&nbsp;</th>
         </Header>
         <Row>
@@ -35,11 +35,11 @@ else
             <td>
                 @if (context.IsStarted)
                 {
-                    <button type="button" class="btn btn-danger" @onclick="(async () => await StopJob(context.JobId))">Stop</button>
+                    <button type="button" class="btn btn-danger" @onclick="(async () => await StopJob(context.JobId))">@Localizer["Stop"]</button>
                 }
                 else
                 {
-                    <button type="button" class="btn btn-success" @onclick="(async () => await StartJob(context.JobId))">Start</button>
+                    <button type="button" class="btn btn-success" @onclick="(async () => await StartJob(context.JobId))">@Localizer["Start"]</button>
                 }
             </td>
         </Row>
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Log.razor b/Oqtane.Client/Modules/Admin/Jobs/Log.razor
index 2d4ef706..f5d8a391 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Log.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Log.razor
@@ -1,19 +1,20 @@
-@namespace Oqtane.Modules.Admin.Jobs
+@namespace Oqtane.Modules.Admin.Jobs
 @inherits ModuleBase
 @inject IJobLogService JobLogService
+@inject IStringLocalizer<Log> Localizer
 
 @if (_jobLogs == null)
 {
-    <p><em>Loading...</em></p>
+    <p><em>@Localizer["Loading..."]</em></p>
 }
 else
 {
 <Pager Items="@_jobLogs">
     <Header>
-        <th>Name</th>
-        <th>Status</th>
-        <th>Started</th>
-        <th>Finished</th>
+        <th>@Localizer["Name"]</th>
+        <th>@Localizer["Status"]</th>
+        <th>@Localizer["Started"]</th>
+        <th>@Localizer["Finished"]</th>
     </Header>
     <Row>
         <td>@context.Job.Name</td>