Diplomarbeit-Absolventenverein/oqtane.framework-not-mirrored
Archived
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1281 from hishamco/localization-manager

Browse Source 
LocalizationManager enhancements
This commit is contained in:
Shaun Walker 2021-04-27 07:51:01 -04:00 committed by GitHub
commit 307f97c60c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Oqtane.Server/Infrastructure/LocalizationManager.cs
View File

@ -1,5 +1,7 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq;
using System.Reflection; using System.Reflection;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Oqtane.Shared; using Oqtane.Shared;
@ -9,7 +11,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 +21,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.OrderBy(c => c).ToArray();
return SupportedCultures;
}
else
{
return cultures.ToArray();
}
} }
} }
} }