From 1b4bff0d9fa52dec5b18f33158b4201bcb1ed2e2 Mon Sep 17 00:00:00 2001
From: kj415j45 <kj415j45@gmail.com>
Date: Sun, 18 Jul 2021 00:28:32 +0800
Subject: [PATCH] Optimize code style

Co-authored-by: frenzibyte <frenzibyte@gmail.com>
Co-authored-by: bdach <dach.bartlomiej@gmail.com>
---
 osu.Game/Localisation/NewsStrings.cs | 10 ----------
 osu.Game/Localisation/WikiStrings.cs | 29 ----------------------------
 osu.Game/Overlays/News/NewsHeader.cs | 11 ++++-------
 osu.Game/Overlays/Wiki/WikiHeader.cs | 10 ++++------
 4 files changed, 8 insertions(+), 52 deletions(-)
 delete mode 100644 osu.Game/Localisation/WikiStrings.cs

diff --git a/osu.Game/Localisation/NewsStrings.cs b/osu.Game/Localisation/NewsStrings.cs
index 8cad6015cf..4f1fe6e776 100644
--- a/osu.Game/Localisation/NewsStrings.cs
+++ b/osu.Game/Localisation/NewsStrings.cs
@@ -9,16 +9,6 @@ namespace osu.Game.Localisation
     {
         private const string prefix = @"osu.Game.Resources.Localisation.News";
 
-        /// <summary>
-        /// "frontpage"
-        /// </summary>
-        public static LocalisableString FrontPageString => new TranslatableString(getKey(@"front_page"), @"frontpage");
-
-        /// <summary>
-        /// "news"
-        /// </summary>
-        public static LocalisableString HeaderTitle => new TranslatableString(getKey(@"header_title"), @"news");
-
         /// <summary>
         /// "join the real-time discussion"
         /// </summary>
diff --git a/osu.Game/Localisation/WikiStrings.cs b/osu.Game/Localisation/WikiStrings.cs
deleted file mode 100644
index 6176fd4e85..0000000000
--- a/osu.Game/Localisation/WikiStrings.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// 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.Framework.Localisation;
-
-namespace osu.Game.Localisation
-{
-    public static class WikiStrings
-    {
-        private const string prefix = @"osu.Game.Resources.Localisation.Wiki";
-
-        /// <summary>
-        /// "index"
-        /// </summary>
-        public static LocalisableString IndexPageString => new TranslatableString(getKey(@"index_page"), @"index");
-
-        /// <summary>
-        /// "wiki"
-        /// </summary>
-        public static LocalisableString HeaderTitle => new TranslatableString(getKey(@"header_title"), @"wiki");
-
-        /// <summary>
-        /// "knowledge base"
-        /// </summary>
-        public static LocalisableString HeaderDescription => new TranslatableString(getKey(@"header_description"), @"knowledge base");
-
-        private static string getKey(string key) => $"{prefix}:{key}";
-    }
-}
diff --git a/osu.Game/Overlays/News/NewsHeader.cs b/osu.Game/Overlays/News/NewsHeader.cs
index 0b0277f984..7f08300912 100644
--- a/osu.Game/Overlays/News/NewsHeader.cs
+++ b/osu.Game/Overlays/News/NewsHeader.cs
@@ -5,16 +5,13 @@ using System;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
-using osu.Game.Localisation;
+using osu.Game.Resources.Localisation.Web;
 
 namespace osu.Game.Overlays.News
 {
     public class NewsHeader : BreadcrumbControlOverlayHeader
     {
-        public static LocalisableString FrontPageString => NewsStrings.FrontPageString;
-        public static LocalisableString HeaderTitle => NewsStrings.HeaderTitle;
-        public static LocalisableString HeaderDescription => NewsStrings.HeaderDescription;
-
+        public LocalisableString FrontPageString => osu.Game.Resources.Localisation.Web.NewsStrings.IndexTitleInfo;
         public Action ShowFrontPage;
 
         private readonly Bindable<string> article = new Bindable<string>();
@@ -65,8 +62,8 @@ namespace osu.Game.Overlays.News
         {
             public NewsHeaderTitle()
             {
-                Title = HeaderTitle;
-                Description = HeaderDescription;
+                Title = LayoutStrings.MenuHomeNewsIndex;
+                Description = osu.Game.Localisation.NewsStrings.HeaderDescription;
                 IconTexture = "Icons/Hexacons/news";
             }
         }
diff --git a/osu.Game/Overlays/Wiki/WikiHeader.cs b/osu.Game/Overlays/Wiki/WikiHeader.cs
index 4bec42b6ce..f24d59a8d3 100644
--- a/osu.Game/Overlays/Wiki/WikiHeader.cs
+++ b/osu.Game/Overlays/Wiki/WikiHeader.cs
@@ -6,17 +6,15 @@ using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
-using osu.Game.Localisation;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Resources.Localisation.Web;
 
 namespace osu.Game.Overlays.Wiki
 {
     public class WikiHeader : BreadcrumbControlOverlayHeader
     {
         private const string index_path = "Main_Page";
-        public static LocalisableString IndexPageString => WikiStrings.IndexPageString;
-        public static LocalisableString HeaderTitle => WikiStrings.HeaderTitle;
-        public static LocalisableString HeaderDescription => WikiStrings.HeaderDescription;
+        public LocalisableString IndexPageString => LayoutStrings.HeaderHelpIndex;
 
         public readonly Bindable<APIWikiPage> WikiPageData = new Bindable<APIWikiPage>();
 
@@ -77,8 +75,8 @@ namespace osu.Game.Overlays.Wiki
         {
             public WikiHeaderTitle()
             {
-                Title = HeaderTitle;
-                Description = HeaderDescription;
+                Title = LayoutStrings.MenuHelpGetWiki;
+                Description = PageTitleStrings.MainWikiControllerDefault;
                 IconTexture = "Icons/Hexacons/wiki";
             }
         }