Ticket #12771: bug_12771.diff

django/contrib/humanize/templatetags/humanize.py

@@ -2 +2 @@
 from django.utils.encoding import force_unicode
 from django import template
 from django.template import defaultfilters
-from datetime import date
+from datetime import date, datetime
 import re
 
 register = template.Library()
@@ -97 +97 @@
         return _(u'yesterday')
     return defaultfilters.date(value, arg)
 register.filter(naturalday)
+
+def naturaltime(value, arg=None):
+    """
+    For date and time values shows how many seconds, minutes or hours ago compared to
+    current timestamp returns representing string. Otherwise, returns a string
+    formatted according to settings.DATE_FORMAT
+    """
+    try:
+        value = datetime(value.year, value.month, value.day, value.hour, value.minute, value.second)
+    except AttributeError:
+        return value
+    except ValueError:
+        return value
+    
+    delta = datetime.now() - value
+    if delta.days != 0:
+        value = date(value.year, value.month, value.day)
+        return naturalday(value, arg)
+    elif delta.seconds == 0:
+        return _(u'now')
+    elif delta.seconds < 60:
+        return _(u"%s seconds ago" % (delta.seconds))
+    elif delta.seconds / 60 < 2:
+        return _(r'a minute ago')
+    elif delta.seconds / 60 < 60:
+        return _(u"%s minutes ago" % (delta.seconds/60))
+    elif delta.seconds / 60 / 60 < 2:
+        return _(u'an hour ago')
+    elif delta.seconds / 60 / 60 < 24:
+        return _(u"%s hours ago" % (delta.seconds/60/60))
+    return naturalday(value, arg)
+register.filter(naturaltime)

tests/regressiontests/humanize/tests.py

@@ -1 +1 @@
 import unittest
-from datetime import timedelta, date
+from datetime import timedelta, date, datetime
 from django.template import Template, Context, add_to_builtins
 from django.utils.dateformat import DateFormat
 from django.utils.translation import ugettext as _
@@ -54 +54 @@
 
     def test_naturalday(self):
         from django.template import defaultfilters
-        today = date.today()
+        today = datetime.now()
         yesterday = today - timedelta(days=1)
         tomorrow = today + timedelta(days=1)
         someday = today - timedelta(days=10)
@@ -66 +66 @@
                        someday_result, u"I'm not a date value")
         self.humanize_tester(test_list, result_list, 'naturalday')
 
+    def test_naturaltime(self):
+        from django.template import defaultfilters
+        now = datetime.now()
+        seconds_ago = now - timedelta(seconds=30)
+        a_minute_ago = now - timedelta(minutes=1, seconds=30)
+        minutes_ago = now - timedelta(minutes=2)
+        an_hour_ago = now - timedelta(hours=1, minutes=30, seconds=30)
+        hours_ago = now - timedelta(hours=23, minutes=50, seconds=50)
+
+        test_list = (now, a_minute_ago, an_hour_ago)
+        result_list = (_(u'now'), _(u'a minute ago'), _(u'an hour ago'))
+        self.humanize_tester(test_list, result_list, 'naturaltime')
+        
+        t = Template('{{ seconds_ago|%s }}' % 'naturaltime')
+        rendered = t.render(Context(locals())).strip()
+        self.assertTrue(u' seconds ago' in rendered)
+
+        t = Template('{{ minutes_ago|%s }}' % 'naturaltime')
+        rendered = t.render(Context(locals())).strip()
+        self.assertTrue(u' minutes ago' in rendered)
+
+        t = Template('{{ hours_ago|%s }}' % 'naturaltime')
+        rendered = t.render(Context(locals())).strip()
+        self.assertTrue(u' hours ago' in rendered)
+
+
 if __name__ == '__main__':
     unittest.main()