From 52d1d5841e70017e915e6b318f5295f7778ebe1c Mon Sep 17 00:00:00 2001 From: hishamco Date: Tue, 29 Sep 2020 18:50:06 +0300 Subject: [PATCH] Avoid looking for en-US culture resources --- Oqtane.Server/Controllers/InstallationController.cs | 11 ++++++++--- .../Extensions/OqtaneServiceCollectionExtensions.cs | 5 +++++ .../Localization/LocalizationSettings.cs | 5 ++--- Oqtane.Shared/Shared/Constants.cs | 2 ++ 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Oqtane.Server/Controllers/InstallationController.cs b/Oqtane.Server/Controllers/InstallationController.cs index f1ef2a8a..940ab6a8 100644 --- a/Oqtane.Server/Controllers/InstallationController.cs +++ b/Oqtane.Server/Controllers/InstallationController.cs @@ -76,11 +76,16 @@ namespace Oqtane.Controllers var binFolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location); // Get the satellite assemblies - foreach (var cultureFolder in LocalizationSettings.SupportedCultures) + foreach (var culture in LocalizationSettings.SupportedCultures) { - foreach (var resourceFile in Directory.EnumerateFiles(Path.Combine(Path.GetDirectoryName(binFolder), cultureFolder))) + if (culture == Constants.DefaultCulture) { - list.Add(Path.Combine(cultureFolder, Path.GetFileNameWithoutExtension(resourceFile))); + continue; + } + + foreach (var resourceFile in Directory.EnumerateFiles(Path.Combine(Path.GetDirectoryName(binFolder), culture))) + { + list.Add(Path.Combine(culture, Path.GetFileNameWithoutExtension(resourceFile))); } } diff --git a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs index a51595ca..09776f45 100644 --- a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs +++ b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs @@ -136,6 +136,11 @@ namespace Microsoft.Extensions.DependencyInjection foreach (var culture in LocalizationSettings.SupportedCultures) { + if (culture == Constants.DefaultCulture) + { + continue; + } + var assembliesFolder = new DirectoryInfo(Path.Combine(assemblyPath, culture)); foreach (var assemblyFile in assembliesFolder.EnumerateFiles(Constants.StalliteAssemblyExtension)) { diff --git a/Oqtane.Server/Infrastructure/Localization/LocalizationSettings.cs b/Oqtane.Server/Infrastructure/Localization/LocalizationSettings.cs index 80811310..0e6ff714 100644 --- a/Oqtane.Server/Infrastructure/Localization/LocalizationSettings.cs +++ b/Oqtane.Server/Infrastructure/Localization/LocalizationSettings.cs @@ -1,14 +1,13 @@ using System.Collections.Generic; +using Oqtane.Shared; namespace Oqtane.Infrastructure.Localization { public static class LocalizationSettings { - private const string EnglishCulture = "en-US"; - static LocalizationSettings() { - DefaultCulture = EnglishCulture; + DefaultCulture = Constants.DefaultCulture; SupportedCultures = new List { DefaultCulture }; } diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs index 7b9b3a0e..a45e2808 100644 --- a/Oqtane.Shared/Shared/Constants.cs +++ b/Oqtane.Shared/Shared/Constants.cs @@ -59,5 +59,7 @@ namespace Oqtane.Shared public static readonly string[] InvalidFileNameEndingChars = { ".", " " }; public static readonly string StalliteAssemblyExtension = ".resources.dll"; + + public static readonly string DefaultCulture = "en-US"; } }