diff --git a/Dalamud/Interface/FontAwesome/FontAwesomeHelpers.cs b/Dalamud/Interface/FontAwesome/FontAwesomeHelpers.cs index 14a7072b9..cf34d736e 100644 --- a/Dalamud/Interface/FontAwesome/FontAwesomeHelpers.cs +++ b/Dalamud/Interface/FontAwesome/FontAwesomeHelpers.cs @@ -73,9 +73,9 @@ public static class FontAwesomeHelpers { foreach (var icon in icons) { - var name = Enum.GetName(icon)?.ToLower(); + var name = Enum.GetName(icon)?.ToLowerInvariant(); var searchTerms = icon.GetSearchTerms(); - if (name!.Contains(search.ToLower()) || searchTerms.Contains(search.ToLower())) + if (name!.Contains(search.ToLowerInvariant()) || searchTerms.Contains(search.ToLowerInvariant())) { result.Add(icon); } @@ -102,10 +102,10 @@ public static class FontAwesomeHelpers // search by both terms and category foreach (var icon in icons) { - var name = Enum.GetName(icon)?.ToLower(); + var name = Enum.GetName(icon)?.ToLowerInvariant(); var searchTerms = icon.GetSearchTerms(); var categories = icon.GetCategories(); - if ((name!.Contains(search.ToLower()) || searchTerms.Contains(search.ToLower())) && categories.Contains(category)) + if ((name!.Contains(search.ToLowerInvariant()) || searchTerms.Contains(search.ToLowerInvariant())) && categories.Contains(category)) { result.Add(icon); } diff --git a/Dalamud/Interface/ImGuiFileDialog/FileDialog.Filters.cs b/Dalamud/Interface/ImGuiFileDialog/FileDialog.Filters.cs index 919e65592..85b380bee 100644 --- a/Dalamud/Interface/ImGuiFileDialog/FileDialog.Filters.cs +++ b/Dalamud/Interface/ImGuiFileDialog/FileDialog.Filters.cs @@ -89,7 +89,7 @@ public partial class FileDialog foreach (var file in this.files) { var show = true; - if (!string.IsNullOrEmpty(this.searchBuffer) && !file.FileName.ToLower().Contains(this.searchBuffer.ToLower())) + if (!string.IsNullOrEmpty(this.searchBuffer) && !file.FileName.ToLowerInvariant().Contains(this.searchBuffer.ToLowerInvariant())) { show = false; } diff --git a/Dalamud/Interface/ImGuiFileDialog/FileDialog.UI.cs b/Dalamud/Interface/ImGuiFileDialog/FileDialog.UI.cs index 0dd1410d5..e4747b1e6 100644 --- a/Dalamud/Interface/ImGuiFileDialog/FileDialog.UI.cs +++ b/Dalamud/Interface/ImGuiFileDialog/FileDialog.UI.cs @@ -132,7 +132,7 @@ public partial class FileDialog AddToIconMap(new[] { "csv" }, FontAwesomeIcon.FileCsv, miscTextColor); } - return iconMap.TryGetValue(ext.ToLower(), out var icon) ? icon : new IconColorItem + return iconMap.TryGetValue(ext.ToLowerInvariant(), out var icon) ? icon : new IconColorItem { Icon = FontAwesomeIcon.File, Color = standardTextColor, diff --git a/Dalamud/Interface/Internal/DalamudCommands.cs b/Dalamud/Interface/Internal/DalamudCommands.cs index 86a316227..cc63d887f 100644 --- a/Dalamud/Interface/Internal/DalamudCommands.cs +++ b/Dalamud/Interface/Internal/DalamudCommands.cs @@ -350,10 +350,10 @@ internal class DalamudCommands : IServiceType var configuration = Service.Get(); var localization = Service.Get(); - if (Localization.ApplicableLangCodes.Contains(arguments.ToLower()) || arguments.ToLower() == "en") + if (Localization.ApplicableLangCodes.Contains(arguments.ToLowerInvariant()) || arguments.ToLowerInvariant() == "en") { - localization.SetupWithLangCode(arguments.ToLower()); - configuration.LanguageOverride = arguments.ToLower(); + localization.SetupWithLangCode(arguments.ToLowerInvariant()); + configuration.LanguageOverride = arguments.ToLowerInvariant(); chatGui.Print(string.Format(Loc.Localize("DalamudLanguageSetTo", "Language set to {0}"), arguments)); } diff --git a/Dalamud/Interface/Internal/UiDebug.cs b/Dalamud/Interface/Internal/UiDebug.cs index 076ed0296..da5dc0d98 100644 --- a/Dalamud/Interface/Internal/UiDebug.cs +++ b/Dalamud/Interface/Internal/UiDebug.cs @@ -475,7 +475,7 @@ internal unsafe class UiDebug var name = unitBase->NameString; if (searching) { - if (name == null || !name.ToLower().Contains(searchStr.ToLower())) continue; + if (name == null || !name.ToLowerInvariant().Contains(searchStr.ToLowerInvariant())) continue; } noResults = false; diff --git a/Dalamud/Interface/Internal/Windows/Settings/SettingsWindow.cs b/Dalamud/Interface/Internal/Windows/Settings/SettingsWindow.cs index 196a11ab1..5e3857f42 100644 --- a/Dalamud/Interface/Internal/Windows/Settings/SettingsWindow.cs +++ b/Dalamud/Interface/Internal/Windows/Settings/SettingsWindow.cs @@ -179,7 +179,7 @@ internal class SettingsWindow : Window foreach (var settingsTab in this.tabs.Where(x => x.IsVisible)) { - var eligible = settingsTab.Entries.Where(x => !x.Name.IsNullOrEmpty() && x.Name.ToLower().Contains(this.searchInput.ToLower())).ToArray(); + var eligible = settingsTab.Entries.Where(x => !x.Name.IsNullOrEmpty() && x.Name.ToLowerInvariant().Contains(this.searchInput.ToLowerInvariant())).ToArray(); if (!eligible.Any()) continue; diff --git a/Dalamud/Localization.cs b/Dalamud/Localization.cs index a50b6081f..3ed2ad519 100644 --- a/Dalamud/Localization.cs +++ b/Dalamud/Localization.cs @@ -138,7 +138,7 @@ public class Localization : IServiceType /// The language code to set up the UI language with. public void SetupWithLangCode(string langCode) { - if (langCode.ToLower() == FallbackLangCode) + if (langCode.Equals(FallbackLangCode, StringComparison.InvariantCultureIgnoreCase)) { this.SetupWithFallbacks(); return; diff --git a/Directory.Build.props b/Directory.Build.props index 109deba65..0c5af2e37 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,10 +1,10 @@ -