sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-06 16:13:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17090 from miniriley2012/wiki-locale-fix

Browse Source 
Fix wiki links containing locale not loading when opened from chat.
This commit is contained in:
Dean Herbert
2022-03-04 19:36:14 +09:00
committed by GitHub
parent d584f67140 3fdc7ed9d2
commit 6673e456c5
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Online/API/Requests/GetWikiRequest.cs
View File

@ -1,6 +1,8 @@
// 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.Game.Extensions;
using osu.Game.Localisation;
using osu.Game.Online.API.Requests.Responses; using osu.Game.Online.API.Requests.Responses;
namespace osu.Game.Online.API.Requests namespace osu.Game.Online.API.Requests
@ -8,14 +10,14 @@ namespace osu.Game.Online.API.Requests
public class GetWikiRequest : APIRequest<APIWikiPage> public class GetWikiRequest : APIRequest<APIWikiPage>
{ {
private readonly string path; private readonly string path;
private readonly string locale; private readonly Language language;
public GetWikiRequest(string path, string locale = "en") public GetWikiRequest(string path, Language language = Language.en)
{ {
this.path = path; this.path = path;
this.locale = locale; this.language = language;
} }
protected override string Target => $"wiki/{locale}/{path}"; protected override string Target => $"wiki/{language.ToCultureCode()}/{path}";
} }
} }

8
osu.Game/Overlays/WikiOverlay.cs
View File

@ -7,6 +7,7 @@ using System.Threading;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Extensions;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Online.API.Requests; using osu.Game.Online.API.Requests;
using osu.Game.Online.API.Requests.Responses; using osu.Game.Online.API.Requests.Responses;
@ -100,7 +101,12 @@ namespace osu.Game.Overlays
cancellationToken?.Cancel(); cancellationToken?.Cancel();
request?.Cancel(); request?.Cancel();
request = new GetWikiRequest(e.NewValue); string[] values = e.NewValue.Split('/', 2);
if (values.Length > 1 && LanguageExtensions.TryParseCultureCode(values[0], out var language))
request = new GetWikiRequest(values[1], language);
else
request = new GetWikiRequest(e.NewValue);
Loading.Show(); Loading.Show();