From 8fbbbce4ec2d39f99e1c3183435da13d9be1d61a Mon Sep 17 00:00:00 2001
From: alikoli <aleksander.poniatowski@eje.pl>
Date: Thu, 10 Aug 2023 01:52:46 +0200
Subject: [PATCH 1/4] Fix missing translations part 2

---
 .../Modules/Admin/ModuleDefinitions/Add.razor |  2 +-
 .../Admin/ModuleDefinitions/Edit.razor        |  6 +++---
 Oqtane.Client/Modules/Admin/Site/Index.razor  |  2 +-
 Oqtane.Client/Modules/Admin/Themes/Add.razor  |  2 +-
 Oqtane.Client/Properties/launchSettings.json  | 16 +++++++-------
 .../Modules/Admin/ModuleDefinitions/Add.resx  |  2 +-
 .../Resources/Modules/Admin/Site/Index.resx   |  9 ++++++++
 .../Resources/Modules/Admin/Themes/Add.resx   |  3 +++
 .../Modules/Controls/PermissionGrid.resx      | 21 +++++++++++++++++++
 9 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
index 6e2992ec..25e0c6a4 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
@@ -8,7 +8,7 @@
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <TabStrip>
-    <TabPanel Name="Download" ResourceKey="Download">
+    <TabPanel Name="Download" ResourceKey="Download" Heading="Download">
         <div class="row justify-content-center mb-3">
             <div class="text-center">
                 <div class="form-check form-check-inline">
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
index 6a2c6e5a..76240c07 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
@@ -12,7 +12,7 @@
 @if (_initialized)
 {
 	<TabStrip>
-		<TabPanel Name="Definition" ResourceKey="Definition">
+        <TabPanel Name="Definition" ResourceKey="Definition" Heading="Definition">
 			<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
 				<div class="container">
 					<div class="row mb-1 align-items-center">
@@ -103,7 +103,7 @@
 			<br />
 			<AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
 		</TabPanel>
-		<TabPanel Name="Permissions" ResourceKey="Permissions">
+		<TabPanel Name="Permissions" ResourceKey="Permissions" Heading="Permissions">
 			<div class="container">
 				<div class="row mb-1 align-items-center">
 					<PermissionGrid EntityName="@EntityNames.ModuleDefinition" PermissionNames="@PermissionNames.Utilize" PermissionList="@_permissions" @ref="_permissionGrid" />
@@ -113,7 +113,7 @@
 			<button type="button" class="btn btn-success" @onclick="SaveModuleDefinition">@SharedLocalizer["Save"]</button>
 			<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 		</TabPanel>
-		<TabPanel Name="Translations" ResourceKey="Translations">
+		<TabPanel Name="Translations" ResourceKey="Translations" Heading="Permissions">
 			@if (_languages != null && _languages.Count > 0)
 			{
 				<Pager Items="@_languages">
diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor
index e237bd74..ce8a4fc4 100644
--- a/Oqtane.Client/Modules/Admin/Site/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Site/Index.razor
@@ -257,7 +257,7 @@
 										<td>
 											@if (_aliasid == -1)
 											{
-												<ActionDialog Action="Delete" OnClick="@(async () => await DeleteAlias(context))" ResourceKey="DeleteModule" Class="btn btn-danger" Header="Delete Alias" Message="@string.Format(Localizer["Confirm.Alias.Delete", context.Name])" />
+												<ActionDialog Action="Delete" OnClick="@(async () => await DeleteAlias(context))" ResourceKey="DeleteAlias" Class="btn btn-danger" Header="Delete Alias" Message="@string.Format(Localizer["Confirm.Alias.Delete", context.Name])" />
 											}
 										</td>
 										<td>@context.Name</td>
diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor
index df48d6a0..c56f7f69 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor
@@ -24,7 +24,7 @@
         <div class="row justify-content-center mb-3">
             <div class="col">
                 <div class="input-group">
-                    <span class="input-group-text">Product</span>
+                    <span class="input-group-text">@Localizer["Product"]</span>
                     <input id="search" class="form-control" placeholder="@SharedLocalizer["Search.Hint"]" @bind="@_search" />
                     <button type="button" class="btn btn-primary" @onclick="Search">@SharedLocalizer["Search"]</button>
                     <button type="button" class="btn btn-secondary" @onclick="Reset">@SharedLocalizer["Reset"]</button>
diff --git a/Oqtane.Client/Properties/launchSettings.json b/Oqtane.Client/Properties/launchSettings.json
index 4899842e..8bef83e7 100644
--- a/Oqtane.Client/Properties/launchSettings.json
+++ b/Oqtane.Client/Properties/launchSettings.json
@@ -1,12 +1,4 @@
 {
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:44358/",
-      "sslPort": 0
-    }
-  },
   "profiles": {
     "IIS Express": {
       "commandName": "IISExpress",
@@ -23,5 +15,13 @@
       },
       "applicationUrl": "http://localhost:44358/"
     }
+  },
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:65367/",
+      "sslPort": 44327
+    }
   }
 }
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Add.resx b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Add.resx
index 037e700c..1f28095e 100644
--- a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Add.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Add.resx
@@ -141,7 +141,7 @@
   <data name="Upload.Heading" xml:space="preserve">
     <value>Upload</value>
   </data>
-  <data name="Product.Text" xml:space="preserve">
+  <data name="Product" xml:space="preserve">
     <value>Product</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
index 5f66f8b9..3f3ef7d6 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
@@ -312,6 +312,9 @@
   <data name="Database.HelpText" xml:space="preserve">
     <value>The type of database</value>
   </data>
+  <data name="DeleteSite.Header" xml:space="preserve">
+    <value>Delete Site</value>
+  </data>
   <data name="DeleteSite.Text" xml:space="preserve">
     <value>Delete Site</value>
   </data>
@@ -381,4 +384,10 @@
   <data name="Version.Text" xml:space="preserve">
     <value>Version:</value>
   </data>
+  <data name="DeleteAlias.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="DeleteAlias.Header" xml:space="preserve">
+    <value>Delete Alias</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Themes/Add.resx b/Oqtane.Client/Resources/Modules/Admin/Themes/Add.resx
index 9ceeae29..08723fba 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Themes/Add.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Themes/Add.resx
@@ -141,4 +141,7 @@
   <data name="Upload.Heading" xml:space="preserve">
     <value>Upload</value>
   </data>
+  <data name="Product" xml:space="preserve">
+    <value>Product</value>
+  </data> 
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Controls/PermissionGrid.resx b/Oqtane.Client/Resources/Modules/Controls/PermissionGrid.resx
index 194c7267..05bac8f7 100644
--- a/Oqtane.Client/Resources/Modules/Controls/PermissionGrid.resx
+++ b/Oqtane.Client/Resources/Modules/Controls/PermissionGrid.resx
@@ -129,4 +129,25 @@
   <data name="Message.Username.DontExist" xml:space="preserve">
     <value>User Does Not Exist With Name Specified</value>
   </data>
+  <data name="ModuleDefinition" xml:space="preserve">
+    <value>Module</value>
+  </data>
+  <data name="Page" xml:space="preserve">
+    <value>Page</value>
+  </data>
+  <data name="Folder" xml:space="preserve">
+    <value>Folder</value>
+  </data>
+  <data name="View" xml:space="preserve">
+    <value>View</value>
+  </data>
+  <data name="Edit" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="Utilize" xml:space="preserve">
+    <value>Utilize</value>
+  </data>
+  <data name="Browse" xml:space="preserve">
+    <value>Browse</value>
+  </data>
 </root>
\ No newline at end of file

From 101a3c8af5a2980b34581605ad9731c6f9bd45da Mon Sep 17 00:00:00 2001
From: alikoli <aleksander.poniatowski@eje.pl>
Date: Thu, 10 Aug 2023 02:03:46 +0200
Subject: [PATCH 2/4] Revert launchSettings

---
 Oqtane.Client/Properties/launchSettings.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Oqtane.Client/Properties/launchSettings.json b/Oqtane.Client/Properties/launchSettings.json
index 8bef83e7..4899842e 100644
--- a/Oqtane.Client/Properties/launchSettings.json
+++ b/Oqtane.Client/Properties/launchSettings.json
@@ -1,4 +1,12 @@
 {
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:44358/",
+      "sslPort": 0
+    }
+  },
   "profiles": {
     "IIS Express": {
       "commandName": "IISExpress",
@@ -15,13 +23,5 @@
       },
       "applicationUrl": "http://localhost:44358/"
     }
-  },
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:65367/",
-      "sslPort": 44327
-    }
   }
 }
\ No newline at end of file

From e44855493eb9a623f54b71fbd78de5d13234e04a Mon Sep 17 00:00:00 2001
From: alikoli <aleksander.poniatowski@eje.pl>
Date: Thu, 10 Aug 2023 02:12:36 +0200
Subject: [PATCH 3/4] fix heading

---
 Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
index 76240c07..5a2899ac 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
@@ -113,7 +113,7 @@
 			<button type="button" class="btn btn-success" @onclick="SaveModuleDefinition">@SharedLocalizer["Save"]</button>
 			<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 		</TabPanel>
-		<TabPanel Name="Translations" ResourceKey="Translations" Heading="Permissions">
+		<TabPanel Name="Translations" ResourceKey="Translations" Heading="Translations">
 			@if (_languages != null && _languages.Count > 0)
 			{
 				<Pager Items="@_languages">

From 6ef21795bad438fffbd5db5ad15fcd647a9484db Mon Sep 17 00:00:00 2001
From: alikoli <aleksander.poniatowski@eje.pl>
Date: Thu, 10 Aug 2023 02:13:31 +0200
Subject: [PATCH 4/4] fix heading

---
 Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
index 5a2899ac..580e269c 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
@@ -113,7 +113,7 @@
 			<button type="button" class="btn btn-success" @onclick="SaveModuleDefinition">@SharedLocalizer["Save"]</button>
 			<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 		</TabPanel>
-		<TabPanel Name="Translations" ResourceKey="Translations" Heading="Translations">
+        <TabPanel Name="Translations" ResourceKey="Translations" Heading="Translations">
 			@if (_languages != null && _languages.Count > 0)
 			{
 				<Pager Items="@_languages">