From 0a278ef9432d06ab6ae6f94be332296c5eba9e6f Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 14 Dec 2019 11:40:59 +0100
Subject: [PATCH] Apply review suggestions

---
 osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs | 2 +-
 osu.Game/Overlays/News/NewsArticleCover.cs           | 6 ++----
 osu.Game/Overlays/NewsOverlay.cs                     | 8 ++++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
index f870a12fc3..a8e1f40ecf 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual.Online
 
         private class TestNewsOverlay : NewsOverlay
         {
-            public new void LoadAndShowChild(NewsContent content) => base.LoadAndShowChild(content);
+            public new void LoadAndShowChild(NewsContent content) => base.LoadAndShowContent(content);
         }
 
         private class NewsCoverTest : NewsContent
diff --git a/osu.Game/Overlays/News/NewsArticleCover.cs b/osu.Game/Overlays/News/NewsArticleCover.cs
index e2485bd170..e484309a18 100644
--- a/osu.Game/Overlays/News/NewsArticleCover.cs
+++ b/osu.Game/Overlays/News/NewsArticleCover.cs
@@ -90,7 +90,6 @@ namespace osu.Game.Overlays.News
             bg.OnLoadComplete += d => d.FadeIn(250, Easing.In);
         }
 
-        //news article cover background
         [LongRunningLoad]
         private class NewsBackground : Sprite
         {
@@ -108,7 +107,6 @@ namespace osu.Game.Overlays.News
             }
         }
 
-        //date container
         private class DateContainer : Container, IHasTooltip
         {
             private readonly DateTime date;
@@ -134,7 +132,7 @@ namespace osu.Game.Overlays.News
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         Font = OsuFont.GetFont(Typeface.Exo, 12, FontWeight.Black, false, false),
-                        Text = date.ToString("dd MMM yyy"),
+                        Text = date.ToString("d MMM yyy").ToUpper(),
                         Margin = new MarginPadding
                         {
                             Vertical = 4,
@@ -144,7 +142,7 @@ namespace osu.Game.Overlays.News
                 };
             }
 
-            public string TooltipText => date.ToString("dddd dd MMMM yyyy hh:mm:ss UTCz");
+            public string TooltipText => date.ToString("dddd dd MMMM yyyy hh:mm:ss UTCz").ToUpper();
         }
 
         //fake API data struct to use for now as a skeleton for data, as there is no API struct for news article info for now
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index db4b118bf8..e7471cb21d 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -59,19 +59,19 @@ namespace osu.Game.Overlays
             Current.TriggerChange();
         }
 
-        private CancellationTokenSource loadChildCancellation;
+        private CancellationTokenSource loadContentCancellation;
 
-        protected void LoadAndShowChild(NewsContent newContent)
+        protected void LoadAndShowContent(NewsContent newContent)
         {
             content.FadeTo(0.2f, 300, Easing.OutQuint);
 
-            loadChildCancellation?.Cancel();
+            loadContentCancellation?.Cancel();
 
             LoadComponentAsync(newContent, c =>
             {
                 content.Child = c;
                 content.FadeIn(300, Easing.OutQuint);
-            }, (loadChildCancellation = new CancellationTokenSource()).Token);
+            }, (loadContentCancellation = new CancellationTokenSource()).Token);
         }
 
         public void ShowFrontPage()