From 9552f47bb83531fc76c1d5c443c3d5c8009737f3 Mon Sep 17 00:00:00 2001
From: Oren Novotny <oren@novotny.org>
Date: Fri, 24 Jan 2014 15:45:07 -0500
Subject: [PATCH 1/5] service (auto) added for test running in vs

---
 src/Humanizer.Tests/Humanizer.Tests.csproj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Humanizer.Tests/Humanizer.Tests.csproj b/src/Humanizer.Tests/Humanizer.Tests.csproj
index 9382e1f12..5d5c5e2cd 100644
--- a/src/Humanizer.Tests/Humanizer.Tests.csproj
+++ b/src/Humanizer.Tests/Humanizer.Tests.csproj
@@ -118,6 +118,9 @@
   <ItemGroup>
     <Content Include="ApiApprover\PublicApiApprovalTest.approve_public_api.approved.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

From 353abeecafdcc4a1ba066ad02a3dd918a290bea4 Mon Sep 17 00:00:00 2001
From: Oren Novotny <oren@novotny.org>
Date: Sat, 25 Jan 2014 09:17:11 -0500
Subject: [PATCH 2/5] Add support for future dates

---
 src/Humanizer.Tests/DateHumanizeTests.cs      | 69 ++++++++++++++++++-
 src/Humanizer/DateHumanizeExtensions.cs       | 31 ++++++---
 .../Localisation/DefaultFormatter.cs          | 65 +++++++++++++++++
 src/Humanizer/Localisation/IFormatter.cs      | 13 ++++
 .../Localisation/ResourceKeys.DateHumanize.cs | 65 +++++++++++++++++
 src/Humanizer/Properties/Resources.resx       | 41 ++++++++++-
 6 files changed, 272 insertions(+), 12 deletions(-)

diff --git a/src/Humanizer.Tests/DateHumanizeTests.cs b/src/Humanizer.Tests/DateHumanizeTests.cs
index a8083655d..2e62ff4bb 100644
--- a/src/Humanizer.Tests/DateHumanizeTests.cs
+++ b/src/Humanizer.Tests/DateHumanizeTests.cs
@@ -27,10 +27,75 @@ void Verify(string expectedString, TimeSpan deltaFromNow)
             VerifyWithDateInjection(expectedString, deltaFromNow);
         }
 
+        public void SecondsFromNow()
+        {
+            Verify(string.Format(Resources.GetResource(ResourceKeys.DateHumanize.MultipleSecondsFromNow), 10), new TimeSpan(0, 0, 0, 10));
+        }
+
+        [Fact]
+        public void OneMinuteFromNow()
+        {
+            Verify(Resources.GetResource(ResourceKeys.DateHumanize.SingleMinuteFromNow), new TimeSpan(0, 0, 1, 0));
+        }
+
+        [Fact]
+        public void AFewMinutesFromNow()
+        {
+            Verify(string.Format(Resources.GetResource(ResourceKeys.DateHumanize.MultipleMinutesFromNow), 10), new TimeSpan(0, 0, 10, 0));
+        }
+
+        [Fact]
+        public void AnHourFromNow()
+        {
+            Verify(Resources.GetResource(ResourceKeys.DateHumanize.SingleHourFromNow), new TimeSpan(0, 1, 10, 0));
+        }
+
+        [Fact]
+        public void HoursFromNow()
+        {
+            Verify(string.Format(Resources.GetResource(ResourceKeys.DateHumanize.MultipleHoursFromNow), 10), new TimeSpan(0, 10, 0, 0));
+        }
+
+        [Fact]
+        public void Tomorrow()
+        {
+            Verify(Resources.GetResource(ResourceKeys.DateHumanize.SingleDayFromNow), new TimeSpan(1, 10, 0, 0));
+        }
+
+        [Fact]
+        public void AFewDaysFromNow()
+        {
+            Verify(string.Format(Resources.GetResource(ResourceKeys.DateHumanize.MultipleDaysFromNow), 10), new TimeSpan(10, 0, 0, 0));
+        }
+
+        [Fact]
+        public void OneMonthFromNow()
+        {
+            Verify(Resources.GetResource(ResourceKeys.DateHumanize.SingleMonthFromNow), new TimeSpan(30, 0, 0, 0));
+        }
+
+        [Fact]
+        public void AFewMonthsFromNow()
+        {
+            Verify(string.Format(Resources.GetResource(ResourceKeys.DateHumanize.MultipleMonthsFromNow), 2), new TimeSpan(60, 0, 0, 0));
+        }
+
+        [Fact]
+        public void OneYearFromNowIsNotAccureate()
+        {
+            Verify(Resources.GetResource(ResourceKeys.DateHumanize.SingleYearFromNow), new TimeSpan(360, 0, 0, 0));
+        }
+
+        [Fact]
+        public void OneYearFromNow()
+        {
+            Verify(Resources.GetResource(ResourceKeys.DateHumanize.SingleYearFromNow), new TimeSpan(400, 0, 0, 0));
+        }
+
         [Fact]
-        public void FutureDates()
+        public void FewYearsFromNow()
         {
-            Verify(Resources.GetResource(ResourceKeys.DateHumanize.NotYet), new TimeSpan(0, 0, 1, 0));
+            Verify(string.Format(Resources.GetResource(ResourceKeys.DateHumanize.MultipleYearsFromNow), 2), new TimeSpan(900, 0, 0, 0));
         }
 
         [Fact]
diff --git a/src/Humanizer/DateHumanizeExtensions.cs b/src/Humanizer/DateHumanizeExtensions.cs
index cc7deb7e6..c041dbb3b 100644
--- a/src/Humanizer/DateHumanizeExtensions.cs
+++ b/src/Humanizer/DateHumanizeExtensions.cs
@@ -33,40 +33,53 @@ public static string Humanize(this DateTime input, bool utcDate = true, DateTime
 
             var formatter = Configurator.Formatter;
 
-            if (input > comparisonBase)
-                return formatter.DateHumanize_NotYet();
+            var isFuture = input > comparisonBase;
 
             var ts = new TimeSpan(comparisonBase.Ticks - input.Ticks);
+            if(isFuture)
+                ts = new TimeSpan(-ts.Ticks);
+
             double delta = Math.Abs(ts.TotalSeconds);
 
-            if (delta < 1 * minute)
+
+            if (delta < 1*minute)
+            {
+                if(isFuture)
+                    return ts.Seconds == 1 ? formatter.DateHumanize_SingleSecondFromNow() : formatter.DateHumanize_MultipleSecondsFromNow(ts.Seconds);
                 return ts.Seconds == 1 ? formatter.DateHumanize_SingleSecondAgo() : formatter.DateHumanize_MultipleSecondsAgo(ts.Seconds);
+            }
 
             if (delta < 2 * minute)
-                return formatter.DateHumanize_SingleMinuteAgo();
+                return isFuture ? formatter.DateHumanize_SingleMinuteFromNow() : formatter.DateHumanize_SingleMinuteAgo();
 
             if (delta < 45 * minute)
-                return formatter.DateHumanize_MultipleMinutesAgo(ts.Minutes);
+                return isFuture ? formatter.DateHumanize_MultipleMinutesFromNow(ts.Minutes) : formatter.DateHumanize_MultipleMinutesAgo(ts.Minutes);
 
             if (delta < 90 * minute)
-                return formatter.DateHumanize_SingleHourAgo();
+                return isFuture ? formatter.DateHumanize_SingleHourFromNow() : formatter.DateHumanize_SingleHourAgo();
 
             if (delta < 24 * hour)
-                return formatter.DateHumanize_MultipleHoursAgo(ts.Hours);
+                return isFuture ? formatter.DateHumanize_MultipleHoursFromNow(ts.Hours) : formatter.DateHumanize_MultipleHoursAgo(ts.Hours);
 
             if (delta < 48 * hour)
-                return formatter.DateHumanize_SingleDayAgo();
+                return isFuture ? formatter.DateHumanize_SingleDayFromNow() : formatter.DateHumanize_SingleDayAgo();
 
             if (delta < 30 * day)
-                return formatter.DateHumanize_MultipleDaysAgo(ts.Days);
+                return isFuture ? formatter.DateHumanize_MultipleDaysFromNow(ts.Days) : formatter.DateHumanize_MultipleDaysAgo(ts.Days);
 
             if (delta < 12 * month)
             {
                 int months = Convert.ToInt32(Math.Floor((double)ts.Days / 30));
+                
+                if(isFuture)
+                    return months <= 1 ? formatter.DateHumanize_SingleMonthFromNow() : formatter.DateHumanize_MultipleMonthsFromNow(months);
                 return months <= 1 ? formatter.DateHumanize_SingleMonthAgo() : formatter.DateHumanize_MultipleMonthsAgo(months);
             }
 
             int years = Convert.ToInt32(Math.Floor((double)ts.Days / 365));
+            
+            if(isFuture)
+                return years <= 1 ? formatter.DateHumanize_SingleYearFromNow() : formatter.DateHumanize_MultipleYearsFromNow(years);
             return years <= 1 ? formatter.DateHumanize_SingleYearAgo() : formatter.DateHumanize_MultipleYearsAgo(years);
         }
     }
diff --git a/src/Humanizer/Localisation/DefaultFormatter.cs b/src/Humanizer/Localisation/DefaultFormatter.cs
index 3b90b1e63..08320fde9 100644
--- a/src/Humanizer/Localisation/DefaultFormatter.cs
+++ b/src/Humanizer/Localisation/DefaultFormatter.cs
@@ -67,6 +67,71 @@ public virtual string DateHumanize_SingleDayAgo()
             return Resources.GetResource(ResourceKeys.DateHumanize.SingleDayAgo);
         }
 
+        public virtual string DateHumanize_MultipleDaysFromNow(int numberOfDays)
+        {
+            return Format(ResourceKeys.DateHumanize.MultipleDaysFromNow, numberOfDays);
+        }
+
+        public virtual string DateHumanize_MultipleHoursFromNow(int numberOfHours)
+        {
+            return Format(ResourceKeys.DateHumanize.MultipleHoursFromNow, numberOfHours);
+        }
+
+        public virtual string DateHumanize_MultipleMinutesFromNow(int numberOfMinutes)
+        {
+            return Format(ResourceKeys.DateHumanize.MultipleMinutesFromNow, numberOfMinutes);
+        }
+
+        public virtual string DateHumanize_MultipleMonthsFromNow(int numberOfMonths)
+        {
+            return Format(ResourceKeys.DateHumanize.MultipleMonthsFromNow, numberOfMonths);
+        }
+
+        public virtual string DateHumanize_MultipleSecondsFromNow(int numberOfSeconds)
+        {
+            return Format(ResourceKeys.DateHumanize.MultipleSecondsFromNow, numberOfSeconds);
+        }
+
+        public virtual string DateHumanize_MultipleYearsFromNow(int numberOfYears)
+        {
+            return Format(ResourceKeys.DateHumanize.MultipleYearsFromNow, numberOfYears);
+        }
+
+        public virtual string DateHumanize_SingleMinuteFromNow()
+        {
+            return Resources.GetResource(ResourceKeys.DateHumanize.SingleMinuteFromNow);
+        }
+
+        public virtual string DateHumanize_SingleHourFromNow()
+        {
+            return Resources.GetResource(ResourceKeys.DateHumanize.SingleHourFromNow);
+        }
+
+        public virtual string DateHumanize_Now()
+        {
+            return Resources.GetResource(ResourceKeys.DateHumanize.Now);
+        }
+
+        public virtual string DateHumanize_SingleMonthFromNow()
+        {
+            return Resources.GetResource(ResourceKeys.DateHumanize.SingleMonthFromNow);
+        }
+
+        public virtual string DateHumanize_SingleSecondFromNow()
+        {
+            return Resources.GetResource(ResourceKeys.DateHumanize.SingleSecondFromNow);
+        }
+
+        public virtual string DateHumanize_SingleYearFromNow()
+        {
+            return Resources.GetResource(ResourceKeys.DateHumanize.SingleYearFromNow);
+        }
+
+        public virtual string DateHumanize_SingleDayFromNow()
+        {
+            return Resources.GetResource(ResourceKeys.DateHumanize.SingleDayFromNow);
+        }
+
         public virtual string TimeSpanHumanize_MultipleWeeks(int weeks)
         {
             return Format(ResourceKeys.TimeSpanHumanize.MultipleWeeks, weeks);
diff --git a/src/Humanizer/Localisation/IFormatter.cs b/src/Humanizer/Localisation/IFormatter.cs
index f5d8c2805..c9b1f22e0 100644
--- a/src/Humanizer/Localisation/IFormatter.cs
+++ b/src/Humanizer/Localisation/IFormatter.cs
@@ -20,6 +20,19 @@ public interface IFormatter
         string DateHumanize_SingleSecondAgo();
         string DateHumanize_SingleYearAgo();
         string DateHumanize_SingleDayAgo();
+        string DateHumanize_MultipleDaysFromNow(int numberOfDays);
+        string DateHumanize_MultipleHoursFromNow(int numberOfHours);
+        string DateHumanize_MultipleMinutesFromNow(int numberOfMinutes);
+        string DateHumanize_MultipleMonthsFromNow(int numberOfMonths);
+        string DateHumanize_MultipleSecondsFromNow(int numberOfSeconds);
+        string DateHumanize_MultipleYearsFromNow(int numberOfYears);
+        string DateHumanize_SingleMinuteFromNow();
+        string DateHumanize_SingleHourFromNow();
+        string DateHumanize_Now();
+        string DateHumanize_SingleMonthFromNow();
+        string DateHumanize_SingleSecondFromNow();
+        string DateHumanize_SingleYearFromNow();
+        string DateHumanize_SingleDayFromNow();
         string TimeSpanHumanize_MultipleWeeks(int weeks);
         string TimeSpanHumanize_SingleWeek();
         string TimeSpanHumanize_MultipleDays(int days);
diff --git a/src/Humanizer/Localisation/ResourceKeys.DateHumanize.cs b/src/Humanizer/Localisation/ResourceKeys.DateHumanize.cs
index 89c4126d6..99e0f6b34 100644
--- a/src/Humanizer/Localisation/ResourceKeys.DateHumanize.cs
+++ b/src/Humanizer/Localisation/ResourceKeys.DateHumanize.cs
@@ -68,6 +68,71 @@ public static string SingleDayAgo
             {
                 get { return "DateHumanize_SingleDayAgo"; }
             }
+
+            public static string MultipleDaysFromNow
+            {
+                get { return "DateHumanize_MultipleDaysFromNow"; }
+            }
+
+            public static string MultipleHoursFromNow
+            {
+                get { return "DateHumanize_MultipleHoursFromNow"; }
+            }
+
+            public static string MultipleMinutesFromNow
+            {
+                get { return "DateHumanize_MultipleMinutesFromNow"; }
+            }
+
+            public static string MultipleMonthsFromNow
+            {
+                get { return "DateHumanize_MultipleMonthsFromNow"; }
+            }
+
+            public static string MultipleSecondsFromNow
+            {
+                get { return "DateHumanize_MultipleSecondsFromNow"; }
+            }
+
+            public static string MultipleYearsFromNow
+            {
+                get { return "DateHumanize_MultipleYearsFromNow"; }
+            }
+
+            public static string SingleMinuteFromNow
+            {
+                get { return "DateHumanize_SingleMinuteFromNow"; }
+            }
+
+            public static string SingleHourFromNow
+            {
+                get { return "DateHumanize_SingleHourFromNow"; }
+            }
+
+            public static string Now
+            {
+                get { return "DateHumanize_Now"; }
+            }
+
+            public static string SingleMonthFromNow
+            {
+                get { return "DateHumanize_SingleMonthFromNow"; }
+            }
+
+            public static string SingleSecondFromNow
+            {
+                get { return "DateHumanize_SingleSecondFromNow"; }
+            }
+
+            public static string SingleYearFromNow
+            {
+                get { return "DateHumanize_SingleYearFromNow"; }
+            }
+
+            public static string SingleDayFromNow
+            {
+                get { return "DateHumanize_SingleDayFromNow"; }
+            }
         }
     }
 }
diff --git a/src/Humanizer/Properties/Resources.resx b/src/Humanizer/Properties/Resources.resx
index 1b43e46b5..a6451a575 100644
--- a/src/Humanizer/Properties/Resources.resx
+++ b/src/Humanizer/Properties/Resources.resx
@@ -195,4 +195,43 @@
   <data name="TimeSpanHumanize_SingleWeek" xml:space="preserve">
     <value>1 week</value>
   </data>
-</root>
+  <data name="DateHumanize_MultipleDaysFromNow" xml:space="preserve">
+    <value>{0} days from now</value>
+  </data>
+  <data name="DateHumanize_MultipleHoursFromNow" xml:space="preserve">
+    <value>{0} hours from now</value>
+  </data>
+  <data name="DateHumanize_MultipleMinutesFromNow" xml:space="preserve">
+    <value>{0} minutes from now</value>
+  </data>
+  <data name="DateHumanize_MultipleMonthsFromNow" xml:space="preserve">
+    <value>{0} months from now</value>
+  </data>
+  <data name="DateHumanize_MultipleSecondsFromNow" xml:space="preserve">
+    <value>{0} seconds from now</value>
+  </data>
+  <data name="DateHumanize_MultipleYearsFromNow" xml:space="preserve">
+    <value>{0} years from now</value>
+  </data>
+  <data name="DateHumanize_Now" xml:space="preserve">
+    <value>now</value>
+  </data>
+  <data name="DateHumanize_SingleDayFromNow" xml:space="preserve">
+    <value>tomorrow</value>
+  </data>
+  <data name="DateHumanize_SingleHourFromNow" xml:space="preserve">
+    <value>an hour from now</value>
+  </data>
+  <data name="DateHumanize_SingleMinuteFromNow" xml:space="preserve">
+    <value>a minute from now</value>
+  </data>
+  <data name="DateHumanize_SingleMonthFromNow" xml:space="preserve">
+    <value>one month from now</value>
+  </data>
+  <data name="DateHumanize_SingleSecondFromNow" xml:space="preserve">
+    <value>one second from now</value>
+  </data>
+  <data name="DateHumanize_SingleYearFromNow" xml:space="preserve">
+    <value>one year from now</value>
+  </data>
+</root>
\ No newline at end of file

From 9830b3608f9aed4c171ea347cdc95e929b588b06 Mon Sep 17 00:00:00 2001
From: Oren Novotny <oren@novotny.org>
Date: Thu, 30 Jan 2014 15:20:43 -0500
Subject: [PATCH 3/5] Remove all traces of NotYet

---
 .../Localisation/DateHumanizeTests.fi-FI.cs              | 9 ---------
 .../Localisation/DateHumanizeTests.nb-NO.cs              | 9 ---------
 .../Localisation/DateHumanizeTests.ru-RU.cs              | 7 -------
 src/Humanizer.Tests/Localisation/ar/DateHumanizeTests.cs | 6 ------
 src/Humanizer.Tests/Localisation/es/DateHumanizeTests.cs | 6 ------
 .../Localisation/pt-BR/DateHumanizeTests.cs              | 6 ------
 src/Humanizer/Localisation/DefaultFormatter.cs           | 5 -----
 src/Humanizer/Localisation/IFormatter.cs                 | 1 -
 src/Humanizer/Localisation/ResourceKeys.DateHumanize.cs  | 5 -----
 src/Humanizer/Properties/Resources.af.resx               | 3 ---
 src/Humanizer/Properties/Resources.ar.resx               | 4 ----
 src/Humanizer/Properties/Resources.es.resx               | 3 ---
 src/Humanizer/Properties/Resources.fi-FI.resx            | 3 ---
 src/Humanizer/Properties/Resources.fr-BE.resx            | 3 ---
 src/Humanizer/Properties/Resources.fr.resx               | 3 ---
 src/Humanizer/Properties/Resources.gr.resx               | 5 +----
 src/Humanizer/Properties/Resources.nb-NO.resx            | 3 ---
 src/Humanizer/Properties/Resources.nl-BE.resx            | 3 ---
 src/Humanizer/Properties/Resources.pt-BR.resx            | 5 +----
 src/Humanizer/Properties/Resources.resx                  | 3 ---
 src/Humanizer/Properties/Resources.ro.resx               | 3 ---
 src/Humanizer/Properties/Resources.ru.resx               | 3 ---
 22 files changed, 2 insertions(+), 96 deletions(-)

diff --git a/src/Humanizer.Tests/Localisation/DateHumanizeTests.fi-FI.cs b/src/Humanizer.Tests/Localisation/DateHumanizeTests.fi-FI.cs
index e9658881a..3ee83fb58 100644
--- a/src/Humanizer.Tests/Localisation/DateHumanizeTests.fi-FI.cs
+++ b/src/Humanizer.Tests/Localisation/DateHumanizeTests.fi-FI.cs
@@ -76,14 +76,5 @@ public void YearsAgo(int years, string expected)
             var date = DateTime.UtcNow.AddYears(years);
             Assert.Equal(expected, date.Humanize());
         }
-
-        [Fact]
-        public void NotYet()
-        {
-			// does not yet mean in future?
-            var date = DateTime.UtcNow.AddDays(1);
-
-			Assert.Equal("ei vielä", date.Humanize());
-        }
     }
 }
diff --git a/src/Humanizer.Tests/Localisation/DateHumanizeTests.nb-NO.cs b/src/Humanizer.Tests/Localisation/DateHumanizeTests.nb-NO.cs
index d9e146aed..9cfc5ff0b 100644
--- a/src/Humanizer.Tests/Localisation/DateHumanizeTests.nb-NO.cs
+++ b/src/Humanizer.Tests/Localisation/DateHumanizeTests.nb-NO.cs
@@ -76,14 +76,5 @@ public void YearsAgo(int years, string expected)
             var date = DateTime.UtcNow.AddYears(years);
             Assert.Equal(expected, date.Humanize());
         }
-
-        [Fact]
-        public void NotYet()
-        {
-			// does not yet mean in future?
-            var date = DateTime.UtcNow.AddDays(1);
-
-			Assert.Equal("ikke enda", date.Humanize());
-        }
     }
 }
diff --git a/src/Humanizer.Tests/Localisation/DateHumanizeTests.ru-RU.cs b/src/Humanizer.Tests/Localisation/DateHumanizeTests.ru-RU.cs
index ec0229503..aaf040fd6 100644
--- a/src/Humanizer.Tests/Localisation/DateHumanizeTests.ru-RU.cs
+++ b/src/Humanizer.Tests/Localisation/DateHumanizeTests.ru-RU.cs
@@ -133,12 +133,5 @@ public void NYearsAgo(int number, string expected)
             var humanize = DateTime.UtcNow.Date.AddYears(-1 * number).Humanize();
             Assert.Equal(expected, humanize);
         }
-
-        [Fact]
-        public void NotYet()
-        {
-            var humanize = DateTime.UtcNow.AddDays(1).Humanize();
-            Assert.Equal("в будущем", humanize);
-        }
     }
 }
diff --git a/src/Humanizer.Tests/Localisation/ar/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/ar/DateHumanizeTests.cs
index e5670ea82..98da12974 100644
--- a/src/Humanizer.Tests/Localisation/ar/DateHumanizeTests.cs
+++ b/src/Humanizer.Tests/Localisation/ar/DateHumanizeTests.cs
@@ -68,11 +68,5 @@ public void YearsAgo(int years, string expected)
         {
             Assert.Equal(expected, DateTime.UtcNow.AddYears(years).Humanize());
         }
-
-        [Fact]
-        public void NotYet()
-        {
-            Assert.Equal("ليس بعد", DateTime.UtcNow.AddDays(1).Humanize());
-        }
     }
 }
diff --git a/src/Humanizer.Tests/Localisation/es/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/es/DateHumanizeTests.cs
index 529a376b6..6bec389d9 100644
--- a/src/Humanizer.Tests/Localisation/es/DateHumanizeTests.cs
+++ b/src/Humanizer.Tests/Localisation/es/DateHumanizeTests.cs
@@ -67,11 +67,5 @@ public void YearsAgo(int years, string expected)
         {
             Assert.Equal(expected, DateTime.UtcNow.AddYears(years).Humanize());
         }
-
-        [Fact]
-        public void NotYet()
-        {
-            Assert.Equal("aún no", DateTime.UtcNow.AddDays(1).Humanize());
-        }
     }
 }
diff --git a/src/Humanizer.Tests/Localisation/pt-BR/DateHumanizeTests.cs b/src/Humanizer.Tests/Localisation/pt-BR/DateHumanizeTests.cs
index a9a37eae6..172a3bd02 100644
--- a/src/Humanizer.Tests/Localisation/pt-BR/DateHumanizeTests.cs
+++ b/src/Humanizer.Tests/Localisation/pt-BR/DateHumanizeTests.cs
@@ -67,11 +67,5 @@ public void YearsAgo(int years, string expected)
         {
             Assert.Equal(expected, DateTime.UtcNow.AddYears(years).Humanize());
         }
-
-        [Fact]
-        public void NotYet()
-        {
-            Assert.Equal("ainda não", DateTime.UtcNow.AddDays(1).Humanize());
-        }
     }
 }
diff --git a/src/Humanizer/Localisation/DefaultFormatter.cs b/src/Humanizer/Localisation/DefaultFormatter.cs
index 08320fde9..02d95477c 100644
--- a/src/Humanizer/Localisation/DefaultFormatter.cs
+++ b/src/Humanizer/Localisation/DefaultFormatter.cs
@@ -42,11 +42,6 @@ public virtual string DateHumanize_SingleHourAgo()
             return Resources.GetResource(ResourceKeys.DateHumanize.SingleHourAgo);
         }
 
-        public virtual string DateHumanize_NotYet()
-        {
-            return Resources.GetResource(ResourceKeys.DateHumanize.NotYet);
-        }
-
         public virtual string DateHumanize_SingleMonthAgo()
         {
             return Resources.GetResource(ResourceKeys.DateHumanize.SingleMonthAgo);
diff --git a/src/Humanizer/Localisation/IFormatter.cs b/src/Humanizer/Localisation/IFormatter.cs
index c9b1f22e0..2f28f88fd 100644
--- a/src/Humanizer/Localisation/IFormatter.cs
+++ b/src/Humanizer/Localisation/IFormatter.cs
@@ -15,7 +15,6 @@ public interface IFormatter
         string DateHumanize_MultipleYearsAgo(int numberOfYears);
         string DateHumanize_SingleMinuteAgo();
         string DateHumanize_SingleHourAgo();
-        string DateHumanize_NotYet();
         string DateHumanize_SingleMonthAgo();
         string DateHumanize_SingleSecondAgo();
         string DateHumanize_SingleYearAgo();
diff --git a/src/Humanizer/Localisation/ResourceKeys.DateHumanize.cs b/src/Humanizer/Localisation/ResourceKeys.DateHumanize.cs
index 99e0f6b34..b4ae2a721 100644
--- a/src/Humanizer/Localisation/ResourceKeys.DateHumanize.cs
+++ b/src/Humanizer/Localisation/ResourceKeys.DateHumanize.cs
@@ -44,11 +44,6 @@ public static string SingleHourAgo
                 get { return "DateHumanize_SingleHourAgo"; }
             }
 
-            public static string NotYet
-            {
-                get { return "DateHumanize_NotYet"; }
-            }
-
             public static string SingleMonthAgo
             {
                 get { return "DateHumanize_SingleMonthAgo"; }
diff --git a/src/Humanizer/Properties/Resources.af.resx b/src/Humanizer/Properties/Resources.af.resx
index f9b347618..9197486c6 100644
--- a/src/Humanizer/Properties/Resources.af.resx
+++ b/src/Humanizer/Properties/Resources.af.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="DateHumanize_NotYet" xml:space="preserve">
-    <value>nog nie</value>
-  </data>
   <data name="DateHumanize_SingleSecondAgo" xml:space="preserve">
     <value>'n sekonde gelede</value>
   </data>
diff --git a/src/Humanizer/Properties/Resources.ar.resx b/src/Humanizer/Properties/Resources.ar.resx
index 8a69e9931..d70d8b41c 100644
--- a/src/Humanizer/Properties/Resources.ar.resx
+++ b/src/Humanizer/Properties/Resources.ar.resx
@@ -117,10 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="DateHumanize_NotYet" xml:space="preserve">
-    <value>ليس بعد</value>
-    <comment>not yet</comment>
-  </data>
   <data name="DateHumanize_SingleSecondAgo" xml:space="preserve">
     <value>منذ ثانية واحدة</value>
     <comment>one second ago</comment>
diff --git a/src/Humanizer/Properties/Resources.es.resx b/src/Humanizer/Properties/Resources.es.resx
index 4d72c17ca..1eaaef69c 100644
--- a/src/Humanizer/Properties/Resources.es.resx
+++ b/src/Humanizer/Properties/Resources.es.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="DateHumanize_NotYet" xml:space="preserve">
-    <value>aún no</value>
-  </data>
   <data name="DateHumanize_SingleSecondAgo" xml:space="preserve">
     <value>hace un segundo</value>
   </data>
diff --git a/src/Humanizer/Properties/Resources.fi-FI.resx b/src/Humanizer/Properties/Resources.fi-FI.resx
index 1ee9b70c5..0d74c8432 100644
--- a/src/Humanizer/Properties/Resources.fi-FI.resx
+++ b/src/Humanizer/Properties/Resources.fi-FI.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="DateHumanize_NotYet" xml:space="preserve">
-    <value>ei vielä</value>
-  </data>
   <data name="DateHumanize_SingleSecondAgo" xml:space="preserve">
     <value>sekuntti sitten</value>
   </data>
diff --git a/src/Humanizer/Properties/Resources.fr-BE.resx b/src/Humanizer/Properties/Resources.fr-BE.resx
index 675a24aaf..c7ab8b23f 100644
--- a/src/Humanizer/Properties/Resources.fr-BE.resx
+++ b/src/Humanizer/Properties/Resources.fr-BE.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="DateHumanize_NotYet" xml:space="preserve">
-    <value>pas encore</value>
-  </data>
   <data name="DateHumanize_SingleSecondAgo" xml:space="preserve">
     <value>il y a une seconde</value>
   </data>
diff --git a/src/Humanizer/Properties/Resources.fr.resx b/src/Humanizer/Properties/Resources.fr.resx
index 675a24aaf..c7ab8b23f 100644
--- a/src/Humanizer/Properties/Resources.fr.resx
+++ b/src/Humanizer/Properties/Resources.fr.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="DateHumanize_NotYet" xml:space="preserve">
-    <value>pas encore</value>
-  </data>
   <data name="DateHumanize_SingleSecondAgo" xml:space="preserve">
     <value>il y a une seconde</value>
   </data>
diff --git a/src/Humanizer/Properties/Resources.gr.resx b/src/Humanizer/Properties/Resources.gr.resx
index f09a5d218..0080c4ae0 100644
--- a/src/Humanizer/Properties/Resources.gr.resx
+++ b/src/Humanizer/Properties/Resources.gr.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="DateHumanize_NotYet" xml:space="preserve">
-    <value>όχι ακόμη</value>
-  </data>
   <data name="DateHumanize_SingleSecondAgo" xml:space="preserve">
     <value>πριν από ένα δευτερόλεπτο</value>
   </data>
@@ -156,4 +153,4 @@
   <data name="DateHumanize_MultipleYearsAgo" xml:space="preserve">
     <value>πριν από {0} χρόνια</value>
   </data>
-</root>
+</root>
\ No newline at end of file
diff --git a/src/Humanizer/Properties/Resources.nb-NO.resx b/src/Humanizer/Properties/Resources.nb-NO.resx
index 9d0ae1143..c2a7b8c10 100644
--- a/src/Humanizer/Properties/Resources.nb-NO.resx
+++ b/src/Humanizer/Properties/Resources.nb-NO.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="DateHumanize_NotYet" xml:space="preserve">
-    <value>ikke enda</value>
-  </data>
   <data name="DateHumanize_SingleSecondAgo" xml:space="preserve">
     <value>et sekund siden</value>
   </data>
diff --git a/src/Humanizer/Properties/Resources.nl-BE.resx b/src/Humanizer/Properties/Resources.nl-BE.resx
index 840ed2da6..89d7e6a8a 100644
--- a/src/Humanizer/Properties/Resources.nl-BE.resx
+++ b/src/Humanizer/Properties/Resources.nl-BE.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="DateHumanize_NotYet" xml:space="preserve">
-    <value>nog niet</value>
-  </data>
   <data name="DateHumanize_SingleSecondAgo" xml:space="preserve">
     <value>één seconde geleden</value>
   </data>
diff --git a/src/Humanizer/Properties/Resources.pt-BR.resx b/src/Humanizer/Properties/Resources.pt-BR.resx
index a27080345..e7d3f029e 100644
--- a/src/Humanizer/Properties/Resources.pt-BR.resx
+++ b/src/Humanizer/Properties/Resources.pt-BR.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="DateHumanize_NotYet" xml:space="preserve">
-    <value>ainda não</value>
-  </data>
   <data name="DateHumanize_SingleSecondAgo" xml:space="preserve">
     <value>um segundo atrás</value>
   </data>
@@ -195,4 +192,4 @@
   <data name="TimeSpanHumanize_SingleWeek" xml:space="preserve">
     <value>1 semana</value>
   </data>
-</root>
+</root>
\ No newline at end of file
diff --git a/src/Humanizer/Properties/Resources.resx b/src/Humanizer/Properties/Resources.resx
index a6451a575..cbd99ff1e 100644
--- a/src/Humanizer/Properties/Resources.resx
+++ b/src/Humanizer/Properties/Resources.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="DateHumanize_NotYet" xml:space="preserve">
-    <value>not yet</value>
-  </data>
   <data name="DateHumanize_SingleSecondAgo" xml:space="preserve">
     <value>one second ago</value>
   </data>
diff --git a/src/Humanizer/Properties/Resources.ro.resx b/src/Humanizer/Properties/Resources.ro.resx
index b577c9154..4c61c5524 100644
--- a/src/Humanizer/Properties/Resources.ro.resx
+++ b/src/Humanizer/Properties/Resources.ro.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="DateHumanize_NotYet" xml:space="preserve">
-    <value>nu încă</value>
-  </data>
   <data name="DateHumanize_SingleSecondAgo" xml:space="preserve">
     <value>acum o secundă</value>
   </data>
diff --git a/src/Humanizer/Properties/Resources.ru.resx b/src/Humanizer/Properties/Resources.ru.resx
index 5afefbb2e..43e49b218 100644
--- a/src/Humanizer/Properties/Resources.ru.resx
+++ b/src/Humanizer/Properties/Resources.ru.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="DateHumanize_NotYet" xml:space="preserve">
-    <value>в будущем</value>
-  </data>
   <data name="DateHumanize_SingleSecondAgo" xml:space="preserve">
     <value>секунду назад</value>
   </data>

From 6dc7f66d042eb0d9d9bcf8ab439fa8d90a2cb82c Mon Sep 17 00:00:00 2001
From: Oren Novotny <oren@novotny.org>
Date: Thu, 30 Jan 2014 15:24:14 -0500
Subject: [PATCH 4/5] Add missing Fact attribute and OneSecondFromNow test

---
 src/Humanizer.Tests/DateHumanizeTests.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Humanizer.Tests/DateHumanizeTests.cs b/src/Humanizer.Tests/DateHumanizeTests.cs
index 2e62ff4bb..801c8a92c 100644
--- a/src/Humanizer.Tests/DateHumanizeTests.cs
+++ b/src/Humanizer.Tests/DateHumanizeTests.cs
@@ -27,6 +27,13 @@ void Verify(string expectedString, TimeSpan deltaFromNow)
             VerifyWithDateInjection(expectedString, deltaFromNow);
         }
 
+        [Fact]
+        public void OneSecondFromNow()
+        {
+            Verify(Resources.GetResource(ResourceKeys.DateHumanize.SingleSecondFromNow), new TimeSpan(0, 0, 0, 1));
+        }
+
+        [Fact]
         public void SecondsFromNow()
         {
             Verify(string.Format(Resources.GetResource(ResourceKeys.DateHumanize.MultipleSecondsFromNow), 10), new TimeSpan(0, 0, 0, 10));
@@ -103,7 +110,7 @@ public void JustNow()
         {
             Verify(Resources.GetResource(ResourceKeys.DateHumanize.SingleSecondAgo), new TimeSpan(0, 0, 0, -1));
         }
-
+        
         [Fact]
         public void SecondsAgo()
         {

From b9b96da31acfbfd60c4d2b1c2d4a69d91c230357 Mon Sep 17 00:00:00 2001
From: Oren Novotny <oren@novotny.org>
Date: Thu, 30 Jan 2014 15:32:45 -0500
Subject: [PATCH 5/5] Fix up formatting

---
 src/Humanizer/DateHumanizeExtensions.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Humanizer/DateHumanizeExtensions.cs b/src/Humanizer/DateHumanizeExtensions.cs
index c041dbb3b..fd30d4130 100644
--- a/src/Humanizer/DateHumanizeExtensions.cs
+++ b/src/Humanizer/DateHumanizeExtensions.cs
@@ -41,11 +41,11 @@ public static string Humanize(this DateTime input, bool utcDate = true, DateTime
 
             double delta = Math.Abs(ts.TotalSeconds);
 
-
             if (delta < 1*minute)
             {
                 if(isFuture)
                     return ts.Seconds == 1 ? formatter.DateHumanize_SingleSecondFromNow() : formatter.DateHumanize_MultipleSecondsFromNow(ts.Seconds);
+
                 return ts.Seconds == 1 ? formatter.DateHumanize_SingleSecondAgo() : formatter.DateHumanize_MultipleSecondsAgo(ts.Seconds);
             }
 
@@ -73,6 +73,7 @@ public static string Humanize(this DateTime input, bool utcDate = true, DateTime
                 
                 if(isFuture)
                     return months <= 1 ? formatter.DateHumanize_SingleMonthFromNow() : formatter.DateHumanize_MultipleMonthsFromNow(months);
+
                 return months <= 1 ? formatter.DateHumanize_SingleMonthAgo() : formatter.DateHumanize_MultipleMonthsAgo(months);
             }
 
@@ -80,6 +81,7 @@ public static string Humanize(this DateTime input, bool utcDate = true, DateTime
             
             if(isFuture)
                 return years <= 1 ? formatter.DateHumanize_SingleYearFromNow() : formatter.DateHumanize_MultipleYearsFromNow(years);
+
             return years <= 1 ? formatter.DateHumanize_SingleYearAgo() : formatter.DateHumanize_MultipleYearsAgo(years);
         }
     }