From 385a1913f7a1a4390474f36202c56a0657fa2429 Mon Sep 17 00:00:00 2001 From: BDisp Date: Fri, 23 Aug 2024 12:09:50 +0100 Subject: [PATCH] Fixes #3687. ColorPicker isn't respecting the current UI culture. --- Terminal.Gui/Drawing/ColorStrings.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Terminal.Gui/Drawing/ColorStrings.cs b/Terminal.Gui/Drawing/ColorStrings.cs index 2175b56fe..b7f080042 100644 --- a/Terminal.Gui/Drawing/ColorStrings.cs +++ b/Terminal.Gui/Drawing/ColorStrings.cs @@ -21,7 +21,7 @@ public static class ColorStrings public static string? GetW3CColorName (Color color) { // Fetch the color name from the resource file - return _resourceManager.GetString ($"#{color.R:X2}{color.G:X2}{color.B:X2}", CultureInfo.CurrentCulture); + return _resourceManager.GetString ($"#{color.R:X2}{color.G:X2}{color.B:X2}", CultureInfo.CurrentUICulture); } /// @@ -30,7 +30,7 @@ public static class ColorStrings /// public static IEnumerable GetW3CColorNames () { - foreach (DictionaryEntry entry in _resourceManager.GetResourceSet (CultureInfo.CurrentCulture, true, true)!) + foreach (DictionaryEntry entry in _resourceManager.GetResourceSet (CultureInfo.CurrentUICulture, true, true)!) { string keyName = entry.Key.ToString () ?? string.Empty; @@ -50,7 +50,7 @@ public static class ColorStrings public static bool TryParseW3CColorName (string name, out Color color) { // Iterate through all resource entries to find the matching color name - foreach (DictionaryEntry entry in _resourceManager.GetResourceSet (CultureInfo.CurrentCulture, true, true)!) + foreach (DictionaryEntry entry in _resourceManager.GetResourceSet (CultureInfo.CurrentUICulture, true, true)!) { if (entry.Value is string colorName && colorName.Equals (name, StringComparison.OrdinalIgnoreCase)) {