Ticket #3311: natural_day_v4.diff

contrib/humanize/templatetags/humanize.py

@@ -1 +1 @@
 from django import template
+from django.utils.translation import gettext as _
+from django.template import defaultfilters
+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, arg=None):
+    """
+    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
+    delta = value - date.today()
+    if delta.days == 0:
+        return _('today')
+    elif delta.days == 1:
+        return _('tomorrow')
+    elif delta.days == -1:
+        return _('yesterday')
+    return defaultfilters.date(value, arg)
+register.filter(naturalday)