Ticket #7443: timesince.diff

django/template/defaultfilters.py

@@ -643 +643 @@
     if not value:
         return u''
     if arg:
-        return timesince(arg, value)
+        return timesince(value, arg)
     return timesince(value)
 timesince.is_safe = False
 

tests/regressiontests/defaultfilters/tests.py

@@ -352 +352 @@
 >>> timesince(datetime.datetime.now() - datetime.timedelta(1))
 u'1 day'
 
+>>> timesince(datetime.datetime(2005, 12, 29), datetime.datetime(2005, 12, 30))
+u'1 day'
+
+>>> timeuntil(datetime.datetime.now() + datetime.timedelta(1))
+u'1 day'
+
+>>> timeuntil(datetime.datetime(2005, 12, 30), datetime.datetime(2005, 12, 29))
+u'1 day'
+
 >>> default(u"val", u"default")
 u'val'