Added optional Culture parameter to DateTime.Humanize

src/Humanizer.Tests/ApiApprover/PublicApiApprovalTest.approve_public_api.approved.txt

@@ -87,29 +87,30 @@ public class LocaliserRegistry`1
     public void Register(string localeCode) { }
     public void Register(System.Func<> localiserFactory, string localeCode) { }
     public void RegisterDefault(TLocaliser defaultLocaliser) { }
+    public TLocaliser ResolveForCulture(System.Globalization.CultureInfo culture) { }
     public TLocaliser ResolveForUiCulture() { }
 }
 
 public class DateHumanizeExtensions
 {
-    public string Humanize(System.DateTime input, bool utcDate, System.Nullable<System.DateTime> dateToCompareAgainst) { }
+    public string Humanize(System.DateTime input, bool utcDate, System.Nullable<System.DateTime> dateToCompareAgainst, System.Globalization.CultureInfo culture) { }
 }
 
 public class DefaultDateTimeHumanizeStrategy
 {
     public DefaultDateTimeHumanizeStrategy() { }
-    public string Humanize(System.DateTime input, System.DateTime comparisonBase) { }
+    public string Humanize(System.DateTime input, System.DateTime comparisonBase, System.Globalization.CultureInfo culture) { }
 }
 
 public interface IDateTimeHumanizeStrategy
 {
-    string Humanize(System.DateTime input, System.DateTime comparisonBase);
+    string Humanize(System.DateTime input, System.DateTime comparisonBase, System.Globalization.CultureInfo culture);
 }
 
 public class PrecisionDateTimeHumanizeStrategy
 {
     public PrecisionDateTimeHumanizeStrategy(double precision) { }
-    public string Humanize(System.DateTime input, System.DateTime comparisonBase) { }
+    public string Humanize(System.DateTime input, System.DateTime comparisonBase, System.Globalization.CultureInfo culture) { }
 }
 
 public class EnumDehumanizeExtensions
@@ -215,16 +216,16 @@ public interface ICollectionFormatter
 public class DefaultFormatter
 {
     public DefaultFormatter() { }
-    public string DateHumanize(Humanizer.Localisation.TimeUnit timeUnit, Humanizer.Localisation.Tense timeUnitTense, int unit) { }
-    public string DateHumanize_Now() { }
+    public string DateHumanize(Humanizer.Localisation.TimeUnit timeUnit, Humanizer.Localisation.Tense timeUnitTense, int unit, System.Globalization.CultureInfo culture) { }
+    public string DateHumanize_Now(System.Globalization.CultureInfo culture) { }
     public string TimeSpanHumanize(Humanizer.Localisation.TimeUnit timeUnit, int unit) { }
     public string TimeSpanHumanize_Zero() { }
 }
 
 public interface IFormatter
 {
-    string DateHumanize(Humanizer.Localisation.TimeUnit timeUnit, Humanizer.Localisation.Tense timeUnitTense, int unit);
-    string DateHumanize_Now();
+    string DateHumanize(Humanizer.Localisation.TimeUnit timeUnit, Humanizer.Localisation.Tense timeUnitTense, int unit, System.Globalization.CultureInfo culture);
+    string DateHumanize_Now(System.Globalization.CultureInfo culture);
     string TimeSpanHumanize(Humanizer.Localisation.TimeUnit timeUnit, int unit);
     string TimeSpanHumanize_Zero();
 }
@@ -250,7 +251,7 @@ public class ResourceKeys
 
 public class Resources
 {
-    public string GetResource(string resourceKey) { }
+    public string GetResource(string resourceKey, System.Globalization.CultureInfo culture) { }
 }
 
 public enum Tense

src/Humanizer.Tests/DateHumanize.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Globalization;
+using System.Threading;
 using Humanizer.Configuration;
 using Humanizer.DateTimeHumanizeStrategy;
 using Humanizer.Localisation;
@@ -8,26 +10,33 @@ namespace Humanizer.Tests
 {
     public class DateHumanize
     {
-        static void VerifyWithCurrentDate(string expectedString, TimeSpan deltaFromNow)
+        private static void VerifyWithCurrentDate(string expectedString, TimeSpan deltaFromNow)
         {
-            var utcNow = DateTime.UtcNow;
-            var localNow = DateTime.Now;
+            CheckWithExplicitAndImplicitCulture(culture =>
+            {
+                var utcNow = DateTime.UtcNow;
+                var localNow = DateTime.Now;
 
-            // feels like the only way to avoid breaking tests because CPU ticks over is to inject the base date
-            Assert.Equal(expectedString, utcNow.Add(deltaFromNow).Humanize(utcDate: true, dateToCompareAgainst: utcNow));
-            Assert.Equal(expectedString, localNow.Add(deltaFromNow).Humanize(utcDate: false, dateToCompareAgainst: localNow));
+                // feels like the only way to avoid breaking tests because CPU ticks over is to inject the base date
+                Assert.Equal(expectedString, utcNow.Add(deltaFromNow).Humanize(true, utcNow, culture));
+                Assert.Equal(expectedString, localNow.Add(deltaFromNow).Humanize(false, localNow, culture));
+            });
         }
 
-        static void VerifyWithDateInjection(string expectedString, TimeSpan deltaFromNow)
+        private static void VerifyWithDateInjection(string expectedString, TimeSpan deltaFromNow)
         {
-            var utcNow = new DateTime(2013, 6, 20, 9, 58, 22, DateTimeKind.Utc);
-            var now = new DateTime(2013, 6, 20, 11, 58, 22, DateTimeKind.Local);
+            CheckWithExplicitAndImplicitCulture(culture =>
+            {
+                var utcNow = new DateTime(2013, 6, 20, 9, 58, 22, DateTimeKind.Utc);
+                var now = new DateTime(2013, 6, 20, 11, 58, 22, DateTimeKind.Local);
 
-            Assert.Equal(expectedString, utcNow.Add(deltaFromNow).Humanize(utcDate: true, dateToCompareAgainst: utcNow));
-            Assert.Equal(expectedString, now.Add(deltaFromNow).Humanize(false, now));
+                Assert.Equal(expectedString, utcNow.Add(deltaFromNow).Humanize(true, utcNow, culture));
+                Assert.Equal(expectedString, now.Add(deltaFromNow).Humanize(false, now, culture));
+            });
         }
 
-        public static void Verify(string expectedString, int unit, TimeUnit timeUnit, Tense tense, double? precision = null)
+        public static void Verify(string expectedString, int unit, TimeUnit timeUnit, Tense tense,
+            double? precision = null)
         {
             if (precision.HasValue)
                 Configurator.DateTimeHumanizeStrategy = new PrecisionDateTimeHumanizeStrategy(precision.Value);
@@ -68,5 +77,14 @@ public static void Verify(string expectedString, int unit, TimeUnit timeUnit, Te
             VerifyWithCurrentDate(expectedString, deltaFromNow);
             VerifyWithDateInjection(expectedString, deltaFromNow);
         }
+
+        private static void CheckWithExplicitAndImplicitCulture(Action<CultureInfo> action)
+        {
+            action(null);
+
+            CultureInfo culture = Thread.CurrentThread.CurrentUICulture;
+            using (new AmbientCulture(culture.TwoLetterISOLanguageName == "da" ? "tr" : "da"))
+                action(culture);
+        }
     }
 }

src/Humanizer.Tests/Localisation/nl/DateHumanizeTests.cs

@@ -14,15 +14,15 @@ public DateHumanizeTests() : base("nl-NL") { }
         [InlineData(-1, "gisteren")]
         public void DaysAgo(int days, string expected)
         {
-            Assert.Equal(expected, DateTime.UtcNow.AddDays(days).Humanize());
+            DateHumanize.Verify(expected, days, TimeUnit.Day, Tense.Past);
         }
 
         [Theory]
         [InlineData(-2, "2 uur geleden")]
         [InlineData(-1, "één uur geleden")]
         public void HoursAgo(int hours, string expected)
         {
-            Assert.Equal(expected, DateTime.UtcNow.AddHours(hours).Humanize());
+            DateHumanize.Verify(expected, hours, TimeUnit.Hour, Tense.Past);
         }
 
         [Theory]
@@ -39,23 +39,23 @@ public void MinutesAgo(int minutes, string expected)
         [InlineData(-1, "één maand geleden")]
         public void MonthsAgo(int months, string expected)
         {
-            Assert.Equal(expected, DateTime.UtcNow.AddMonths(months).Humanize());
+            DateHumanize.Verify(expected, months, TimeUnit.Month, Tense.Past);
         }
 
         [Theory]
         [InlineData(-2, "2 seconden geleden")]
         [InlineData(-1, "één seconde geleden")]
         public void SecondsAgo(int seconds, string expected)
         {
-            Assert.Equal(expected, DateTime.UtcNow.AddSeconds(seconds).Humanize());
+            DateHumanize.Verify(expected, seconds, TimeUnit.Second, Tense.Past);
         }
 
         [Theory]
         [InlineData(-2, "2 jaar geleden")]
         [InlineData(-1, "één jaar geleden")]
         public void YearsAgo(int years, string expected)
         {
-            Assert.Equal(expected, DateTime.UtcNow.AddYears(years).Humanize());
+            DateHumanize.Verify(expected, years, TimeUnit.Year, Tense.Past);
         }
     }
 }

src/Humanizer/Configuration/Configurator.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Reflection;
 using Humanizer.DateTimeHumanizeStrategy;
 using Humanizer.Localisation.Formatters;
@@ -58,16 +59,14 @@ internal static ICollectionFormatter CollectionFormatter
                 return CollectionFormatters.ResolveForUiCulture();
             }
         }
-        
+
         /// <summary>
         /// The formatter to be used
         /// </summary>
-        internal static IFormatter Formatter
+        /// <param name="culture">The culture to retrieve formatter for. If not specified, current thread's UI culture is used.</param>
+        internal static IFormatter GetFormatter(CultureInfo culture = null)
         {
-            get
-            {
-                return Formatters.ResolveForUiCulture();
-            }
+            return Formatters.ResolveForCulture(culture);
         }
 
         /// <summary>

src/Humanizer/Configuration/LocaliserRegistry.cs

@@ -23,11 +23,20 @@ public LocaliserRegistry(TLocaliser defaultLocaliser)
         }
 
         /// <summary>
-        /// Gets the localiser for the current UI culture 
+        /// Gets the localiser for the current thread's UI culture 
         /// </summary>
         public TLocaliser ResolveForUiCulture()
         {
-            var culture = CultureInfo.CurrentUICulture;
+            return ResolveForCulture();
+        }
+
+        /// <summary>
+        /// Gets the localiser for the specified culture 
+        /// </summary>
+        /// <param name="culture">The culture to retrieve localiser for. If not specified, current thread's UI culture is used.</param>
+        public TLocaliser ResolveForCulture(CultureInfo culture = null)
+        {
+            culture = culture ?? CultureInfo.CurrentUICulture;
 
             Lazy<TLocaliser> factory;
 

src/Humanizer/DateHumanizeExtensions.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using Humanizer.Configuration;
 
 namespace Humanizer
@@ -14,15 +15,16 @@ public static class DateHumanizeExtensions
         /// <param name="input">The date to be humanized</param>
         /// <param name="utcDate">Boolean value indicating whether the date is in UTC or local</param>
         /// <param name="dateToCompareAgainst">Date to compare the input against. If null, current date is used as base</param>
+        /// <param name="culture">Culture to use. If null, current thread's UI culture is used.</param>
         /// <returns>distance of time in words</returns>
-        public static string Humanize(this DateTime input, bool utcDate = true, DateTime? dateToCompareAgainst = null)
+        public static string Humanize(this DateTime input, bool utcDate = true, DateTime? dateToCompareAgainst = null, CultureInfo culture = null)
         {
             var comparisonBase = dateToCompareAgainst ?? DateTime.UtcNow;
 
             if (!utcDate)
                 comparisonBase = comparisonBase.ToLocalTime();
 
-            return Configurator.DateTimeHumanizeStrategy.Humanize(input, comparisonBase);
+            return Configurator.DateTimeHumanizeStrategy.Humanize(input, comparisonBase, culture);
         }
     }
 }

src/Humanizer/DateTimeHumanizeStrategy/DefaultDateTimeHumanizeStrategy.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using Humanizer.Configuration;
 using Humanizer.Localisation;
 
@@ -15,53 +16,56 @@ public class DefaultDateTimeHumanizeStrategy : IDateTimeHumanizeStrategy
         /// </summary>
         /// <param name="input"></param>
         /// <param name="comparisonBase"></param>
+        /// <param name="culture"></param>
         /// <returns></returns>
-        public string Humanize(DateTime input, DateTime comparisonBase)
+        public string Humanize(DateTime input, DateTime comparisonBase, CultureInfo culture)
         {
             var tense = input > comparisonBase ? Tense.Future : Tense.Past;
             var ts = new TimeSpan(Math.Abs(comparisonBase.Ticks - input.Ticks));
 
+            var formatter = Configurator.GetFormatter(culture);
+
             if (ts.TotalMilliseconds < 500)
-                return Configurator.Formatter.DateHumanize(TimeUnit.Millisecond, tense, 0);
+                return formatter.DateHumanize(TimeUnit.Millisecond, tense, 0, culture);
 
             if (ts.TotalSeconds < 60)
-                return Configurator.Formatter.DateHumanize(TimeUnit.Second, tense, ts.Seconds);
+                return formatter.DateHumanize(TimeUnit.Second, tense, ts.Seconds, culture);
 
             if (ts.TotalSeconds < 120)
-                return Configurator.Formatter.DateHumanize(TimeUnit.Minute, tense, 1);
+                return formatter.DateHumanize(TimeUnit.Minute, tense, 1, culture);
 
             if (ts.TotalMinutes < 60)
-                return Configurator.Formatter.DateHumanize(TimeUnit.Minute, tense, ts.Minutes);
+                return formatter.DateHumanize(TimeUnit.Minute, tense, ts.Minutes, culture);
 
             if (ts.TotalMinutes < 90)
-                return Configurator.Formatter.DateHumanize(TimeUnit.Hour, tense, 1);
+                return formatter.DateHumanize(TimeUnit.Hour, tense, 1, culture);
 
             if (ts.TotalHours < 24)
-                return Configurator.Formatter.DateHumanize(TimeUnit.Hour, tense, ts.Hours);
+                return formatter.DateHumanize(TimeUnit.Hour, tense, ts.Hours, culture);
 
             if (ts.TotalHours < 48)
-                return Configurator.Formatter.DateHumanize(TimeUnit.Day, tense, 1);
+                return formatter.DateHumanize(TimeUnit.Day, tense, 1, culture);
 
             if (ts.TotalDays < 28)
-                return Configurator.Formatter.DateHumanize(TimeUnit.Day, tense, ts.Days);
+                return formatter.DateHumanize(TimeUnit.Day, tense, ts.Days, culture);
 
             if (ts.TotalDays >= 28 && ts.TotalDays < 30)
             {
                 if (comparisonBase.Date.AddMonths(tense == Tense.Future ? 1 : -1) == input.Date)
-                    return Configurator.Formatter.DateHumanize(TimeUnit.Month, tense, 1);
-                return Configurator.Formatter.DateHumanize(TimeUnit.Day, tense, ts.Days);
+                    return formatter.DateHumanize(TimeUnit.Month, tense, 1, culture);
+                return formatter.DateHumanize(TimeUnit.Day, tense, ts.Days, culture);
             }
 
             if (ts.TotalDays < 345)
             {
                 int months = Convert.ToInt32(Math.Floor(ts.TotalDays / 29.5));
-                return Configurator.Formatter.DateHumanize(TimeUnit.Month, tense, months);
+                return formatter.DateHumanize(TimeUnit.Month, tense, months, culture);
             }
 
             int years = Convert.ToInt32(Math.Floor(ts.TotalDays / 365));
             if (years == 0) years = 1;
 
-            return Configurator.Formatter.DateHumanize(TimeUnit.Year, tense, years);
+            return formatter.DateHumanize(TimeUnit.Year, tense, years, culture);
         }
     }
 }

src/Humanizer/DateTimeHumanizeStrategy/IDateTimeHumanizeStrategy.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 
 namespace Humanizer.DateTimeHumanizeStrategy
 {
@@ -10,6 +11,6 @@ public interface IDateTimeHumanizeStrategy
         /// <summary>
         /// Calculates the distance of time in words between two provided dates used for DateTime.Humanize
         /// </summary>
-        string Humanize(DateTime input, DateTime comparisonBase);
+        string Humanize(DateTime input, DateTime comparisonBase, CultureInfo culture);
     }
 }

src/Humanizer/DateTimeHumanizeStrategy/PrecisionDateTimeHumanizeStrategy.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using Humanizer.Configuration;
 using Humanizer.Localisation;
 
@@ -25,8 +26,9 @@ public PrecisionDateTimeHumanizeStrategy(double precision = .75)
         /// </summary>
         /// <param name="input"></param>
         /// <param name="comparisonBase"></param>
+        /// <param name="culture"></param>
         /// <returns></returns>
-        public string Humanize(DateTime input, DateTime comparisonBase)
+        public string Humanize(DateTime input, DateTime comparisonBase, CultureInfo culture)
         {
             var ts = new TimeSpan(Math.Abs(comparisonBase.Ticks - input.Ticks));
             var tense = input > comparisonBase ? Tense.Future : Tense.Past;
@@ -59,13 +61,14 @@ public string Humanize(DateTime input, DateTime comparisonBase)
             }
 
             // start computing result from larger units to smaller ones
-            if (years > 0) return Configurator.Formatter.DateHumanize(TimeUnit.Year, tense, years);
-            if (months > 0) return Configurator.Formatter.DateHumanize(TimeUnit.Month, tense, months);
-            if (days > 0) return Configurator.Formatter.DateHumanize(TimeUnit.Day, tense, days);
-            if (hours > 0) return Configurator.Formatter.DateHumanize(TimeUnit.Hour, tense, hours);
-            if (minutes > 0) return Configurator.Formatter.DateHumanize(TimeUnit.Minute, tense, minutes);
-            if (seconds > 0) return Configurator.Formatter.DateHumanize(TimeUnit.Second, tense, seconds);
-            return Configurator.Formatter.DateHumanize(TimeUnit.Millisecond, tense, 0);
+            var formatter = Configurator.GetFormatter(culture);
+            if (years > 0) return formatter.DateHumanize(TimeUnit.Year, tense, years, culture);
+            if (months > 0) return formatter.DateHumanize(TimeUnit.Month, tense, months, culture);
+            if (days > 0) return formatter.DateHumanize(TimeUnit.Day, tense, days, culture);
+            if (hours > 0) return formatter.DateHumanize(TimeUnit.Hour, tense, hours, culture);
+            if (minutes > 0) return formatter.DateHumanize(TimeUnit.Minute, tense, minutes, culture);
+            if (seconds > 0) return formatter.DateHumanize(TimeUnit.Second, tense, seconds, culture);
+            return formatter.DateHumanize(TimeUnit.Millisecond, tense, 0, culture);
         }
     }
 }