Merge branch 'default-datetime-humanize'

Humanizr · May 27, 2014 · bcdd481 · bcdd481
2 parents 419cb07 + 0393369
commit bcdd481
Show file tree

Hide file tree

Showing 30 changed files with 51 additions and 8 deletions.
diff --git a/release_notes.md b/release_notes.md
@@ -2,7 +2,8 @@
   - [#277](https://github.com/MehdiK/Humanizer/pull/277): Added support for custom enum description attribute property names
   - [#276](https://github.com/Mehdik/Humanizer/pull/276): Added Farsi ToOrdinalWords
   - [#281](https://github.com/Mehdik/Humanizer/pull/281): Changed the logic for handling hyphenation and large numbers ending in twelve for English ordinal words; e.g. before "twenty first" now "twenty-first"
-
+  - [#278](https://github.com/MehdiK/Humanizer/pull/278): Changed DefaultDateTimeHumanizeStrategy to turn 60 min to one hour not 45
+
 [Commits](https://github.com/MehdiK/Humanizer/compare/v1.26.1...master)
 
 ###v1.26.1 - 2014-05-20

diff --git a/src/Humanizer.Tests/DateHumanizeDefaultStrategyTests.cs b/src/Humanizer.Tests/DateHumanizeDefaultStrategyTests.cs
@@ -35,7 +35,9 @@ public void SecondsFromNow(int seconds, string expected)
         [InlineData(1, "a minute ago")]
         [InlineData(10, "10 minutes ago")]
         [InlineData(44, "44 minutes ago")]
-        [InlineData(45, "an hour ago")]
+        [InlineData(45, "45 minutes ago")]
+        [InlineData(59, "59 minutes ago")]
+        [InlineData(60, "an hour ago")]
         [InlineData(119, "an hour ago")]
         [InlineData(120, "2 hours ago")]
         public void MinutesAgo(int minutes, string expected)
@@ -47,7 +49,7 @@ public void MinutesAgo(int minutes, string expected)
         [InlineData(1, "a minute from now")]
         [InlineData(10, "10 minutes from now")]
         [InlineData(44, "44 minutes from now")]
-        [InlineData(45, "an hour from now")]
+        [InlineData(45, "45 minutes from now")]
         [InlineData(119, "an hour from now")]
         [InlineData(120, "2 hours from now")]
         public void MinutesFromNow(int minutes, string expected)

diff --git a/src/Humanizer.Tests/Localisation/ar/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/ar/DateHumanizeTests.cs
@@ -53,6 +53,7 @@ public void HoursFromNow(int hours, string expected)
         [InlineData(-1, "منذ دقيقة واحدة")]
         [InlineData(-3, "منذ 3 دقائق")]
         [InlineData(-11, "منذ 11 دقيقة")]
+        [InlineData(60, "منذ ساعة واحدة")]
         public void MinutesAgo(int minutes, string expected)
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);

diff --git a/src/Humanizer.Tests/Localisation/bg/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/bg/DateHumanizeTests.cs
@@ -29,6 +29,7 @@ public void SecondsFromNow(int seconds, string expected)
         [Theory]
         [InlineData(1, "преди минута")]
         [InlineData(2, "преди 2 минути")]
+        [InlineData(60, "преди час")]
         public void MinutesAgo(int minutes, string expected)
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);

diff --git a/src/Humanizer.Tests/Localisation/cs/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/cs/DateHumanizeTests.cs
@@ -108,6 +108,7 @@ public void SecondsAgo(int seconds, string expected)
         [InlineData(5, "před 5 minutami")]
         [InlineData(6, "před 6 minutami")]
         [InlineData(10, "před 10 minutami")]
+        [InlineData(60, "před hodinou")]
         public void MinutesAgo(int minutes, string expected)
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);

diff --git a/src/Humanizer.Tests/Localisation/da/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/da/DateHumanizeTests.cs
@@ -50,6 +50,7 @@ public void HoursFromNow(int hours, string expected)
         [Theory]
         [InlineData(-2, "2 minutter siden")]
         [InlineData(-1, "et minut siden")]
+        [InlineData(60, "en time siden")]
         public void MinutesAgo(int minutes, string expected)
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);
@@ -58,6 +59,8 @@ public void MinutesAgo(int minutes, string expected)
         [Theory]
         [InlineData(1, "et minut fra nu")]
         [InlineData(10, "10 minutter fra nu")]
+        [InlineData(59, "59 minutter fra nu")]
+        [InlineData(60, "en time fra nu")]
         public void MinutesFromNow(int minutes, string expected)
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Future);

diff --git a/src/Humanizer.Tests/Localisation/de/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/de/DateHumanizeTests.cs
@@ -42,6 +42,7 @@ public void HoursFromNow(int hours, string expected)
         [Theory]
         [InlineData(-2, "vor 2 Minuten")]
         [InlineData(-1, "vor einer Minute")]
+        [InlineData(60, "vor einer Stunde")]
         public void MinutesAgo(int minutes, string expected)
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);

diff --git a/src/Humanizer.Tests/Localisation/es/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/es/DateHumanizeTests.cs
@@ -28,6 +28,7 @@ public void SecondsFromNow(int seconds, string expected)
         [Theory]
         [InlineData(1, "hace un minuto")]
         [InlineData(2, "hace 2 minutos")]
+        [InlineData(60, "hace una hora")]
         public void MinutesAgo(int minutes, string expected) 
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);

diff --git a/src/Humanizer.Tests/Localisation/fa/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/fa/DateHumanizeTests.cs
@@ -50,6 +50,7 @@ public void MinutesFromNow(int minutes, string expected)
         [Theory]
         [InlineData(-1, "یک دقیقه پیش")]
         [InlineData(-13, "13 دقیقه پیش")]
+        [InlineData(60,"یک ساعت پیش")]
         public void MinutesAgo(int minutes, string expected)
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);

diff --git a/src/Humanizer.Tests/Localisation/fi-FI/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/fi-FI/DateHumanizeTests.cs
@@ -29,6 +29,7 @@ public void HoursAgo(int hours, string expected)
         [Theory]
         [InlineData(2, "2 minuuttia sitten")]
         [InlineData(1, "minuutti sitten")]
+        [InlineData(60, "tunti sitten")]
         public void MinutesAgo(int minutes, string expected)
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);

diff --git a/src/Humanizer.Tests/Localisation/fr-BE/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/fr-BE/DateHumanizeTests.cs
@@ -26,6 +26,7 @@ public void SecondsFromNow(int seconds, string expected)
         [Theory]
         [InlineData(1, "il y a une minute")]
         [InlineData(10, "il y a 10 minutes")]
+        [InlineData(60, "il y a une heure")]
         public void MinutesAgo(int minutes, string expected) 
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);

diff --git a/src/Humanizer.Tests/Localisation/fr/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/fr/DateHumanizeTests.cs
@@ -26,6 +26,7 @@ public void SecondsFromNow(int seconds, string expected)
         [Theory]
         [InlineData(1, "il y a une minute")]
         [InlineData(10, "il y a 10 minutes")]
+        [InlineData(60, "il y a une heure")]
         public void MinutesAgo(int minutes, string expected)
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);

diff --git a/src/Humanizer.Tests/Localisation/he/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/he/DateHumanizeTests.cs
@@ -32,6 +32,7 @@ public void HoursAgo(int hours, string expected)
         [InlineData(1, "לפני דקה")]
         [InlineData(3, "לפני 3 דקות")]
         [InlineData(11, "לפני 11 דקות")]
+        [InlineData(60, "לפני שעה")]
         public void MinutesAgo(int minutes, string expected)
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);

diff --git a/src/Humanizer.Tests/Localisation/hu/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/hu/DateHumanizeTests.cs
@@ -28,6 +28,7 @@ public void SecondsFromNow(int seconds, string expected)
         [Theory]
         [InlineData(1, "egy perce")]
         [InlineData(10, "10 perce")]
+        [InlineData(60, "egy órája")]
         public void MinutesAgo(int minutes, string expected)
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);

diff --git a/src/Humanizer.Tests/Localisation/id/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/id/DateHumanizeTests.cs
@@ -26,6 +26,7 @@ public void SecondsFromNow(int seconds, string expected)
         [Theory]
         [InlineData(1, "semenit yang lalu")]
         [InlineData(10, "10 menit yang lalu")]
+        [InlineData(60, "sejam yang lalu")]
         public void MinutesAgo(int minutes, string expected)
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);

diff --git a/src/Humanizer.Tests/Localisation/ja/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/ja/DateHumanizeTests.cs
@@ -27,6 +27,7 @@ public void SecondsFromNow(int seconds, string expected)
         [Theory]
         [InlineData(1, "1 分前")]
         [InlineData(2, "2 分前")]
+        [InlineData(60, "1 時間前")]
         public void MinutesAgo(int minutes, string expected)
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);

diff --git a/src/Humanizer.Tests/Localisation/nb-NO/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/nb-NO/DateHumanizeTests.cs
@@ -53,14 +53,16 @@ public void HoursFromNow(int hours, string expected)
         [Theory]
         [InlineData(-2, "2 minutter siden")]
         [InlineData(-1, "ett minutt siden")]
+        [InlineData(60, "en time siden")]
         public void MinutesAgo(int minutes, string expected)
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);
         }
 
         [Theory]
         [InlineData(1, "ett minutt fra nå")]
-        [InlineData(10, "10 minutter fra nå")]
+        [InlineData(59, "59 minutter fra nå")]
+        [InlineData(60, "en time fra nå")]
         public void MinutesFromNow(int minutes, string expected)
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Future);

diff --git a/src/Humanizer.Tests/Localisation/nl/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/nl/DateHumanizeTests.cs
@@ -1,4 +1,5 @@
 using System;
+using Humanizer.Localisation;
 using Xunit;
 using Xunit.Extensions;
 
@@ -27,9 +28,10 @@ public void HoursAgo(int hours, string expected)
         [Theory]
         [InlineData(-2, "2 minuten geleden")]
         [InlineData(-1, "één minuut geleden")]
+        [InlineData(60, "één uur geleden")]
         public void MinutesAgo(int minutes, string expected)
         {
-            Assert.Equal(expected, DateTime.UtcNow.AddMinutes(minutes).Humanize());
+            DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);
         }
 
         [Theory]

diff --git a/src/Humanizer.Tests/Localisation/pl/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/pl/DateHumanizeTests.cs
@@ -110,6 +110,7 @@ public void SecondsAgo(int seconds, string expected)
         [InlineData(5, "przed 5 minutami")]
         [InlineData(6, "przed 6 minutami")]
         [InlineData(10, "przed 10 minutami")]
+        [InlineData(60, "przed godziną")]
         public void MinutesAgo(int minutes, string expected)
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);

diff --git a/src/Humanizer.Tests/Localisation/pt-BR/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/pt-BR/DateHumanizeTests.cs
@@ -27,6 +27,7 @@ public void SecondsFromNow(int seconds, string expected)
         [Theory]
         [InlineData(-2, "2 minutos atrás")]
         [InlineData(-1, "um minuto atrás")]
+        [InlineData(60, "uma hora atrás")]
         public void MinutesAgo(int minutes, string expected)
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);

diff --git a/src/Humanizer.Tests/Localisation/ro-Ro/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/ro-Ro/DateHumanizeTests.cs
@@ -32,6 +32,12 @@ public void RomanianTranslationIsCorrectFor19MinutesAgo()
             DateHumanize.Verify("acum 19 minute", 19, TimeUnit.Minute, Tense.Past);
         }
 
+        [Fact]
+        public void RomanianTranslationIsCorrectFor60MinutesAgo()
+        {
+            DateHumanize.Verify("acum o oră", 60, TimeUnit.Minute, Tense.Past);
+        }
+
         [Fact]
         public void RomanianTranslationIsCorrectFor44MinutesAgo()
         {

diff --git a/src/Humanizer.Tests/Localisation/ru-RU/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/ru-RU/DateHumanizeTests.cs
@@ -71,6 +71,7 @@ public void SecondsFromNow(int seconds, string expected)
         [InlineData(24, "24 минуты назад")]
         [InlineData(25, "25 минут назад")]
         [InlineData(40, "40 минут назад")]
+        [InlineData(60, "час назад")]
         public void MinutesAgo(int minutes, string expected)
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);

diff --git a/src/Humanizer.Tests/Localisation/sk/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/sk/DateHumanizeTests.cs
@@ -108,6 +108,7 @@ public void SecondsAgo(int seconds, string expected)
         [InlineData(5, "pred 5 minútami")]
         [InlineData(6, "pred 6 minútami")]
         [InlineData(10, "pred 10 minútami")]
+        [InlineData(60, "pred hodinou")]
         public void MinutesAgo(int minutes, string expected)
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);

diff --git a/src/Humanizer.Tests/Localisation/sl/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/sl/DateHumanizeTests.cs
@@ -106,6 +106,7 @@ public void HoursFromNow(int hours, string expected)
         [InlineData(-3, "pred 3 minutami")]
         [InlineData(-2, "pred 2 minutama")]
         [InlineData(-1, "pred eno minuto")]
+        [InlineData(60, "pred eno uro")]
         public void MinutesAgo(int minutes, string expected)
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);

diff --git a/src/Humanizer.Tests/Localisation/sr-Latn/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/sr-Latn/DateHumanizeTests.cs
@@ -30,6 +30,7 @@ public void SecondsFromNow(int seconds, string expected)
         [Theory]
         [InlineData(1, "pre minut")]
         [InlineData(10, "pre 10 minuta")]
+        [InlineData(60, "pre sat vremena")]
         public void MinutesAgo(int minutes, string expected)
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);

diff --git a/src/Humanizer.Tests/Localisation/sr/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/sr/DateHumanizeTests.cs
@@ -30,6 +30,7 @@ public void SecondsFromNow(int seconds, string expected)
         [Theory]
         [InlineData(1, "пре минут")]
         [InlineData(10, "пре 10 минута")]
+        [InlineData(60, "пре сат времена")]
         public void MinutesAgo(int minutes, string expected)
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);

diff --git a/src/Humanizer.Tests/Localisation/sv/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/sv/DateHumanizeTests.cs
@@ -69,6 +69,7 @@ public void SecondsAgo(int seconds, string expected)
         [Theory]
         [InlineData(1, "en minut sedan")]
         [InlineData(2, "för 2 minuter sedan")]
+        [InlineData(60, "en timme sedan")]
         public void MinutesAgo(int minutes, string expected)
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);

diff --git a/src/Humanizer.Tests/Localisation/tr/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/tr/DateHumanizeTests.cs
@@ -30,6 +30,7 @@ public void SecondsFromNow(int seconds, string expected)
         [Theory]
         [InlineData(1, "bir dakika önce")]
         [InlineData(10, "10 dakika önce")]
+        [InlineData(60, "bir saat önce")]
         public void MinutesAgo(int minutes, string expected)
         {
             DateHumanize.Verify(expected, minutes, TimeUnit.Minute, Tense.Past);

diff --git a/src/Humanizer/DateTimeHumanizeStrategy/DefaultDateTimeHumanizeStrategy.cs b/src/Humanizer/DateTimeHumanizeStrategy/DefaultDateTimeHumanizeStrategy.cs
@@ -33,6 +33,9 @@ public string Humanize(DateTime input, DateTime comparisonBase)
             if (ts.TotalMinutes < 45)
                 return Configurator.Formatter.DateHumanize(TimeUnit.Minute, tense, ts.Minutes);
 
+            if (ts.TotalMinutes < 60)
+                return Configurator.Formatter.DateHumanize(TimeUnit.Minute, tense, ts.Minutes);
+
             if (ts.TotalMinutes < 90)
                 return Configurator.Formatter.DateHumanize(TimeUnit.Hour, tense, 1);
 

diff --git a/src/Humanizer/FluentDate/On.Days.cs b/src/Humanizer/FluentDate/On.Days.cs
@@ -1,11 +1,13 @@
-using System;
+ 
+using System;
 
 namespace Humanizer
 {
     /// <summary>
     /// </summary>
-    public class On
+    public partial class On
     {
+
         /// <summary>
 		/// Provides fluent date accessors for January
         /// </summary>
@@ -3101,5 +3103,5 @@ public static DateTime The31st
 				get { return new DateTime(DateTime.Now.Year, 12, 31); }
 			}
 	    }
-    }
+    	}
 }