diff --git a/Oqtane.Server/Extensions/ApplicationBuilderExtensions.cs b/Oqtane.Server/Extensions/ApplicationBuilderExtensions.cs index 24bd3367..476d8bee 100644 --- a/Oqtane.Server/Extensions/ApplicationBuilderExtensions.cs +++ b/Oqtane.Server/Extensions/ApplicationBuilderExtensions.cs @@ -21,12 +21,16 @@ namespace Oqtane.Extensions var configuration = app.ApplicationServices.GetService(); var defaultCulture = configuration.GetSection(DefaultCultureKey).Value; var supportedCultures = configuration.GetSection(SupportedCulturesKey).Get(); + if (defaultCulture == CultureInfo.InstalledUICulture.Name) + { + LocalizationSettings.DefaultCulture = defaultCulture; + } + if (supportedCultures.Length > 0) { LocalizationSettings.SupportedCultures.AddRange(supportedCultures); } - LocalizationSettings.DefaultCulture = defaultCulture; CultureInfo.CurrentUICulture = new CultureInfo(defaultCulture); app.UseRequestLocalization(options => { diff --git a/Oqtane.Server/appsettings.json b/Oqtane.Server/appsettings.json index 743c6e19..1af87b4c 100644 --- a/Oqtane.Server/appsettings.json +++ b/Oqtane.Server/appsettings.json @@ -13,7 +13,7 @@ "DefaultContainer": "" }, "Localization": { - "DefaultCulture": "en-US", + "DefaultCulture": "", "SupportedCultures": [] } } \ No newline at end of file diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs index a45e2808..db62f416 100644 --- a/Oqtane.Shared/Shared/Constants.cs +++ b/Oqtane.Shared/Shared/Constants.cs @@ -1,4 +1,5 @@ using System; +using System.Globalization; namespace Oqtane.Shared { @@ -60,6 +61,6 @@ namespace Oqtane.Shared public static readonly string StalliteAssemblyExtension = ".resources.dll"; - public static readonly string DefaultCulture = "en-US"; + public static readonly string DefaultCulture = CultureInfo.InstalledUICulture.Name; } }