From 81a49057ec7e1fa089d40b103f55fbc2ae5c7f8f Mon Sep 17 00:00:00 2001
From: Riley Quinn <merileyquinn@gmail.com>
Date: Thu, 3 Mar 2022 22:30:08 -0600
Subject: [PATCH 1/3] Fix wiki links containing locale not loading when opened
 from chat.

---
 osu.Game/Overlays/WikiOverlay.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/WikiOverlay.cs b/osu.Game/Overlays/WikiOverlay.cs
index 44713d637d..63191900d8 100644
--- a/osu.Game/Overlays/WikiOverlay.cs
+++ b/osu.Game/Overlays/WikiOverlay.cs
@@ -7,6 +7,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Game.Extensions;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
@@ -100,7 +101,16 @@ private void onPathChanged(ValueChangedEvent<string> e)
             cancellationToken?.Cancel();
             request?.Cancel();
 
-            request = new GetWikiRequest(e.NewValue);
+            string[] values = e.NewValue.Split('/', 2);
+
+            if (values.Length > 1 && LanguageExtensions.TryParseCultureCode(values[0], out _))
+            {
+                request = new GetWikiRequest(values[1], values[0]);
+            }
+            else
+            {
+                request = new GetWikiRequest(e.NewValue);
+            }
 
             Loading.Show();
 

From 8491bab77c47391f0f7ee386787befcb4d5dafbf Mon Sep 17 00:00:00 2001
From: Riley Quinn <merileyquinn@gmail.com>
Date: Fri, 4 Mar 2022 00:57:13 -0600
Subject: [PATCH 2/3] Replace string locale with Language

---
 osu.Game/Online/API/Requests/GetWikiRequest.cs | 10 ++++++----
 osu.Game/Overlays/WikiOverlay.cs               |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Online/API/Requests/GetWikiRequest.cs b/osu.Game/Online/API/Requests/GetWikiRequest.cs
index 248fcc03e3..09571ab0a8 100644
--- a/osu.Game/Online/API/Requests/GetWikiRequest.cs
+++ b/osu.Game/Online/API/Requests/GetWikiRequest.cs
@@ -1,6 +1,8 @@
 // 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 osu.Game.Extensions;
+using osu.Game.Localisation;
 using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Online.API.Requests
@@ -8,14 +10,14 @@ namespace osu.Game.Online.API.Requests
     public class GetWikiRequest : APIRequest<APIWikiPage>
     {
         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.locale = locale;
+            this.language = language;
         }
 
-        protected override string Target => $"wiki/{locale}/{path}";
+        protected override string Target => $"wiki/{language.ToCultureCode()}/{path}";
     }
 }
diff --git a/osu.Game/Overlays/WikiOverlay.cs b/osu.Game/Overlays/WikiOverlay.cs
index 63191900d8..d6a379dc56 100644
--- a/osu.Game/Overlays/WikiOverlay.cs
+++ b/osu.Game/Overlays/WikiOverlay.cs
@@ -103,9 +103,9 @@ private void onPathChanged(ValueChangedEvent<string> e)
 
             string[] values = e.NewValue.Split('/', 2);
 
-            if (values.Length > 1 && LanguageExtensions.TryParseCultureCode(values[0], out _))
+            if (values.Length > 1 && LanguageExtensions.TryParseCultureCode(values[0], out var language))
             {
-                request = new GetWikiRequest(values[1], values[0]);
+                request = new GetWikiRequest(values[1], language);
             }
             else
             {

From 3fdc7ed9d2b80533cda71a9e4829706eab1ded51 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 4 Mar 2022 10:14:19 +0300
Subject: [PATCH 3/3] Remove brackets surrounding one-line statements

---
 osu.Game/Overlays/WikiOverlay.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game/Overlays/WikiOverlay.cs b/osu.Game/Overlays/WikiOverlay.cs
index d6a379dc56..4015d8e196 100644
--- a/osu.Game/Overlays/WikiOverlay.cs
+++ b/osu.Game/Overlays/WikiOverlay.cs
@@ -104,13 +104,9 @@ private void onPathChanged(ValueChangedEvent<string> e)
             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();