From c1d35e8af5ab236128cba0471c9969f32dbb3dce Mon Sep 17 00:00:00 2001
From: alikoli <aleksander.poniatowski@eje.pl>
Date: Wed, 9 Aug 2023 03:06:15 +0200
Subject: [PATCH 1/3] Fix missing translations

---
 Oqtane.Client/Modules/Admin/Jobs/Index.razor  |  2 +-
 .../Modules/Admin/Themes/Index.razor          |  2 +-
 .../Admin/ModuleDefinitions/Index.resx        |  3 ++
 .../Modules/Admin/RecycleBin/Index.resx       |  6 +++
 .../Resources/Modules/Admin/Themes/Index.resx |  3 ++
 Oqtane.Server/appsettings.json                | 48 -------------------
 6 files changed, 14 insertions(+), 50 deletions(-)
 delete mode 100644 Oqtane.Server/appsettings.json

diff --git a/Oqtane.Client/Modules/Admin/Jobs/Index.razor b/Oqtane.Client/Modules/Admin/Jobs/Index.razor
index 8c8d5a8a..9b217d07 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Index.razor
@@ -11,7 +11,7 @@
 else
 {
     <ActionLink Action="Log" Class="btn btn-secondary" Text="View Logs" ResourceKey="ViewJobs" />
-    <button type="button" class="btn btn-secondary" @onclick="(async () => await Refresh())">@Localizer["Refresh"]</button>
+    <button type="button" class="btn btn-secondary" @onclick="(async () => await Refresh())">@Localizer["Refresh.Text"]</button>
     <br />
     <br />
 
diff --git a/Oqtane.Client/Modules/Admin/Themes/Index.razor b/Oqtane.Client/Modules/Admin/Themes/Index.razor
index e317c1f9..198889fe 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Index.razor
@@ -13,7 +13,7 @@
 }
 else
 {
-    <ActionLink Action="Add" Text="Install Theme" />
+    <ActionLink Action="Add" Text="Install Theme" ResourceKey="InstallTheme" />
     @((MarkupString)"&nbsp;")
     <ActionLink Action="Create" Text="Create Theme" ResourceKey="CreateTheme" Class="btn btn-secondary" />
 
diff --git a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Index.resx b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Index.resx
index 9e3b9cc2..0ff2e74d 100644
--- a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Index.resx
@@ -144,6 +144,9 @@
   <data name="DeleteModule.Header" xml:space="preserve">
     <value>Delete Module</value>
   </data>
+  <data name="DeleteModule.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
   <data name="InUse" xml:space="preserve">
     <value>In Use?</value>
   </data>
diff --git a/Oqtane.Client/Resources/Modules/Admin/RecycleBin/Index.resx b/Oqtane.Client/Resources/Modules/Admin/RecycleBin/Index.resx
index 25184660..c45ee304 100644
--- a/Oqtane.Client/Resources/Modules/Admin/RecycleBin/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/RecycleBin/Index.resx
@@ -120,9 +120,15 @@
   <data name="DeleteModule.Header" xml:space="preserve">
     <value>Delete Module</value>
   </data>
+  <data name="DeleteModule.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
   <data name="DeletePage.Header" xml:space="preserve">
     <value>Delete Page</value>
   </data>
+  <data name="DeletePage.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
   <data name="NoPage.Deleted" xml:space="preserve">
     <value>No Deleted Pages</value>
   </data>
diff --git a/Oqtane.Client/Resources/Modules/Admin/Themes/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Themes/Index.resx
index 73d2a5ad..3c5074b4 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Themes/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Themes/Index.resx
@@ -141,6 +141,9 @@
   <data name="CreateTheme.Text" xml:space="preserve">
     <value>Create Theme</value>
   </data>
+  <data name="InstallTheme.Text" xml:space="preserve">
+    <value>Install Theme</value>
+  </data>    
   <data name="ViewTheme.Text" xml:space="preserve">
     <value>View</value>
   </data>
diff --git a/Oqtane.Server/appsettings.json b/Oqtane.Server/appsettings.json
deleted file mode 100644
index a518f1a2..00000000
--- a/Oqtane.Server/appsettings.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "Runtime": "Server",
-  "RenderMode": "ServerPrerendered",
-   "Database": {
-    "DefaultDBType": ""
-  },
-  "ConnectionStrings": {
-    "DefaultConnection": ""
-  },
-  "Installation": {
-    "DefaultAlias": "",
-    "HostPassword": "",
-    "HostEmail": "",
-    "SiteTemplate": "",
-    "DefaultTheme": "",
-    "DefaultContainer": ""
-  },
-  "Localization": {
-    "DefaultCulture": "en"
-  },
-  "AvailableDatabases": [
-    {
-      "Name": "LocalDB",
-      "ControlType": "Oqtane.Installer.Controls.LocalDBConfig, Oqtane.Client",
-      "DBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer"
-    },
-    {
-      "Name": "SQL Server",
-      "ControlType": "Oqtane.Installer.Controls.SqlServerConfig, Oqtane.Client",
-      "DBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer"
-    },
-    {
-      "Name": "SQLite",
-      "ControlType": "Oqtane.Installer.Controls.SqliteConfig, Oqtane.Client",
-      "DBType": "Oqtane.Database.Sqlite.SqliteDatabase, Oqtane.Database.Sqlite"
-    },
-    {
-      "Name": "MySQL",
-      "ControlType": "Oqtane.Installer.Controls.MySQLConfig, Oqtane.Client",
-      "DBType": "Oqtane.Database.MySQL.MySQLDatabase, Oqtane.Database.MySQL"
-    },
-    {
-      "Name": "PostgreSQL",
-      "ControlType": "Oqtane.Installer.Controls.PostgreSQLConfig, Oqtane.Client",
-      "DBType": "Oqtane.Database.PostgreSQL.PostgreSQLDatabase, Oqtane.Database.PostgreSQL"
-    }
-  ]
-}

From 20f3cf532764e4280590f8bddcbe434dc27d7a8c Mon Sep 17 00:00:00 2001
From: alikoli <aleksander.poniatowski@eje.pl>
Date: Wed, 9 Aug 2023 03:58:34 +0200
Subject: [PATCH 2/3] Add empty appsettings

---
 Oqtane.Server/appsettings.json | 48 ++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 Oqtane.Server/appsettings.json

diff --git a/Oqtane.Server/appsettings.json b/Oqtane.Server/appsettings.json
new file mode 100644
index 00000000..e0747f67
--- /dev/null
+++ b/Oqtane.Server/appsettings.json
@@ -0,0 +1,48 @@
+{
+  "Runtime": "Server",
+  "RenderMode": "ServerPrerendered",
+  "Database": {
+    "DefaultDBType": ""
+  },
+  "ConnectionStrings": {
+    "DefaultConnection": ""
+  },
+  "Installation": {
+    "DefaultAlias": "",
+    "HostPassword": "",
+    "HostEmail": "",
+    "SiteTemplate": "",
+    "DefaultTheme": "",
+    "DefaultContainer": ""
+  },
+  "Localization": {
+    "DefaultCulture": "en"
+  },
+  "AvailableDatabases": [
+    {
+      "Name": "LocalDB",
+      "ControlType": "Oqtane.Installer.Controls.LocalDBConfig, Oqtane.Client",
+      "DBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer"
+    },
+    {
+      "Name": "SQL Server",
+      "ControlType": "Oqtane.Installer.Controls.SqlServerConfig, Oqtane.Client",
+      "DBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer"
+    },
+    {
+      "Name": "SQLite",
+      "ControlType": "Oqtane.Installer.Controls.SqliteConfig, Oqtane.Client",
+      "DBType": "Oqtane.Database.Sqlite.SqliteDatabase, Oqtane.Database.Sqlite"
+    },
+    {
+      "Name": "MySQL",
+      "ControlType": "Oqtane.Installer.Controls.MySQLConfig, Oqtane.Client",
+      "DBType": "Oqtane.Database.MySQL.MySQLDatabase, Oqtane.Database.MySQL"
+    },
+    {
+      "Name": "PostgreSQL",
+      "ControlType": "Oqtane.Installer.Controls.PostgreSQLConfig, Oqtane.Client",
+      "DBType": "Oqtane.Database.PostgreSQL.PostgreSQLDatabase, Oqtane.Database.PostgreSQL"
+    }
+  ]
+}
\ No newline at end of file

From 18b4bd62f71e8fcb47a4f1480f54cb500a418fd5 Mon Sep 17 00:00:00 2001
From: alikoli <aleksander.poniatowski@eje.pl>
Date: Wed, 9 Aug 2023 04:06:14 +0200
Subject: [PATCH 3/3] Update appsettings.json

---
 Oqtane.Server/appsettings.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Server/appsettings.json b/Oqtane.Server/appsettings.json
index e0747f67..a518f1a2 100644
--- a/Oqtane.Server/appsettings.json
+++ b/Oqtane.Server/appsettings.json
@@ -1,7 +1,7 @@
 {
   "Runtime": "Server",
   "RenderMode": "ServerPrerendered",
-  "Database": {
+   "Database": {
     "DefaultDBType": ""
   },
   "ConnectionStrings": {
@@ -45,4 +45,4 @@
       "DBType": "Oqtane.Database.PostgreSQL.PostgreSQLDatabase, Oqtane.Database.PostgreSQL"
     }
   ]
-}
\ No newline at end of file
+}