mirror of
https://github.com/ppy/osu.git
synced 2025-01-14 00:42:55 +08:00
Merge pull request #13756 from PercyDan54/playlist-empty-romanised
Fix playlist item displays empty string if no unicode title is present
This commit is contained in:
commit
6b76c54aee
@ -0,0 +1,41 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
using NUnit.Framework;
|
||||||
|
using osu.Game.Beatmaps;
|
||||||
|
|
||||||
|
namespace osu.Game.Tests.Localisation
|
||||||
|
{
|
||||||
|
[TestFixture]
|
||||||
|
public class BeatmapMetadataRomanisationTest
|
||||||
|
{
|
||||||
|
[Test]
|
||||||
|
public void TestRomanisation()
|
||||||
|
{
|
||||||
|
var metadata = new BeatmapMetadata
|
||||||
|
{
|
||||||
|
Artist = "Romanised Artist",
|
||||||
|
ArtistUnicode = "Unicode Artist",
|
||||||
|
Title = "Romanised title",
|
||||||
|
TitleUnicode = "Unicode Title"
|
||||||
|
};
|
||||||
|
var romanisableString = metadata.ToRomanisableString();
|
||||||
|
|
||||||
|
Assert.AreEqual(metadata.ToString(), romanisableString.Romanised);
|
||||||
|
Assert.AreEqual($"{metadata.ArtistUnicode} - {metadata.TitleUnicode}", romanisableString.Original);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void TestRomanisationNoUnicode()
|
||||||
|
{
|
||||||
|
var metadata = new BeatmapMetadata
|
||||||
|
{
|
||||||
|
Artist = "Romanised Artist",
|
||||||
|
Title = "Romanised title"
|
||||||
|
};
|
||||||
|
var romanisableString = metadata.ToRomanisableString();
|
||||||
|
|
||||||
|
Assert.AreEqual(romanisableString.Romanised, romanisableString.Original);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -94,7 +94,10 @@ namespace osu.Game.Beatmaps
|
|||||||
public RomanisableString ToRomanisableString()
|
public RomanisableString ToRomanisableString()
|
||||||
{
|
{
|
||||||
string author = Author == null ? string.Empty : $"({Author})";
|
string author = Author == null ? string.Empty : $"({Author})";
|
||||||
return new RomanisableString($"{ArtistUnicode} - {TitleUnicode} {author}".Trim(), $"{Artist} - {Title} {author}".Trim());
|
var artistUnicode = string.IsNullOrEmpty(ArtistUnicode) ? Artist : ArtistUnicode;
|
||||||
|
var titleUnicode = string.IsNullOrEmpty(TitleUnicode) ? Title : TitleUnicode;
|
||||||
|
|
||||||
|
return new RomanisableString($"{artistUnicode} - {titleUnicode} {author}".Trim(), $"{Artist} - {Title} {author}".Trim());
|
||||||
}
|
}
|
||||||
|
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
|
Loading…
Reference in New Issue
Block a user