From 0a1c9a6c05bd33adf8f73f1d9f3c39710ed65bc6 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 20 Aug 2021 09:26:38 +0200
Subject: [PATCH] Move DownloadButtonStrings -> CommonStrings

---
 osu.Game/Localisation/CommonStrings.cs        | 12 +++++++++-
 .../Localisation/DownloadButtonStrings.cs     | 24 -------------------
 .../Buttons/HeaderDownloadButton.cs           |  5 ++--
 3 files changed, 13 insertions(+), 28 deletions(-)
 delete mode 100644 osu.Game/Localisation/DownloadButtonStrings.cs

diff --git a/osu.Game/Localisation/CommonStrings.cs b/osu.Game/Localisation/CommonStrings.cs
index bf488d2590..b4381fc442 100644
--- a/osu.Game/Localisation/CommonStrings.cs
+++ b/osu.Game/Localisation/CommonStrings.cs
@@ -29,6 +29,16 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString Height => new TranslatableString(getKey(@"height"), @"Height");
 
+        /// <summary>
+        /// "Downloading..."
+        /// </summary>
+        public static LocalisableString Downloading => new TranslatableString(getKey(@"downloading"), @"Downloading...");
+
+        /// <summary>
+        /// "Importing..."
+        /// </summary>
+        public static LocalisableString Importing => new TranslatableString(getKey(@"importing"), @"Importing...");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
-}
\ No newline at end of file
+}
diff --git a/osu.Game/Localisation/DownloadButtonStrings.cs b/osu.Game/Localisation/DownloadButtonStrings.cs
deleted file mode 100644
index 736f309624..0000000000
--- a/osu.Game/Localisation/DownloadButtonStrings.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Localisation;
-
-namespace osu.Game.Localisation
-{
-    public static class DownloadButtonStrings
-    {
-        private const string prefix = @"osu.Game.Resources.Localisation.DownloadButton";
-
-        /// <summary>
-        /// "Downloading..."
-        /// </summary>
-        public static LocalisableString Downloading => new TranslatableString(getKey(@"downloading"), @"Downloading...");
-
-        /// <summary>
-        /// "Importing..."
-        /// </summary>
-        public static LocalisableString Importing => new TranslatableString(getKey(@"importing"), @"Importing...");
-
-        private static string getKey(string key) => $@"{prefix}:{key}";
-    }
-}
diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
index ad045c4b17..e7a55079ec 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
@@ -19,7 +19,6 @@ using osu.Game.Resources.Localisation.Web;
 using osu.Game.Users;
 using osuTK;
 using osuTK.Graphics;
-using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.BeatmapSet.Buttons
 {
@@ -115,7 +114,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
                         {
                             new OsuSpriteText
                             {
-                                Text = DownloadButtonStrings.Downloading,
+                                Text = Localisation.CommonStrings.Downloading,
                                 Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold)
                             },
                         };
@@ -126,7 +125,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
                         {
                             new OsuSpriteText
                             {
-                                Text = DownloadButtonStrings.Importing,
+                                Text = Localisation.CommonStrings.Importing,
                                 Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold)
                             },
                         };