From 27ff428491cc31ea8af72b9e31f90c27251c4b06 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Aug 2021 17:33:19 +0900
Subject: [PATCH] Revert "Temporary changes to compile with latest framework"

This reverts commit 34c671f712d71c8a3e3821d7dc45e46f055e8f1b.
---
 osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs   | 4 +---
 osu.Game/Overlays/Rankings/Tables/RankingsTable.cs  | 3 +--
 osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs | 5 ++---
 osu.Game/Screens/Edit/EditorTable.cs                | 4 +---
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 4b44c34c6d..ddd1dfa6cd 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -8,8 +8,6 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.EnumExtensions;
-using osu.Framework.Extensions.LocalisationExtensions;
-using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -217,7 +215,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
         private class HeaderText : OsuSpriteText
         {
-            public HeaderText(LocalisableString text)
+            public HeaderText(string text)
             {
                 Text = text.ToUpper();
                 Font = OsuFont.GetFont(size: 10, weight: FontWeight.Bold);
diff --git a/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs b/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
index 3f8779b97b..585b5c22aa 100644
--- a/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
@@ -10,7 +10,6 @@ using osu.Framework.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Framework.Localisation;
 using osu.Game.Users;
 using osu.Game.Users.Drawables;
 using osuTK;
@@ -110,7 +109,7 @@ namespace osu.Game.Overlays.Rankings.Tables
         {
             private readonly bool isHighlighted;
 
-            public HeaderText(LocalisableString text, bool isHighlighted)
+            public HeaderText(string text, bool isHighlighted)
             {
                 this.isHighlighted = isHighlighted;
 
diff --git a/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs b/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
index a77ce81c23..a6969f483f 100644
--- a/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Users;
@@ -20,7 +19,7 @@ namespace osu.Game.Overlays.Rankings.Tables
         {
         }
 
-        protected virtual IEnumerable<LocalisableString> GradeColumns => new List<LocalisableString> { "SS", "S", "A" };
+        protected virtual IEnumerable<string> GradeColumns => new List<string> { "SS", "S", "A" };
 
         protected override TableColumn[] CreateAdditionalHeaders() => new[]
             {
@@ -67,7 +66,7 @@ namespace osu.Game.Overlays.Rankings.Tables
 
         private class UserTableHeaderText : HeaderText
         {
-            public UserTableHeaderText(LocalisableString text, bool isHighlighted, bool isGrade)
+            public UserTableHeaderText(string text, bool isHighlighted, bool isGrade)
                 : base(text, isHighlighted)
             {
                 Margin = new MarginPadding
diff --git a/osu.Game/Screens/Edit/EditorTable.cs b/osu.Game/Screens/Edit/EditorTable.cs
index 77c3a2f26c..9578b96897 100644
--- a/osu.Game/Screens/Edit/EditorTable.cs
+++ b/osu.Game/Screens/Edit/EditorTable.cs
@@ -2,12 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -48,7 +46,7 @@ namespace osu.Game.Screens.Edit
 
         private class HeaderText : OsuSpriteText
         {
-            public HeaderText(LocalisableString text)
+            public HeaderText(string text)
             {
                 Text = text.ToUpper();
                 Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold);