Ticket #2675: timesince.diff

django/utils/timesince.py

@@ -32 +32 @@
     # ignore microsecond part of 'd' since we removed it from 'now'
     delta = now - (d - datetime.timedelta(0, 0, d.microsecond))
     since = delta.days * 24 * 60 * 60 + delta.seconds
-    for i, (seconds, name) in enumerate(chunks):
-        count = since // seconds
-        if count != 0:
-            break
-    s = ugettext('%(number)d %(type)s') % {'number': count, 'type': name(count)}
-    if i + 1 < len(chunks):
-        # Now get the second item
-        seconds2, name2 = chunks[i + 1]
-        count2 = (since - (seconds * count)) // seconds2
-        if count2 != 0:
-            s += ugettext(', %(number)d %(type)s') % {'number': count2, 'type': name2(count2)}
+    if since < 0:
+        s = u'0 ' + ugettext('minutes')
+    else:
+        for i, (seconds, name) in enumerate(chunks):
+            count = since // seconds
+            if count != 0:
+                break
+        s = ugettext('%(number)d %(type)s') % {'number': count, 'type': name(count)}
+        if i + 1 < len(chunks):
+            # Now get the second item
+            seconds2, name2 = chunks[i + 1]
+            count2 = (since - (seconds * count)) // seconds2
+            if count2 != 0:
+                s += ugettext(', %(number)d %(type)s') % {'number': count2, 'type': name2(count2)}
     return s
 
 def timeuntil(d, now=None):

docs/templates.txt

@@ -1272 +1272 @@
 June 2006, and ``comment_date`` is a date instance for 08:00 on 1 June 2006,
 then ``{{ comment_date|timesince:blog_date }}`` would return "8 hours".
 
+If the time interval is small enough, it will be expressed in minutes.
+"0 minutes" will be returned for any date that is in the future relative
+to the comparison point.
+
 timeuntil
 ~~~~~~~~~
 
@@ -1284 +1288 @@
 the comparison point (instead of *now*). If ``from_date`` contains 22 June
 2006, then ``{{ conference_date|timeuntil:from_date }}`` will return "7 days".
 
+If the time interval is small enough, it will be expressed in minutes.
+"0 minutes" will be returned for any date that is in the past relative to
+the comparison point.
+
 title
 ~~~~~