mirror of
https://github.com/ppy/osu.git
synced 2024-12-16 15:02:55 +08:00
Merge pull request #29913 from Joehuu/fix-romanised-searching
Fix searching by clicking title/artist in beatmap overlay not following original language setting
This commit is contained in:
commit
a358731af5
@ -10,7 +10,7 @@
|
|||||||
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
|
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="ppy.osu.Framework.Android" Version="2024.916.0" />
|
<PackageReference Include="ppy.osu.Framework.Android" Version="2024.927.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Fody does not handle Android build well, and warns when unchanged.
|
<!-- Fody does not handle Android build well, and warns when unchanged.
|
||||||
|
@ -445,10 +445,11 @@ namespace osu.Game
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case LinkAction.SearchBeatmapSet:
|
case LinkAction.SearchBeatmapSet:
|
||||||
if (link.Argument is RomanisableString romanisable)
|
if (link.Argument is LocalisableString localisable)
|
||||||
SearchBeatmapSet(romanisable.GetPreferred(Localisation.CurrentParameters.Value.PreferOriginalScript));
|
SearchBeatmapSet(Localisation.GetLocalisedString(localisable));
|
||||||
else
|
else
|
||||||
SearchBeatmapSet(argString);
|
SearchBeatmapSet(argString);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case LinkAction.FilterBeatmapSetGenre:
|
case LinkAction.FilterBeatmapSetGenre:
|
||||||
|
@ -242,7 +242,7 @@ namespace osu.Game.Overlays.BeatmapSet
|
|||||||
title.Clear();
|
title.Clear();
|
||||||
artist.Clear();
|
artist.Clear();
|
||||||
|
|
||||||
title.AddLink(titleText, LinkAction.SearchBeatmapSet, $@"title=""""{titleText}""""");
|
title.AddLink(titleText, LinkAction.SearchBeatmapSet, LocalisableString.Interpolate($@"title=""""{titleText}"""""));
|
||||||
|
|
||||||
title.AddArbitraryDrawable(Empty().With(d => d.Width = 5));
|
title.AddArbitraryDrawable(Empty().With(d => d.Width = 5));
|
||||||
title.AddArbitraryDrawable(externalLink = new ExternalLinkButton());
|
title.AddArbitraryDrawable(externalLink = new ExternalLinkButton());
|
||||||
@ -259,7 +259,7 @@ namespace osu.Game.Overlays.BeatmapSet
|
|||||||
title.AddArbitraryDrawable(new SpotlightBeatmapBadge());
|
title.AddArbitraryDrawable(new SpotlightBeatmapBadge());
|
||||||
}
|
}
|
||||||
|
|
||||||
artist.AddLink(artistText, LinkAction.SearchBeatmapSet, $@"artist=""""{artistText}""""");
|
artist.AddLink(artistText, LinkAction.SearchBeatmapSet, LocalisableString.Interpolate($@"artist=""""{artistText}"""""));
|
||||||
|
|
||||||
if (setInfo.NewValue.TrackId != null)
|
if (setInfo.NewValue.TrackId != null)
|
||||||
{
|
{
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Realm" Version="11.5.0" />
|
<PackageReference Include="Realm" Version="11.5.0" />
|
||||||
<PackageReference Include="ppy.osu.Framework" Version="2024.916.0" />
|
<PackageReference Include="ppy.osu.Framework" Version="2024.927.0" />
|
||||||
<PackageReference Include="ppy.osu.Game.Resources" Version="2024.904.0" />
|
<PackageReference Include="ppy.osu.Game.Resources" Version="2024.904.0" />
|
||||||
<PackageReference Include="Sentry" Version="4.3.0" />
|
<PackageReference Include="Sentry" Version="4.3.0" />
|
||||||
<!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
|
<!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
|
||||||
|
@ -17,6 +17,6 @@
|
|||||||
<MtouchInterpreter>-all</MtouchInterpreter>
|
<MtouchInterpreter>-all</MtouchInterpreter>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="ppy.osu.Framework.iOS" Version="2024.916.0" />
|
<PackageReference Include="ppy.osu.Framework.iOS" Version="2024.927.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
Loading…
Reference in New Issue
Block a user