From 1ec6735a3523a24fd185b80c82ad6a1d3d26d922 Mon Sep 17 00:00:00 2001 From: Loreos7 <86934170+Loreos7@users.noreply.github.com> Date: Sat, 18 Oct 2025 19:17:08 +0300 Subject: [PATCH 1/4] Restore original delete button name --- osu.Game/Localisation/SongSelectStrings.cs | 4 ++-- osu.Game/Screens/SelectV2/FooterButtonOptions.Popover.cs | 2 +- osu.Game/Screens/SelectV2/PanelBeatmapSet.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/osu.Game/Localisation/SongSelectStrings.cs b/osu.Game/Localisation/SongSelectStrings.cs index c81cf97f09..5f940f8a56 100644 --- a/osu.Game/Localisation/SongSelectStrings.cs +++ b/osu.Game/Localisation/SongSelectStrings.cs @@ -140,9 +140,9 @@ namespace osu.Game.Localisation public static LocalisableString ClearAllLocalScores => new TranslatableString(getKey(@"clear_all_local_scores"), @"Clear all local scores"); /// - /// "Delete beatmap" + /// "Delete..." /// - public static LocalisableString DeleteBeatmap => new TranslatableString(getKey(@"delete_beatmap"), @"Delete beatmap"); + public static LocalisableString Delete => new TranslatableString(getKey(@"delete"), @"Delete..."); /// /// "Restore all hidden" diff --git a/osu.Game/Screens/SelectV2/FooterButtonOptions.Popover.cs b/osu.Game/Screens/SelectV2/FooterButtonOptions.Popover.cs index 7e71fedfcb..ae06522b30 100644 --- a/osu.Game/Screens/SelectV2/FooterButtonOptions.Popover.cs +++ b/osu.Game/Screens/SelectV2/FooterButtonOptions.Popover.cs @@ -62,7 +62,7 @@ namespace osu.Game.Screens.SelectV2 Debug.Assert(beatmap.BeatmapSet != null); addHeader(SongSelectStrings.ForAllDifficulties, beatmap.BeatmapSet.ToString()); - addButton(SongSelectStrings.DeleteBeatmap, FontAwesome.Solid.Trash, () => SongSelect?.Delete(beatmap.BeatmapSet), colours.Red1); + addButton(SongSelectStrings.Delete, FontAwesome.Solid.Trash, () => SongSelect?.Delete(beatmap.BeatmapSet), colours.Red1); addHeader(SongSelectStrings.ForSelectedDifficulty, beatmap.DifficultyName); diff --git a/osu.Game/Screens/SelectV2/PanelBeatmapSet.cs b/osu.Game/Screens/SelectV2/PanelBeatmapSet.cs index a52d3fa216..cc55286431 100644 --- a/osu.Game/Screens/SelectV2/PanelBeatmapSet.cs +++ b/osu.Game/Screens/SelectV2/PanelBeatmapSet.cs @@ -268,7 +268,7 @@ namespace osu.Game.Screens.SelectV2 if (beatmapSet.Beatmaps.Any(b => b.Hidden)) items.Add(new OsuMenuItem(SongSelectStrings.RestoreAllHidden, MenuItemType.Standard, () => songSelect?.RestoreAllHidden(beatmapSet))); - items.Add(new OsuMenuItem(SongSelectStrings.DeleteBeatmap, MenuItemType.Destructive, () => songSelect?.Delete(beatmapSet))); + items.Add(new OsuMenuItem(SongSelectStrings.Delete, MenuItemType.Destructive, () => songSelect?.Delete(beatmapSet))); return items.ToArray(); } } From 6a6c7ad3ba106f06414f4ce5bba6fb6585ea1aee Mon Sep 17 00:00:00 2001 From: Loreos7 <86934170+Loreos7@users.noreply.github.com> Date: Wed, 5 Nov 2025 15:56:07 +0300 Subject: [PATCH 2/4] Move `Delete...` button to `CommonStrings` --- osu.Game/Localisation/CommonStrings.cs | 5 +++++ osu.Game/Localisation/SongSelectStrings.cs | 5 ----- osu.Game/Screens/SelectV2/FooterButtonOptions.Popover.cs | 2 +- osu.Game/Screens/SelectV2/PanelBeatmapSet.cs | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/osu.Game/Localisation/CommonStrings.cs b/osu.Game/Localisation/CommonStrings.cs index c8630f9332..324cb424b5 100644 --- a/osu.Game/Localisation/CommonStrings.cs +++ b/osu.Game/Localisation/CommonStrings.cs @@ -199,6 +199,11 @@ namespace osu.Game.Localisation /// public static LocalisableString Mapper => new TranslatableString(getKey(@"mapper"), @"Mapper"); + /// + /// "Delete..." + /// + public static LocalisableString Delete => new TranslatableString(getKey(@"delete"), @"Delete..."); + private static string getKey(string key) => $@"{prefix}:{key}"; } } diff --git a/osu.Game/Localisation/SongSelectStrings.cs b/osu.Game/Localisation/SongSelectStrings.cs index 5f940f8a56..c20715fb4c 100644 --- a/osu.Game/Localisation/SongSelectStrings.cs +++ b/osu.Game/Localisation/SongSelectStrings.cs @@ -139,11 +139,6 @@ namespace osu.Game.Localisation /// public static LocalisableString ClearAllLocalScores => new TranslatableString(getKey(@"clear_all_local_scores"), @"Clear all local scores"); - /// - /// "Delete..." - /// - public static LocalisableString Delete => new TranslatableString(getKey(@"delete"), @"Delete..."); - /// /// "Restore all hidden" /// diff --git a/osu.Game/Screens/SelectV2/FooterButtonOptions.Popover.cs b/osu.Game/Screens/SelectV2/FooterButtonOptions.Popover.cs index ae06522b30..c93afe24a5 100644 --- a/osu.Game/Screens/SelectV2/FooterButtonOptions.Popover.cs +++ b/osu.Game/Screens/SelectV2/FooterButtonOptions.Popover.cs @@ -62,7 +62,7 @@ namespace osu.Game.Screens.SelectV2 Debug.Assert(beatmap.BeatmapSet != null); addHeader(SongSelectStrings.ForAllDifficulties, beatmap.BeatmapSet.ToString()); - addButton(SongSelectStrings.Delete, FontAwesome.Solid.Trash, () => SongSelect?.Delete(beatmap.BeatmapSet), colours.Red1); + addButton(CommonStrings.Delete, FontAwesome.Solid.Trash, () => SongSelect?.Delete(beatmap.BeatmapSet), colours.Red1); addHeader(SongSelectStrings.ForSelectedDifficulty, beatmap.DifficultyName); diff --git a/osu.Game/Screens/SelectV2/PanelBeatmapSet.cs b/osu.Game/Screens/SelectV2/PanelBeatmapSet.cs index cc55286431..3046155a5e 100644 --- a/osu.Game/Screens/SelectV2/PanelBeatmapSet.cs +++ b/osu.Game/Screens/SelectV2/PanelBeatmapSet.cs @@ -268,7 +268,7 @@ namespace osu.Game.Screens.SelectV2 if (beatmapSet.Beatmaps.Any(b => b.Hidden)) items.Add(new OsuMenuItem(SongSelectStrings.RestoreAllHidden, MenuItemType.Standard, () => songSelect?.RestoreAllHidden(beatmapSet))); - items.Add(new OsuMenuItem(SongSelectStrings.Delete, MenuItemType.Destructive, () => songSelect?.Delete(beatmapSet))); + items.Add(new OsuMenuItem(CommonStrings.Delete, MenuItemType.Destructive, () => songSelect?.Delete(beatmapSet))); return items.ToArray(); } } From 1df640898fe2a43c9e2ce5956ea1e27ee7685d9d Mon Sep 17 00:00:00 2001 From: Loreos7 <86934170+Loreos7@users.noreply.github.com> Date: Sun, 9 Nov 2025 17:48:19 +0300 Subject: [PATCH 3/4] Use proper string key --- osu.Game/Localisation/CommonStrings.cs | 2 +- osu.Game/Screens/SelectV2/FooterButtonOptions.Popover.cs | 2 +- osu.Game/Screens/SelectV2/PanelBeatmapSet.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osu.Game/Localisation/CommonStrings.cs b/osu.Game/Localisation/CommonStrings.cs index 324cb424b5..22fc2bb242 100644 --- a/osu.Game/Localisation/CommonStrings.cs +++ b/osu.Game/Localisation/CommonStrings.cs @@ -202,7 +202,7 @@ namespace osu.Game.Localisation /// /// "Delete..." /// - public static LocalisableString Delete => new TranslatableString(getKey(@"delete"), @"Delete..."); + public static LocalisableString DeleteEllipsis => new TranslatableString(getKey(@"delete_ellipsis"), @"Delete..."); private static string getKey(string key) => $@"{prefix}:{key}"; } diff --git a/osu.Game/Screens/SelectV2/FooterButtonOptions.Popover.cs b/osu.Game/Screens/SelectV2/FooterButtonOptions.Popover.cs index c93afe24a5..afbe2450d6 100644 --- a/osu.Game/Screens/SelectV2/FooterButtonOptions.Popover.cs +++ b/osu.Game/Screens/SelectV2/FooterButtonOptions.Popover.cs @@ -62,7 +62,7 @@ namespace osu.Game.Screens.SelectV2 Debug.Assert(beatmap.BeatmapSet != null); addHeader(SongSelectStrings.ForAllDifficulties, beatmap.BeatmapSet.ToString()); - addButton(CommonStrings.Delete, FontAwesome.Solid.Trash, () => SongSelect?.Delete(beatmap.BeatmapSet), colours.Red1); + addButton(CommonStrings.DeleteEllipsis, FontAwesome.Solid.Trash, () => SongSelect?.Delete(beatmap.BeatmapSet), colours.Red1); addHeader(SongSelectStrings.ForSelectedDifficulty, beatmap.DifficultyName); diff --git a/osu.Game/Screens/SelectV2/PanelBeatmapSet.cs b/osu.Game/Screens/SelectV2/PanelBeatmapSet.cs index 3046155a5e..71da530e18 100644 --- a/osu.Game/Screens/SelectV2/PanelBeatmapSet.cs +++ b/osu.Game/Screens/SelectV2/PanelBeatmapSet.cs @@ -268,7 +268,7 @@ namespace osu.Game.Screens.SelectV2 if (beatmapSet.Beatmaps.Any(b => b.Hidden)) items.Add(new OsuMenuItem(SongSelectStrings.RestoreAllHidden, MenuItemType.Standard, () => songSelect?.RestoreAllHidden(beatmapSet))); - items.Add(new OsuMenuItem(CommonStrings.Delete, MenuItemType.Destructive, () => songSelect?.Delete(beatmapSet))); + items.Add(new OsuMenuItem(CommonStrings.DeleteEllipsis, MenuItemType.Destructive, () => songSelect?.Delete(beatmapSet))); return items.ToArray(); } } From 98e7a10e1e7b2514a64c7a423c44c96fd60d3320 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 21 Nov 2025 17:13:44 +0900 Subject: [PATCH 4/4] Rename localised string --- osu.Game/Localisation/CommonStrings.cs | 2 +- osu.Game/Screens/SelectV2/FooterButtonOptions.Popover.cs | 2 +- osu.Game/Screens/SelectV2/PanelBeatmapSet.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osu.Game/Localisation/CommonStrings.cs b/osu.Game/Localisation/CommonStrings.cs index 22fc2bb242..d72257f438 100644 --- a/osu.Game/Localisation/CommonStrings.cs +++ b/osu.Game/Localisation/CommonStrings.cs @@ -202,7 +202,7 @@ namespace osu.Game.Localisation /// /// "Delete..." /// - public static LocalisableString DeleteEllipsis => new TranslatableString(getKey(@"delete_ellipsis"), @"Delete..."); + public static LocalisableString DeleteWithConfirmation => new TranslatableString(getKey(@"delete_with_confrmation"), @"Delete..."); private static string getKey(string key) => $@"{prefix}:{key}"; } diff --git a/osu.Game/Screens/SelectV2/FooterButtonOptions.Popover.cs b/osu.Game/Screens/SelectV2/FooterButtonOptions.Popover.cs index afbe2450d6..2f0f36c99c 100644 --- a/osu.Game/Screens/SelectV2/FooterButtonOptions.Popover.cs +++ b/osu.Game/Screens/SelectV2/FooterButtonOptions.Popover.cs @@ -62,7 +62,7 @@ namespace osu.Game.Screens.SelectV2 Debug.Assert(beatmap.BeatmapSet != null); addHeader(SongSelectStrings.ForAllDifficulties, beatmap.BeatmapSet.ToString()); - addButton(CommonStrings.DeleteEllipsis, FontAwesome.Solid.Trash, () => SongSelect?.Delete(beatmap.BeatmapSet), colours.Red1); + addButton(CommonStrings.DeleteWithConfirmation, FontAwesome.Solid.Trash, () => SongSelect?.Delete(beatmap.BeatmapSet), colours.Red1); addHeader(SongSelectStrings.ForSelectedDifficulty, beatmap.DifficultyName); diff --git a/osu.Game/Screens/SelectV2/PanelBeatmapSet.cs b/osu.Game/Screens/SelectV2/PanelBeatmapSet.cs index f8459bfedb..befdba1b2b 100644 --- a/osu.Game/Screens/SelectV2/PanelBeatmapSet.cs +++ b/osu.Game/Screens/SelectV2/PanelBeatmapSet.cs @@ -273,7 +273,7 @@ namespace osu.Game.Screens.SelectV2 if (beatmapSet.Beatmaps.Any(b => b.Hidden)) items.Add(new OsuMenuItem(SongSelectStrings.RestoreAllHidden, MenuItemType.Standard, () => songSelect?.RestoreAllHidden(beatmapSet))); - items.Add(new OsuMenuItem(CommonStrings.DeleteEllipsis, MenuItemType.Destructive, () => songSelect?.Delete(beatmapSet))); + items.Add(new OsuMenuItem(CommonStrings.DeleteWithConfirmation, MenuItemType.Destructive, () => songSelect?.Delete(beatmapSet))); return items.ToArray(); } }