From 195609816674f0428a281d12e4c0757cba08169a Mon Sep 17 00:00:00 2001
From: David Zhao <nyquill@ppy.sh>
Date: Tue, 30 Jul 2019 13:58:08 +0900
Subject: [PATCH 1/2] Add a fallback for humanizer localization failure

---
 osu.Game/Graphics/DrawableDate.cs             |  4 +--
 .../BeatmapSet/Scores/TopScoreUserSection.cs  |  4 +--
 osu.Game/Utils/HumanizerUtils.cs              | 36 +++++++++++++++++++
 3 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game/Utils/HumanizerUtils.cs

diff --git a/osu.Game/Graphics/DrawableDate.cs b/osu.Game/Graphics/DrawableDate.cs
index 125c994c92..533f02af7b 100644
--- a/osu.Game/Graphics/DrawableDate.cs
+++ b/osu.Game/Graphics/DrawableDate.cs
@@ -2,11 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Cursor;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Utils;
 
 namespace osu.Game.Graphics
 {
@@ -71,7 +71,7 @@ namespace osu.Game.Graphics
             Scheduler.AddDelayed(updateTimeWithReschedule, timeUntilNextUpdate);
         }
 
-        protected virtual string Format() => Date.Humanize();
+        protected virtual string Format() => HumanizerUtils.Humanize(Date);
 
         private void updateTime() => Text = Format();
 
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
index ffc39e5af2..38a909411a 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
@@ -1,7 +1,6 @@
 // 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 Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -14,6 +13,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Leaderboards;
 using osu.Game.Scoring;
 using osu.Game.Users.Drawables;
+using osu.Game.Utils;
 using osuTK;
 using osuTK.Graphics;
 
@@ -132,7 +132,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             {
                 avatar.User = value.User;
                 flag.Country = value.User.Country;
-                date.Text = $@"achieved {value.Date.Humanize()}";
+                date.Text = $@"achieved {HumanizerUtils.Humanize(value.Date)}";
 
                 usernameText.Clear();
                 usernameText.AddUserLink(value.User);
diff --git a/osu.Game/Utils/HumanizerUtils.cs b/osu.Game/Utils/HumanizerUtils.cs
new file mode 100644
index 0000000000..398c76a09f
--- /dev/null
+++ b/osu.Game/Utils/HumanizerUtils.cs
@@ -0,0 +1,36 @@
+// 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 System;
+using System.Globalization;
+using Humanizer;
+
+namespace osu.Game.Utils
+{
+    public static class HumanizerUtils
+    {
+        /// <summary>
+        /// Humanizes a string using the system culture, then falls back if one cannot be found.
+        /// <remarks>
+        /// A localization lookup failure will throw an exception of type <see cref="ArgumentException"/>
+        /// </remarks>
+        /// </summary>
+        /// <param name="dateTimeOffset">The time to humanize.</param>
+        /// <returns>A humanized string of the given time.</returns>
+        public static string Humanize(DateTimeOffset dateTimeOffset)
+        {
+            string offset;
+
+            try
+            {
+                offset = dateTimeOffset.Humanize();
+            }
+            catch (ArgumentException)
+            {
+                offset = dateTimeOffset.Humanize(culture: new CultureInfo("en-US"));
+            }
+
+            return offset;
+        }
+    }
+}

From c7e20b34bae62458749b973acb1e0cd54f1e8c7b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Aug 2019 20:15:28 +0900
Subject: [PATCH 2/2] Cleanup

---
 osu.Game/Utils/HumanizerUtils.cs | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Utils/HumanizerUtils.cs b/osu.Game/Utils/HumanizerUtils.cs
index 398c76a09f..5b7c3630d9 100644
--- a/osu.Game/Utils/HumanizerUtils.cs
+++ b/osu.Game/Utils/HumanizerUtils.cs
@@ -10,27 +10,21 @@ namespace osu.Game.Utils
     public static class HumanizerUtils
     {
         /// <summary>
-        /// Humanizes a string using the system culture, then falls back if one cannot be found.
-        /// <remarks>
-        /// A localization lookup failure will throw an exception of type <see cref="ArgumentException"/>
-        /// </remarks>
+        /// Turns the current or provided date into a human readable sentence
         /// </summary>
-        /// <param name="dateTimeOffset">The time to humanize.</param>
-        /// <returns>A humanized string of the given time.</returns>
-        public static string Humanize(DateTimeOffset dateTimeOffset)
+        /// <param name="input">The date to be humanized</param>
+        /// <returns>distance of time in words</returns>
+        public static string Humanize(DateTimeOffset input)
         {
-            string offset;
-
+            // this works around https://github.com/xamarin/xamarin-android/issues/2012 and https://github.com/Humanizr/Humanizer/issues/690#issuecomment-368536282
             try
             {
-                offset = dateTimeOffset.Humanize();
+                return input.Humanize();
             }
             catch (ArgumentException)
             {
-                offset = dateTimeOffset.Humanize(culture: new CultureInfo("en-US"));
+                return input.Humanize(culture: new CultureInfo("en-US"));
             }
-
-            return offset;
         }
     }
 }