h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 11:37:28 +08:00
Code Issues Releases Wiki Activity

Revert localisation for GetDisplayNameForHitResult

Browse Source 
Came across an issue where `LeaderboardScoreTooltip` attempts to capitalize all letters for the `displayName`.

Unsure if I should completely ignore it and localise it anyway.
This commit is contained in:
naoei 2022-08-10 16:03:59 -04:00
parent 60dae70a18
commit 1e356f6137
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Rulesets/Ruleset.cs
View File

@ -28,7 +28,6 @@ using osu.Game.Users;
using JetBrains.Annotations;
using osu.Framework.Extensions;
using osu.Framework.Extensions.EnumExtensions;
using osu.Framework.Localisation;
using osu.Framework.Testing;
using osu.Game.Extensions;
using osu.Game.Rulesets.Filter;
@ -314,7 +313,7 @@ namespace osu.Game.Rulesets
/// <returns>
/// All valid <see cref="HitResult"/>s along with a display-friendly name.
/// </returns>
public IEnumerable<(HitResult result, LocalisableString displayName)> GetHitResults()
public IEnumerable<(HitResult result, string displayName)> GetHitResults()
{
var validResults = GetValidHitResults();
@ -352,7 +351,7 @@ namespace osu.Game.Rulesets
/// </summary>
/// <param name="result">The result type to get the name for.</param>
/// <returns>The display name.</returns>
public virtual LocalisableString GetDisplayNameForHitResult(HitResult result) => result.GetLocalisableDescription();
public virtual string GetDisplayNameForHitResult(HitResult result) => result.GetDescription();
/// <summary>
/// Creates ruleset-specific beatmap filter criteria to be used on the song select screen.

5
osu.Game/Scoring/HitResultDisplayStatistic.cs
View File

@ -3,7 +3,6 @@
#nullable disable
using osu.Framework.Localisation;
using osu.Game.Rulesets.Scoring;
namespace osu.Game.Scoring
@ -31,9 +30,9 @@ namespace osu.Game.Scoring
/// <summary>
/// A custom display name for the result type. May be provided by rulesets to give better clarity.
/// </summary>
public LocalisableString DisplayName { get; }
public string DisplayName { get; }
public HitResultDisplayStatistic(HitResult result, int count, int? maxCount, LocalisableString displayName)
public HitResultDisplayStatistic(HitResult result, int count, int? maxCount, string displayName)
{
Result = result;
Count = count;