anna
/
NoSoliciting
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: improve the embedded resources method

This commit is contained in:
Anna 2021-04-30 19:55:31 -04:00
parent 649fe6f866
commit accb06d32f
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NoSoliciting/Plugin.cs
View File

@ -8,6 +8,7 @@ using System.Threading.Tasks;
using Dalamud;
using NoSoliciting.Interface;
using NoSoliciting.Ml;
using NoSoliciting.Resources;
using XivCommon;
namespace NoSoliciting {
@ -47,7 +48,7 @@ namespace NoSoliciting {
this.Config = this.Interface.GetPluginConfig() as PluginConfiguration ?? new PluginConfiguration();
this.Config.Initialise(this.Interface);
Util.PreLoadResourcesFromMainAssembly("NoSoliciting.Resources.Language.");
Util.PreloadEmbeddedResources(this.GetType().Assembly, Language.ResourceManager, "NoSoliciting.Resources.Language.");
this.ConfigureLanguage();
this.Interface.OnLanguageChanged += this.OnLanguageUpdate;

28
NoSoliciting/Util.cs
View File

@ -2,13 +2,12 @@
using System.Collections;
using System.Globalization;
using System.Reflection;
using System.Resources;
namespace NoSoliciting {
internal static class Util {
internal static void PreLoadResourcesFromMainAssembly(string resourcesPrefix, string resourcesExtension = ".resources") {
internal static void PreloadEmbeddedResources(Assembly resourceAssembly, ResourceManager resourceManager, string resourcesPrefix, string resourcesExtension = ".resources") {
// get loaded resource sets from resource manager
var resourceManager = Resources.Language.ResourceManager;
if ((
resourceManager.GetType().GetField("_resourceSets", BindingFlags.Instance | BindingFlags.NonPublic) ??
// ReSharper disable once PossibleNullReferenceException
@ -17,10 +16,9 @@ namespace NoSoliciting {
return;
}
var resourceAssembly = typeof(Plugin).Assembly; // get assembly with localization resources
foreach (var embeddedResourceName in resourceAssembly.GetManifestResourceNames()) {
if (embeddedResourceName.StartsWith(resourcesPrefix, StringComparison.Ordinal) == false ||
embeddedResourceName.EndsWith(resourcesExtension, StringComparison.Ordinal) == false) {
if (!embeddedResourceName.StartsWith(resourcesPrefix, StringComparison.Ordinal) ||
!embeddedResourceName.EndsWith(resourcesExtension, StringComparison.Ordinal)) {
continue; // not localized resource
}
@ -36,19 +34,17 @@ namespace NoSoliciting {
var resourceSet = new System.Resources.ResourceSet(resourceStream);
var culture = CultureInfo.GetCultureInfo(locale);
if (resourceSetByCulture is Hashtable) {
if (resourceSetByCulture.Contains(culture)) {
resourceSetByCulture.Remove(culture);
}
resourceSetByCulture.Add(culture, resourceSet);
} else {
if (resourceSetByCulture.Contains(culture.Name)) {
resourceSetByCulture.Remove(culture.Name);
}
var key = resourceSetByCulture is Hashtable
? (object) culture
: culture.Name;
resourceSetByCulture.Add(culture.Name, resourceSet);
// remove any old resources if there somehow are any
if (resourceSetByCulture.Contains(key)) {
resourceSetByCulture.Remove(key);
}
resourceSetByCulture.Add(key, resourceSet);
}
}
}