Add English to supported cultures by default

This commit is contained in:
hishamco 2021-04-26 01:55:27 +03:00
parent 60f386838e
commit 76c2a2f2f9

View File

@ -1,3 +1,4 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
@ -9,7 +10,7 @@ namespace Oqtane.Infrastructure
public class LocalizationManager : ILocalizationManager public class LocalizationManager : ILocalizationManager
{ {
private static readonly string DefaultCulture = Constants.DefaultCulture; private static readonly string DefaultCulture = Constants.DefaultCulture;
private static readonly string[] SupportedCultures = new[] { DefaultCulture }; private static readonly string[] DefaultSupportedCultures = new[] { DefaultCulture };
private readonly LocalizationOptions _localizationOptions; private readonly LocalizationOptions _localizationOptions;
@ -19,25 +20,19 @@ namespace Oqtane.Infrastructure
} }
public string GetDefaultCulture() public string GetDefaultCulture()
=> string.IsNullOrEmpty(_localizationOptions.DefaultCulture) => String.IsNullOrEmpty(_localizationOptions.DefaultCulture)
? DefaultCulture ? DefaultCulture
: _localizationOptions.DefaultCulture; : _localizationOptions.DefaultCulture;
public string[] GetSupportedCultures() public string[] GetSupportedCultures()
{ {
List<string> cultures = new List<string>(); var cultures = new List<string>(DefaultSupportedCultures);
foreach(var file in Directory.EnumerateFiles(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "Oqtane.Client.resources.dll", SearchOption.AllDirectories)) foreach(var file in Directory.EnumerateFiles(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "Oqtane.Client.resources.dll", SearchOption.AllDirectories))
{ {
cultures.Add(Path.GetFileName(Path.GetDirectoryName(file))); cultures.Add(Path.GetFileName(Path.GetDirectoryName(file)));
} }
if (cultures.Count == 0)
{ return cultures.ToArray();
return SupportedCultures;
}
else
{
return cultures.ToArray();
}
} }
} }
} }