From 0fb6a637091235afc715db3c1a3e67544acc00ad Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Thu, 2 Feb 2023 00:46:14 +0000
Subject: [PATCH] refactor: change namespacing to allow
 osu-localisation-analyzer to process all strings

---
 .../{SkinEditorComponents => }/BarHitErrorMeterStrings.cs       | 2 +-
 .../{SkinEditorComponents => }/BeatmapAttributeTextStrings.cs   | 2 +-
 .../{SkinEditorComponents => }/ColourHitErrorMeterStrings.cs    | 2 +-
 .../FontAdjustableSkinComponentStrings.cs                       | 2 +-
 .../GameplayAccuracyCounterStrings.cs                           | 2 +-
 .../JudgementCounterDisplayStrings.cs                           | 2 +-
 .../{SkinEditorComponents => }/SkinnableSpriteStrings.cs        | 2 +-
 .../{SkinEditorComponents => }/SongProgressStrings.cs           | 2 +-
 .../{SkinEditorComponents => }/TextElementStrings.cs            | 2 +-
 osu.Game/Screens/Play/HUD/ArgonSongProgress.cs                  | 2 +-
 osu.Game/Screens/Play/HUD/DefaultSongProgress.cs                | 2 +-
 osu.Game/Screens/Play/HUD/GameplayAccuracyCounter.cs            | 2 +-
 osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs    | 2 +-
 osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs | 2 +-
 .../Play/HUD/JudgementCounter/JudgementCounterDisplay.cs        | 2 +-
 osu.Game/Skinning/Components/BeatmapAttributeText.cs            | 1 -
 osu.Game/Skinning/Components/TextElement.cs                     | 2 +-
 osu.Game/Skinning/FontAdjustableSkinComponent.cs                | 2 +-
 osu.Game/Skinning/SkinnableSprite.cs                            | 2 +-
 19 files changed, 18 insertions(+), 19 deletions(-)
 rename osu.Game/Localisation/{SkinEditorComponents => }/BarHitErrorMeterStrings.cs (98%)
 rename osu.Game/Localisation/{SkinEditorComponents => }/BeatmapAttributeTextStrings.cs (96%)
 rename osu.Game/Localisation/{SkinEditorComponents => }/ColourHitErrorMeterStrings.cs (97%)
 rename osu.Game/Localisation/{SkinEditorComponents => }/FontAdjustableSkinComponentStrings.cs (93%)
 rename osu.Game/Localisation/{SkinEditorComponents => }/GameplayAccuracyCounterStrings.cs (96%)
 rename osu.Game/Localisation/{SkinEditorComponents => }/JudgementCounterDisplayStrings.cs (97%)
 rename osu.Game/Localisation/{SkinEditorComponents => }/SkinnableSpriteStrings.cs (94%)
 rename osu.Game/Localisation/{SkinEditorComponents => }/SongProgressStrings.cs (94%)
 rename osu.Game/Localisation/{SkinEditorComponents => }/TextElementStrings.cs (94%)

diff --git a/osu.Game/Localisation/SkinEditorComponents/BarHitErrorMeterStrings.cs b/osu.Game/Localisation/BarHitErrorMeterStrings.cs
similarity index 98%
rename from osu.Game/Localisation/SkinEditorComponents/BarHitErrorMeterStrings.cs
rename to osu.Game/Localisation/BarHitErrorMeterStrings.cs
index ea372a5207..171c3e223e 100644
--- a/osu.Game/Localisation/SkinEditorComponents/BarHitErrorMeterStrings.cs
+++ b/osu.Game/Localisation/BarHitErrorMeterStrings.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Localisation;
 
-namespace osu.Game.Localisation.SkinEditorComponents
+namespace osu.Game.Localisation
 {
     public static class BarHitErrorMeterStrings
     {
diff --git a/osu.Game/Localisation/SkinEditorComponents/BeatmapAttributeTextStrings.cs b/osu.Game/Localisation/BeatmapAttributeTextStrings.cs
similarity index 96%
rename from osu.Game/Localisation/SkinEditorComponents/BeatmapAttributeTextStrings.cs
rename to osu.Game/Localisation/BeatmapAttributeTextStrings.cs
index faafa7e304..1ceb482cf4 100644
--- a/osu.Game/Localisation/SkinEditorComponents/BeatmapAttributeTextStrings.cs
+++ b/osu.Game/Localisation/BeatmapAttributeTextStrings.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Localisation;
 
-namespace osu.Game.Localisation.SkinEditorComponents
+namespace osu.Game.Localisation
 {
     public static class BeatmapAttributeTextStrings
     {
diff --git a/osu.Game/Localisation/SkinEditorComponents/ColourHitErrorMeterStrings.cs b/osu.Game/Localisation/ColourHitErrorMeterStrings.cs
similarity index 97%
rename from osu.Game/Localisation/SkinEditorComponents/ColourHitErrorMeterStrings.cs
rename to osu.Game/Localisation/ColourHitErrorMeterStrings.cs
index fec5781c3d..13682c9c85 100644
--- a/osu.Game/Localisation/SkinEditorComponents/ColourHitErrorMeterStrings.cs
+++ b/osu.Game/Localisation/ColourHitErrorMeterStrings.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Localisation;
 
-namespace osu.Game.Localisation.SkinEditorComponents
+namespace osu.Game.Localisation
 {
     public static class ColourHitErrorMeterStrings
     {
diff --git a/osu.Game/Localisation/SkinEditorComponents/FontAdjustableSkinComponentStrings.cs b/osu.Game/Localisation/FontAdjustableSkinComponentStrings.cs
similarity index 93%
rename from osu.Game/Localisation/SkinEditorComponents/FontAdjustableSkinComponentStrings.cs
rename to osu.Game/Localisation/FontAdjustableSkinComponentStrings.cs
index 9b92854faa..76f9f2f8b9 100644
--- a/osu.Game/Localisation/SkinEditorComponents/FontAdjustableSkinComponentStrings.cs
+++ b/osu.Game/Localisation/FontAdjustableSkinComponentStrings.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Localisation;
 
-namespace osu.Game.Localisation.SkinEditorComponents
+namespace osu.Game.Localisation
 {
     public static class FontAdjustableSkinComponentStrings
     {
diff --git a/osu.Game/Localisation/SkinEditorComponents/GameplayAccuracyCounterStrings.cs b/osu.Game/Localisation/GameplayAccuracyCounterStrings.cs
similarity index 96%
rename from osu.Game/Localisation/SkinEditorComponents/GameplayAccuracyCounterStrings.cs
rename to osu.Game/Localisation/GameplayAccuracyCounterStrings.cs
index 33a742a95e..c9e936d8af 100644
--- a/osu.Game/Localisation/SkinEditorComponents/GameplayAccuracyCounterStrings.cs
+++ b/osu.Game/Localisation/GameplayAccuracyCounterStrings.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Localisation;
 
-namespace osu.Game.Localisation.SkinEditorComponents
+namespace osu.Game.Localisation
 {
     public static class GameplayAccuracyCounterStrings
     {
diff --git a/osu.Game/Localisation/SkinEditorComponents/JudgementCounterDisplayStrings.cs b/osu.Game/Localisation/JudgementCounterDisplayStrings.cs
similarity index 97%
rename from osu.Game/Localisation/SkinEditorComponents/JudgementCounterDisplayStrings.cs
rename to osu.Game/Localisation/JudgementCounterDisplayStrings.cs
index 75f0241e56..fbc22e96fd 100644
--- a/osu.Game/Localisation/SkinEditorComponents/JudgementCounterDisplayStrings.cs
+++ b/osu.Game/Localisation/JudgementCounterDisplayStrings.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Localisation;
 
-namespace osu.Game.Localisation.SkinEditorComponents
+namespace osu.Game.Localisation
 {
     public static class JudgementCounterDisplayStrings
     {
diff --git a/osu.Game/Localisation/SkinEditorComponents/SkinnableSpriteStrings.cs b/osu.Game/Localisation/SkinnableSpriteStrings.cs
similarity index 94%
rename from osu.Game/Localisation/SkinEditorComponents/SkinnableSpriteStrings.cs
rename to osu.Game/Localisation/SkinnableSpriteStrings.cs
index f67acb493c..6192f5e43d 100644
--- a/osu.Game/Localisation/SkinEditorComponents/SkinnableSpriteStrings.cs
+++ b/osu.Game/Localisation/SkinnableSpriteStrings.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Localisation;
 
-namespace osu.Game.Localisation.SkinEditorComponents
+namespace osu.Game.Localisation
 {
     public static class SkinnableSpriteStrings
     {
diff --git a/osu.Game/Localisation/SkinEditorComponents/SongProgressStrings.cs b/osu.Game/Localisation/SongProgressStrings.cs
similarity index 94%
rename from osu.Game/Localisation/SkinEditorComponents/SongProgressStrings.cs
rename to osu.Game/Localisation/SongProgressStrings.cs
index 0e4d7ea34d..033560ebb0 100644
--- a/osu.Game/Localisation/SkinEditorComponents/SongProgressStrings.cs
+++ b/osu.Game/Localisation/SongProgressStrings.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Localisation;
 
-namespace osu.Game.Localisation.SkinEditorComponents
+namespace osu.Game.Localisation
 {
     public static class SongProgressStrings
     {
diff --git a/osu.Game/Localisation/SkinEditorComponents/TextElementStrings.cs b/osu.Game/Localisation/TextElementStrings.cs
similarity index 94%
rename from osu.Game/Localisation/SkinEditorComponents/TextElementStrings.cs
rename to osu.Game/Localisation/TextElementStrings.cs
index e969da60bf..6257b80d72 100644
--- a/osu.Game/Localisation/SkinEditorComponents/TextElementStrings.cs
+++ b/osu.Game/Localisation/TextElementStrings.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Localisation;
 
-namespace osu.Game.Localisation.SkinEditorComponents
+namespace osu.Game.Localisation
 {
     public static class TextElementStrings
     {
diff --git a/osu.Game/Screens/Play/HUD/ArgonSongProgress.cs b/osu.Game/Screens/Play/HUD/ArgonSongProgress.cs
index 075e5af163..6c5ba52f27 100644
--- a/osu.Game/Screens/Play/HUD/ArgonSongProgress.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonSongProgress.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
-using osu.Game.Localisation.SkinEditorComponents;
+using osu.Game.Localisation;
 using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Screens.Play.HUD
diff --git a/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs b/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs
index 1c051c24ae..fccefd49a4 100644
--- a/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs
@@ -7,7 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
-using osu.Game.Localisation.SkinEditorComponents;
+using osu.Game.Localisation;
 using osu.Game.Rulesets.Objects;
 using osuTK;
 
diff --git a/osu.Game/Screens/Play/HUD/GameplayAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/GameplayAccuracyCounter.cs
index d044b3d98a..3a7c97632d 100644
--- a/osu.Game/Screens/Play/HUD/GameplayAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayAccuracyCounter.cs
@@ -6,7 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Localisation;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Localisation.SkinEditorComponents;
+using osu.Game.Localisation;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Screens.Play.HUD
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index 5d0efe7b77..3507987fe4 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -17,7 +17,7 @@ using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Localisation.SkinEditorComponents;
+using osu.Game.Localisation;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osuTK;
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 28e2006c2f..ac49e9ca5e 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -11,7 +11,7 @@ using osu.Framework.Graphics.Pooling;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
 using osu.Game.Configuration;
-using osu.Game.Localisation.SkinEditorComponents;
+using osu.Game.Localisation;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osuTK;
diff --git a/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounterDisplay.cs b/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounterDisplay.cs
index d047b8e5fb..31b0b9ebc5 100644
--- a/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounterDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounterDisplay.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Localisation;
 using osu.Game.Configuration;
-using osu.Game.Localisation.SkinEditorComponents;
+using osu.Game.Localisation;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 using osuTK;
diff --git a/osu.Game/Skinning/Components/BeatmapAttributeText.cs b/osu.Game/Skinning/Components/BeatmapAttributeText.cs
index d2e724f760..e8b2d547a9 100644
--- a/osu.Game/Skinning/Components/BeatmapAttributeText.cs
+++ b/osu.Game/Skinning/Components/BeatmapAttributeText.cs
@@ -18,7 +18,6 @@ using osu.Game.Configuration;
 using osu.Game.Extensions;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Localisation;
-using osu.Game.Localisation.SkinEditorComponents;
 using osu.Game.Resources.Localisation.Web;
 
 namespace osu.Game.Skinning.Components
diff --git a/osu.Game/Skinning/Components/TextElement.cs b/osu.Game/Skinning/Components/TextElement.cs
index 9adc065b88..c160f3f9d0 100644
--- a/osu.Game/Skinning/Components/TextElement.cs
+++ b/osu.Game/Skinning/Components/TextElement.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Localisation.SkinEditorComponents;
+using osu.Game.Localisation;
 
 namespace osu.Game.Skinning.Components
 {
diff --git a/osu.Game/Skinning/FontAdjustableSkinComponent.cs b/osu.Game/Skinning/FontAdjustableSkinComponent.cs
index 51d4aa9fee..9c28621d48 100644
--- a/osu.Game/Skinning/FontAdjustableSkinComponent.cs
+++ b/osu.Game/Skinning/FontAdjustableSkinComponent.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
-using osu.Game.Localisation.SkinEditorComponents;
+using osu.Game.Localisation;
 
 namespace osu.Game.Skinning
 {
diff --git a/osu.Game/Skinning/SkinnableSprite.cs b/osu.Game/Skinning/SkinnableSprite.cs
index a5ed2a4b64..3deb264bc8 100644
--- a/osu.Game/Skinning/SkinnableSprite.cs
+++ b/osu.Game/Skinning/SkinnableSprite.cs
@@ -12,7 +12,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Localisation.SkinEditorComponents;
+using osu.Game.Localisation;
 using osu.Game.Overlays.Settings;
 using osuTK;