Merge pull request #2282 from andy840119/rename-from-language-to-tran…

…slation Rename from "language" to "translation" in some classes.
karaoke-dev · Sep 13, 2024 · cddba45 · cddba45
2 parents d17803d + 7c94f24
commit cddba45
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
diff --git a/...maps/BeatmapLanguagesChangeHandlerTest.cs → ...s/BeatmapTranslationsChangeHandlerTest.cs b/...maps/BeatmapLanguagesChangeHandlerTest.cs → ...s/BeatmapTranslationsChangeHandlerTest.cs
@@ -11,7 +11,7 @@
 
 namespace osu.Game.Rulesets.Karaoke.Tests.Editor.ChangeHandlers.Beatmaps;
 
-public partial class BeatmapLanguagesChangeHandlerTest : BaseChangeHandlerTest<BeatmapLanguagesChangeHandler>
+public partial class BeatmapTranslationsChangeHandlerTest : BaseChangeHandlerTest<BeatmapTranslationsChangeHandler>
 {
     [Test]
     public void TestAdd()

diff --git a/...Beatmaps/BeatmapLanguagesChangeHandler.cs → ...tmaps/BeatmapTranslationsChangeHandler.cs b/...Beatmaps/BeatmapLanguagesChangeHandler.cs → ...tmaps/BeatmapTranslationsChangeHandler.cs
@@ -9,7 +9,7 @@
 
 namespace osu.Game.Rulesets.Karaoke.Edit.ChangeHandlers.Beatmaps;
 
-public partial class BeatmapLanguagesChangeHandler : BeatmapListPropertyChangeHandler<CultureInfo>, IBeatmapLanguagesChangeHandler
+public partial class BeatmapTranslationsChangeHandler : BeatmapListPropertyChangeHandler<CultureInfo>, IBeatmapTranslationsChangeHandler
 {
     public IBindableList<CultureInfo> Languages => Items;
 

diff --git a/...eatmaps/IBeatmapLanguagesChangeHandler.cs → ...maps/IBeatmapTranslationsChangeHandler.cs b/...eatmaps/IBeatmapLanguagesChangeHandler.cs → ...maps/IBeatmapTranslationsChangeHandler.cs
@@ -6,7 +6,7 @@
 
 namespace osu.Game.Rulesets.Karaoke.Edit.ChangeHandlers.Beatmaps;
 
-public interface IBeatmapLanguagesChangeHandler
+public interface IBeatmapTranslationsChangeHandler
 {
     IBindableList<CultureInfo> Languages { get; }
 

diff --git a/...ons/Components/CreateNewLanguageButton.cs → .../Components/CreateNewTranslationButton.cs b/...ons/Components/CreateNewLanguageButton.cs → .../Components/CreateNewTranslationButton.cs
@@ -15,14 +15,14 @@
 
 namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Translations.Components;
 
-public partial class CreateNewLanguageButton : IconButton, IHasPopover
+public partial class CreateNewTranslationButton : IconButton, IHasPopover
 {
     [Resolved]
-    private IBeatmapLanguagesChangeHandler beatmapLanguagesChangeHandler { get; set; } = null!;
+    private IBeatmapTranslationsChangeHandler beatmapTranslationsChangeHandler { get; set; } = null!;
 
     private readonly Bindable<CultureInfo?> currentLanguage = new();
 
-    public CreateNewLanguageButton()
+    public CreateNewTranslationButton()
     {
         Icon = FontAwesome.Solid.Plus;
         Action = this.ShowPopover;
@@ -33,9 +33,9 @@ public CreateNewLanguageButton()
             if (newLanguage == null)
                 return;
 
-            if (!beatmapLanguagesChangeHandler.Languages.Contains(newLanguage))
+            if (!beatmapTranslationsChangeHandler.Languages.Contains(newLanguage))
             {
-                beatmapLanguagesChangeHandler.Add(newLanguage);
+                beatmapTranslationsChangeHandler.Add(newLanguage);
             }
 
             // after selected the language, should always hide the popover.

diff --git a/...ations/Components/RemoveLanguageButton.cs → ...ons/Components/RemoveTranslationButton.cs b/...ations/Components/RemoveLanguageButton.cs → ...ons/Components/RemoveTranslationButton.cs
@@ -11,33 +11,33 @@
 
 namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Translations.Components;
 
-public partial class RemoveLanguageButton : IconButton
+public partial class RemoveTranslationButton : IconButton
 {
     [Resolved]
-    private IBeatmapLanguagesChangeHandler beatmapLanguagesChangeHandler { get; set; } = null!;
+    private IBeatmapTranslationsChangeHandler beatmapTranslationsChangeHandler { get; set; } = null!;
 
     [Resolved]
     private IDialogOverlay dialogOverlay { get; set; } = null!;
 
     [Resolved]
     private IBindable<CultureInfo> currentLanguage { get; set; } = null!;
 
-    public RemoveLanguageButton()
+    public RemoveTranslationButton()
     {
         Icon = FontAwesome.Solid.Trash;
         Action = () =>
         {
-            if (beatmapLanguagesChangeHandler.IsLanguageContainsTranslation(currentLanguage.Value))
+            if (beatmapTranslationsChangeHandler.IsLanguageContainsTranslation(currentLanguage.Value))
             {
                 dialogOverlay.Push(new DeleteLanguagePopupDialog(currentLanguage.Value, isOk =>
                 {
                     if (isOk)
-                        beatmapLanguagesChangeHandler.Remove(currentLanguage.Value);
+                        beatmapTranslationsChangeHandler.Remove(currentLanguage.Value);
                 }));
             }
             else
             {
-                beatmapLanguagesChangeHandler.Remove(currentLanguage.Value);
+                beatmapTranslationsChangeHandler.Remove(currentLanguage.Value);
             }
         };
     }

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Translations/TranslationEditSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Translations/TranslationEditSection.cs
@@ -35,7 +35,7 @@ public partial class TranslationEditSection : Container, ITranslationInfoProvide
     private readonly Bindable<CultureInfo?> currentLanguage = new();
 
     [Resolved]
-    private IBeatmapLanguagesChangeHandler beatmapLanguagesChangeHandler { get; set; } = null!;
+    private IBeatmapTranslationsChangeHandler beatmapTranslationsChangeHandler { get; set; } = null!;
 
     private readonly IBindableList<Lyric> bindableLyrics = new BindableList<Lyric>();
 
@@ -102,12 +102,12 @@ public TranslationEditSection()
                                             RelativeSizeAxes = Axes.X,
                                         },
                                         Empty(),
-                                        new CreateNewLanguageButton
+                                        new CreateNewTranslationButton
                                         {
                                             Y = 5,
                                         },
                                         Empty(),
-                                        new RemoveLanguageButton
+                                        new RemoveTranslationButton
                                         {
                                             Y = 5,
                                         },
@@ -190,7 +190,7 @@ public TranslationEditSection()
     [BackgroundDependencyLoader]
     private void load(ILyricsProvider lyricsProvider, OverlayColourProvider colourProvider)
     {
-        languageDropdown.ItemSource = beatmapLanguagesChangeHandler.Languages;
+        languageDropdown.ItemSource = beatmapTranslationsChangeHandler.Languages;
 
         bindableLyrics.BindTo(lyricsProvider.BindableLyrics);
 

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Translations/TranslationScreen.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Translations/TranslationScreen.cs
@@ -14,16 +14,16 @@ namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Translations;
 
 public partial class TranslationScreen : BeatmapEditorRoundedScreen
 {
-    [Cached(typeof(IBeatmapLanguagesChangeHandler))]
-    private readonly BeatmapLanguagesChangeHandler beatmapLanguagesChangeHandler;
+    [Cached(typeof(IBeatmapTranslationsChangeHandler))]
+    private readonly BeatmapTranslationsChangeHandler beatmapTranslationsChangeHandler;
 
     [Cached(typeof(ILyricTranslationChangeHandler))]
     private readonly LyricTranslationChangeHandler lyricTranslationChangeHandler;
 
     public TranslationScreen()
         : base(KaraokeBeatmapEditorScreenMode.Translation)
     {
-        AddInternal(beatmapLanguagesChangeHandler = new BeatmapLanguagesChangeHandler());
+        AddInternal(beatmapTranslationsChangeHandler = new BeatmapTranslationsChangeHandler());
         AddInternal(lyricTranslationChangeHandler = new LyricTranslationChangeHandler());
     }