Ticket #3311: natural_day_r4537.diff

django/contrib/humanize/templatetags/humanize.py

@@ -1 +1 @@
 from django import template
+from django.utils.translation import gettext as _
+from django.utils.dateformat import DateFormat
+from django.conf import settings
+from datetime import date, timedelta
 import re
 
 register = template.Library()
@@ -62 +66 @@
         return value
     return ('one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine')[value-1]
 register.filter(apnumber)
+
+def naturalday(value):
+    """
+    For date values that are tomorrow, today or yesterday compared to
+    present day returns representing string. Otherwise, returns a string
+    formatted according to settings.DATE_FORMAT.
+    """
+    try: 
+        value = date(value.year, value.month, value.day)
+    except AttributeError:
+        # Passed value wasn't a date object
+        return value
+    except ValueError:
+        # Date arguments out of range
+        return value
+    today = date.today()
+    delta = timedelta(days=1)
+    if value == today:
+        return _('today')
+    elif value == today + delta:
+        return _('tomorrow')
+    elif value == today - delta:
+        return _('yesterday')
+    return DateFormat(value).format(settings.DATE_FORMAT)
+register.filter(naturalday)

tests/regressiontests/humanize/tests.py

@@ +1 @@
+# Quick tests for the humanize templatefilters (django.contrib.humanize)
+
+from django.template import Template, Context, add_to_builtins
+from django.conf import settings
+from django.utils.dateformat import DateFormat
+from django.utils.translation import gettext as _
+from datetime import timedelta, date
+import unittest
+
+add_to_builtins('django.contrib.humanize.templatetags.humanize')
+
+class TemplateTest(unittest.TestCase):
+    def test_naturalday(self):
+        
+        today = date.today()
+        yesterday = today - timedelta(days=1)
+        tomorrow = today + timedelta(days=1)
+        someday = today - timedelta(days=10)
+        notdate = "I'm not a date value"
+
+        t_today = Template('{{ today|naturalday }}')
+        t_tomorrow = Template('{{ tomorrow|naturalday }}')
+        t_yesterday = Template('{{ yesterday|naturalday }}')
+        t_someday = Template('{{ someday|naturalday }}')
+        t_notdate = Template('{{ notdate|naturalday }}')
+
+        rendered_today = t_today.render(Context(locals())).strip()
+        self.assertEqual(rendered_today, _('today'))
+
+        rendered_yesterday = t_yesterday.render(Context(locals())).strip()
+        self.assertEqual(rendered_yesterday, _('yesterday'))
+
+        rendered_tomorrow = t_tomorrow.render(Context(locals())).strip()
+        self.assertEqual(rendered_tomorrow, _('tomorrow'))
+
+        rendered_someday = t_someday.render(Context(locals())).strip()
+        self.assertEqual(rendered_someday, DateFormat(someday).format(settings.DATE_FORMAT))
+
+        rendered_notdate = t_notdate.render(Context(locals())).strip()
+        self.assertEqual(rendered_notdate, "I'm not a date value")
+        

tests/regressiontests/humanize/models.py

@@ +1 @@
+