RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert 9cd7f2b and fc1ebfd

This commit is contained in:
schiavoanto 2024-10-14 16:14:23 +02:00
parent 71b08b54c1
commit d7021f989b
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Localisation/SkinEditorStrings.cs
View File

@ -34,16 +34,6 @@ public static class SkinEditorStrings
/// </summary> /// </summary>
public static LocalisableString Gameplay => new TranslatableString(getKey(@"gameplay"), @"Gameplay"); public static LocalisableString Gameplay => new TranslatableString(getKey(@"gameplay"), @"Gameplay");
/// <summary>
/// "HUD"
/// </summary>
public static LocalisableString HUD => new TranslatableString(getKey(@"hud"), @"HUD");
/// <summary>
/// "Playfield"
/// </summary>
public static LocalisableString Playfield => new TranslatableString(getKey(@"playfield"), @"Playfield");
/// <summary> /// <summary>
/// "Settings ({0})" /// "Settings ({0})"
/// </summary> /// </summary>

4
osu.Game/Skinning/GlobalSkinnableContainerLookup.cs
View File

@ -31,9 +31,9 @@ public GlobalSkinnableContainerLookup(GlobalSkinnableContainers lookup, RulesetI
public override string ToString() public override string ToString()
{ {
if (Ruleset == null) return Lookup.GetLocalisableDescription().ToString(); if (Ruleset == null) return Lookup.GetDescription();
return $"{Lookup.GetLocalisableDescription().ToString()} (\"{Ruleset.Name}\" only)"; return $"{Lookup.GetDescription()} (\"{Ruleset.Name}\" only)";
} }
public bool Equals(GlobalSkinnableContainerLookup? other) public bool Equals(GlobalSkinnableContainerLookup? other)

9
osu.Game/Skinning/GlobalSkinnableContainers.cs
View File

@ -1,8 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Localisation; using System.ComponentModel;
using osu.Game.Localisation;
namespace osu.Game.Skinning namespace osu.Game.Skinning
{ {
@ -11,13 +10,13 @@ namespace osu.Game.Skinning
/// </summary> /// </summary>
public enum GlobalSkinnableContainers public enum GlobalSkinnableContainers
{ {
[LocalisableDescription(typeof(SkinEditorStrings), nameof(SkinEditorStrings.HUD))] [Description("HUD")]
MainHUDComponents, MainHUDComponents,
[LocalisableDescription(typeof(SkinEditorStrings), nameof(SkinEditorStrings.SongSelect))] [Description("Song select")]
SongSelect, SongSelect,
[LocalisableDescription(typeof(SkinEditorStrings), nameof(SkinEditorStrings.Playfield))] [Description("Playfield")]
Playfield Playfield
} }
} }