From 468f186511409844d924b0877a4dd66957a76185 Mon Sep 17 00:00:00 2001 From: Pavel Vesely Date: Mon, 19 Apr 2021 20:03:18 +0200 Subject: [PATCH 1/3] Default Alias When alias is not found in alias table, Oqtane fails with exception. This solution allows define default alias (*) for default site with unknown alias. --- Oqtane.Server/Repository/AliasRepository.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Oqtane.Server/Repository/AliasRepository.cs b/Oqtane.Server/Repository/AliasRepository.cs index f25c4c03..cbec2452 100644 --- a/Oqtane.Server/Repository/AliasRepository.cs +++ b/Oqtane.Server/Repository/AliasRepository.cs @@ -65,8 +65,8 @@ namespace Oqtane.Repository break; // found a matching alias } } - - return alias; + // return fallback alias + return alias ?? aliases.Find(item => item.Name.Equals("*")); } public void DeleteAlias(int aliasId) From e33c9e417dca3daf12f7a22596b6daa098f1871f Mon Sep 17 00:00:00 2001 From: hishamco Date: Tue, 20 Apr 2021 16:26:17 +0300 Subject: [PATCH 2/3] Remove SupportedCultures entry from appsettings.json --- Oqtane.Server/appsettings.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Oqtane.Server/appsettings.json b/Oqtane.Server/appsettings.json index 1af87b4c..338092ad 100644 --- a/Oqtane.Server/appsettings.json +++ b/Oqtane.Server/appsettings.json @@ -13,7 +13,6 @@ "DefaultContainer": "" }, "Localization": { - "DefaultCulture": "", - "SupportedCultures": [] + "DefaultCulture": "" } } \ No newline at end of file From 0b32dcf9b3e613cddebfb41eed13567fca9f63b6 Mon Sep 17 00:00:00 2001 From: hishamco Date: Tue, 20 Apr 2021 16:27:18 +0300 Subject: [PATCH 3/3] Make English default culture instead of current installed culture --- Oqtane.Server/appsettings.json | 2 +- Oqtane.Shared/Shared/Constants.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Oqtane.Server/appsettings.json b/Oqtane.Server/appsettings.json index 338092ad..01d5161a 100644 --- a/Oqtane.Server/appsettings.json +++ b/Oqtane.Server/appsettings.json @@ -13,6 +13,6 @@ "DefaultContainer": "" }, "Localization": { - "DefaultCulture": "" + "DefaultCulture": "en" } } \ No newline at end of file diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs index 9fde30d5..6b07827e 100644 --- a/Oqtane.Shared/Shared/Constants.cs +++ b/Oqtane.Shared/Shared/Constants.cs @@ -71,6 +71,6 @@ namespace Oqtane.Shared { public static readonly string SatelliteAssemblyExtension = ".resources.dll"; - public static readonly string DefaultCulture = CultureInfo.InstalledUICulture.Name; + public static readonly string DefaultCulture = "en"; } }