From e183e6bb887d10d42b3ce65631f7b8a4a397fedd Mon Sep 17 00:00:00 2001 From: Denis Titovets Date: Tue, 19 Aug 2025 19:02:13 +0300 Subject: [PATCH] Make edits based on reviews --- .../UI/ReplayAnalysisSettings.cs | 2 +- osu.Game/Localisation/CommonStrings.cs | 5 +++ osu.Game/Localisation/PlayerLoaderStrings.cs | 30 -------------- .../Localisation/PlayerSettingsStrings.cs | 39 +++++++++++++++++++ .../Screens/Play/BeatmapMetadataDisplay.cs | 4 +- .../Play/PlayerSettings/AudioSettings.cs | 2 +- .../Play/PlayerSettings/InputSettings.cs | 2 +- .../Play/PlayerSettings/PlaybackSettings.cs | 2 +- .../Play/PlayerSettings/VisualSettings.cs | 2 +- 9 files changed, 51 insertions(+), 37 deletions(-) create mode 100644 osu.Game/Localisation/PlayerSettingsStrings.cs diff --git a/osu.Game.Rulesets.Osu/UI/ReplayAnalysisSettings.cs b/osu.Game.Rulesets.Osu/UI/ReplayAnalysisSettings.cs index 69afae4f57..7dc540f430 100644 --- a/osu.Game.Rulesets.Osu/UI/ReplayAnalysisSettings.cs +++ b/osu.Game.Rulesets.Osu/UI/ReplayAnalysisSettings.cs @@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.UI }; public ReplayAnalysisSettings(OsuRulesetConfigManager config) - : base(PlayerLoaderStrings.AnalysisSettingsTitle) + : base(PlayerSettingsStrings.AnalysisSettingsTitle) { this.config = config; } diff --git a/osu.Game/Localisation/CommonStrings.cs b/osu.Game/Localisation/CommonStrings.cs index 9009785f1c..b0ab4b2989 100644 --- a/osu.Game/Localisation/CommonStrings.cs +++ b/osu.Game/Localisation/CommonStrings.cs @@ -194,6 +194,11 @@ namespace osu.Game.Localisation /// public static LocalisableString Details => new TranslatableString(getKey(@"details"), @"Details..."); + /// + /// "Creator" + /// + public static LocalisableString Creator => new TranslatableString(getKey(@"creator"), @"Creator"); + private static string getKey(string key) => $@"{prefix}:{key}"; } } diff --git a/osu.Game/Localisation/PlayerLoaderStrings.cs b/osu.Game/Localisation/PlayerLoaderStrings.cs index aa2f9e4b7e..f9d6f80676 100644 --- a/osu.Game/Localisation/PlayerLoaderStrings.cs +++ b/osu.Game/Localisation/PlayerLoaderStrings.cs @@ -43,36 +43,6 @@ Leaderboards may be reset."); public static LocalisableString QualifiedBeatmapDisclaimerContent => new TranslatableString(getKey(@"qualified_beatmap_disclaimer_content"), @"No performance points will be awarded. Leaderboards will be reset when the beatmap is ranked."); - /// - /// "Mapper" - /// - public static LocalisableString ShowInfoMapper => new TranslatableString(getKey(@"show_info_mapper"), @"Mapper"); - - /// - /// "Playback" - /// - public static LocalisableString PlaybackTitle => new TranslatableString(getKey(@"playback_title"), @"Playback"); - - /// - /// "Visual Settings" - /// - public static LocalisableString VisualSettingsTitle => new TranslatableString(getKey(@"visual_settings_title"), @"Visual Settings"); - - /// - /// "Audio Settings" - /// - public static LocalisableString AudioSettingsTitle => new TranslatableString(getKey(@"audio_settings_title"), @"Audio Settings"); - - /// - /// "Input Settings" - /// - public static LocalisableString InputSettingsTitle => new TranslatableString(getKey(@"input_settings_title"), @"Input Settings"); - - /// - /// "Analysis Settings" - /// - public static LocalisableString AnalysisSettingsTitle => new TranslatableString(getKey(@"analysis_settings_title"), @"Analysis Settings"); - private static string getKey(string key) => $@"{prefix}:{key}"; } } diff --git a/osu.Game/Localisation/PlayerSettingsStrings.cs b/osu.Game/Localisation/PlayerSettingsStrings.cs new file mode 100644 index 0000000000..79292e1985 --- /dev/null +++ b/osu.Game/Localisation/PlayerSettingsStrings.cs @@ -0,0 +1,39 @@ +// Copyright (c) ppy Pty Ltd . 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 class PlayerSettingsStrings + { + private const string prefix = @"osu.Game.Resources.Localisation.PlayerSettings"; + + /// + /// "Playback" + /// + public static LocalisableString PlaybackTitle => new TranslatableString(getKey(@"playback_title"), @"Playback"); + + /// + /// "Visual Settings" + /// + public static LocalisableString VisualSettingsTitle => new TranslatableString(getKey(@"visual_settings_title"), @"Visual Settings"); + + /// + /// "Audio Settings" + /// + public static LocalisableString AudioSettingsTitle => new TranslatableString(getKey(@"audio_settings_title"), @"Audio Settings"); + + /// + /// "Input Settings" + /// + public static LocalisableString InputSettingsTitle => new TranslatableString(getKey(@"input_settings_title"), @"Input Settings"); + + /// + /// "Analysis Settings" + /// + public static LocalisableString AnalysisSettingsTitle => new TranslatableString(getKey(@"analysis_settings_title"), @"Analysis Settings"); + + private static string getKey(string key) => $@"{prefix}:{key}"; + } +} diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs index b9f0c0aba1..cf85a043ff 100644 --- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs +++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs @@ -15,11 +15,11 @@ using osu.Game.Beatmaps.Drawables; using osu.Game.Graphics; using osu.Game.Graphics.Sprites; using osu.Game.Graphics.UserInterface; -using osu.Game.Localisation; using osu.Game.Resources.Localisation.Web; using osu.Game.Rulesets.Mods; using osu.Game.Screens.Play.HUD; using osuTK; +using CommonStrings = osu.Game.Localisation.CommonStrings; namespace osu.Game.Screens.Play { @@ -166,7 +166,7 @@ namespace osu.Game.Screens.Play }, new Drawable[] { - new MetadataLineLabel(PlayerLoaderStrings.ShowInfoMapper), + new MetadataLineLabel(CommonStrings.Creator), new MetadataLineInfo(metadata.Author.Username) } } diff --git a/osu.Game/Screens/Play/PlayerSettings/AudioSettings.cs b/osu.Game/Screens/Play/PlayerSettings/AudioSettings.cs index 66a980e270..f3ed2eb080 100644 --- a/osu.Game/Screens/Play/PlayerSettings/AudioSettings.cs +++ b/osu.Game/Screens/Play/PlayerSettings/AudioSettings.cs @@ -19,7 +19,7 @@ namespace osu.Game.Screens.Play.PlayerSettings private readonly PlayerCheckbox beatmapHitsoundsToggle; public AudioSettings() - : base(PlayerLoaderStrings.AudioSettingsTitle) + : base(PlayerSettingsStrings.AudioSettingsTitle) { Children = new Drawable[] { diff --git a/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs b/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs index 3243e60c58..86419958cc 100644 --- a/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs +++ b/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs @@ -12,7 +12,7 @@ namespace osu.Game.Screens.Play.PlayerSettings public partial class InputSettings : PlayerSettingsGroup { public InputSettings() - : base(PlayerLoaderStrings.InputSettingsTitle) + : base(PlayerSettingsStrings.InputSettingsTitle) { } diff --git a/osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs b/osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs index de69a6f3c1..3b083aba86 100644 --- a/osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs +++ b/osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs @@ -41,7 +41,7 @@ namespace osu.Game.Screens.Play.PlayerSettings private IconButton pausePlay = null!; public PlaybackSettings() - : base(PlayerLoaderStrings.PlaybackTitle) + : base(PlayerSettingsStrings.PlaybackTitle) { } diff --git a/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs b/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs index c7cf25d23a..3c9af92852 100644 --- a/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs +++ b/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs @@ -18,7 +18,7 @@ namespace osu.Game.Screens.Play.PlayerSettings private readonly PlayerCheckbox beatmapColorsToggle; public VisualSettings() - : base(PlayerLoaderStrings.VisualSettingsTitle) + : base(PlayerSettingsStrings.VisualSettingsTitle) { Children = new Drawable[] {