Fix localization issues

MidoriKami · Jul 21, 2024 · 00b2809 · 00b2809
1 parent b70b65c
commit 00b2809
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/Classes/ImGuiTweaks.cs b/Classes/ImGuiTweaks.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Drawing;
 using System.Numerics;
-using System.Resources;
 using Dalamud.Interface;
 using Dalamud.Interface.Components;
 using Dalamud.Interface.ManagedFontAtlas;
@@ -52,12 +51,12 @@ public static void TextColoredUnformatted(Vector4 color, string text) {
         ImGui.TextUnformatted(text);
     }
 
-    public static bool EnumCombo<T>(string label, ref T refValue, ResourceManager? resourceManager = null) where T : Enum {
-        using var combo = ImRaii.Combo(label, refValue.GetDescription(resourceManager));
+    public static bool EnumCombo<T>(string label, ref T refValue) where T : Enum {
+        using var combo = ImRaii.Combo(label, refValue.GetDescription());
         if (!combo) return false;
 
         foreach (Enum enumValue in Enum.GetValues(refValue.GetType())) {
-            if (!ImGui.Selectable(enumValue.GetDescription(resourceManager), enumValue.Equals(refValue))) continue;
+            if (!ImGui.Selectable(enumValue.GetDescription(), enumValue.Equals(refValue))) continue;
 
             refValue = (T)enumValue;
             return true;

diff --git a/Extensions/EnumExtensions.cs b/Extensions/EnumExtensions.cs
@@ -1,17 +1,25 @@
 using System;
 using System.ComponentModel;
+using System.Globalization;
 using System.Resources;
 
 namespace KamiLib.Extensions;
 
 public static class EnumExtensions {
-    public static string GetDescription(this Enum value, ResourceManager? resourceManager = null) {
+
+    public static Func<ResourceManager?>? GetResourceManagerFunc { get; set; }
+
+    public static Func<CultureInfo?>? GetCultureInfoFunc { get; set; }
+
+    public static string GetDescription(this Enum value) {
         var type = value.GetType();
         if (Enum.GetName(type, value) is { } name) {
             if (type.GetField(name) is { } field) {
                 if (Attribute.GetCustomAttribute(field, typeof(DescriptionAttribute)) is DescriptionAttribute attr) {
-                    if (resourceManager?.GetString(attr.Description) is { } localized) {
-                        return localized;
+                    if (GetResourceManagerFunc?.Invoke() is { } resourceManager && GetCultureInfoFunc?.Invoke() is { } cultureInfo) {
+                        if (resourceManager.GetString(attr.Description, cultureInfo) is { } localizedString) {
+                            return localizedString;
+                        }
                     }
 
                     return attr.Description;