From 2525ec0d18db76a64e50be272dbf457204e1579a Mon Sep 17 00:00:00 2001
From: Perry MacMurray <perrymacmurray@gmail.com>
Date: Tue, 5 Apr 2022 17:07:58 -0400
Subject: [PATCH] Switch 24H toggle from UI settings to language settings

---
 osu.Game/Localisation/GeneralSettingsStrings.cs           | 5 +++++
 osu.Game/Localisation/UserInterfaceStrings.cs             | 5 -----
 .../Settings/Sections/General/LanguageSettings.cs         | 8 +++++++-
 .../Settings/Sections/UserInterface/GeneralSettings.cs    | 5 -----
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Localisation/GeneralSettingsStrings.cs b/osu.Game/Localisation/GeneralSettingsStrings.cs
index a60e4891f4..cca8c8efd1 100644
--- a/osu.Game/Localisation/GeneralSettingsStrings.cs
+++ b/osu.Game/Localisation/GeneralSettingsStrings.cs
@@ -29,6 +29,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString PreferOriginalMetadataLanguage => new TranslatableString(getKey(@"prefer_original"), @"Prefer metadata in original language");
 
+        /// <summary>
+        /// "Prefer 24-hour time"
+        /// </summary>
+        public static LocalisableString Prefer24HourTime => new TranslatableString(getKey(@"prefer_24_hour_time"), @"Prefer 24-hour time");
+
         /// <summary>
         /// "Updates"
         /// </summary>
diff --git a/osu.Game/Localisation/UserInterfaceStrings.cs b/osu.Game/Localisation/UserInterfaceStrings.cs
index ac79f9f45d..4be403edb4 100644
--- a/osu.Game/Localisation/UserInterfaceStrings.cs
+++ b/osu.Game/Localisation/UserInterfaceStrings.cs
@@ -24,11 +24,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString CursorRotation => new TranslatableString(getKey(@"cursor_rotation"), @"Rotate cursor when dragging");
 
-        /// <summary>
-        /// "Prefer 24-hour time"
-        /// </summary>
-        public static LocalisableString Prefer24HourTime => new TranslatableString(getKey(@"prefer_24_hour_time"), @"Prefer 24-hour time");
-
         /// <summary>
         /// "Menu cursor size"
         /// </summary>
diff --git a/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
index 200618c469..e7cc1bce10 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
+using osu.Game.Configuration;
 using osu.Game.Extensions;
 using osu.Game.Localisation;
 
@@ -19,7 +20,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
         protected override LocalisableString Header => GeneralSettingsStrings.LanguageHeader;
 
         [BackgroundDependencyLoader]
-        private void load(FrameworkConfigManager frameworkConfig)
+        private void load(FrameworkConfigManager frameworkConfig, OsuConfigManager config)
         {
             frameworkLocale = frameworkConfig.GetBindable<string>(FrameworkSetting.Locale);
 
@@ -34,6 +35,11 @@ namespace osu.Game.Overlays.Settings.Sections.General
                     LabelText = GeneralSettingsStrings.PreferOriginalMetadataLanguage,
                     Current = frameworkConfig.GetBindable<bool>(FrameworkSetting.ShowUnicode)
                 },
+                new SettingsCheckbox
+                {
+                    LabelText = GeneralSettingsStrings.Prefer24HourTime,
+                    Current = config.GetBindable<bool>(OsuSetting.Prefer24HourTime)
+                },
             };
 
             if (!LanguageExtensions.TryParseCultureCode(frameworkLocale.Value, out var locale))
diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
index d6d38c8e12..59894cbcae 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
@@ -41,11 +41,6 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
                     Current = config.GetBindable<double>(OsuSetting.UIHoldActivationDelay),
                     KeyboardStep = 50
                 },
-                new SettingsCheckbox
-                {
-                    LabelText = UserInterfaceStrings.Prefer24HourTime,
-                    Current = config.GetBindable<bool>(OsuSetting.Prefer24HourTime)
-                },
             };
         }
     }