Changeset 90

Timestamp:

10/25/07 16:41:38 (15 months ago)

Author:

steadicat

Message:

Added rough human date formatting.

Files:

• django/trunk/contrib/humanise/templatetags/humanise.py (modified) (2 diffs)

django/trunk/contrib/humanise/templatetags/humanise.py

@@ -1 @@
-import datetime
+if __name__=='__main__':
+    import sys, os
+    os.chdir('../../..')
+    sys.path.append('unicoders-contrib')
+
+from datetime import datetime, date
+from dateutil.relativedelta import relativedelta as delta
 
 from django import template
@@ -18 +24 @@
         # Date is in the future; return formatted date.
         return value.strftime("%B %d, %Y")
+
+class HumanDelta(object):
+
+    fields = ['year', 'month', 'week', 'day']
+
+    def __init__(self, delta, simplify=True):
+        self.year = delta.years
+        self.month = delta.months
+        if delta.days >= 0:
+            self.week, self.day = divmod(delta.days, 7)
+        else:
+            self.week, self.day = divmod(-delta.days, 7)
+            self.week = -self.week
+            self.day = -self.day
+
+        self.format = '%s'
+        for field in self.fields:
+            if getattr(self, field) is not 0:
+                if getattr(self, field) > 0:
+                    self.format = 'in %s'
+                else:
+                    self.format = '%s ago'
+                    setattr(self, field, -getattr(self, field))
+
+        if simplify:
+            self.simplify('day', 'week', 7)
+            self.simplify('week', 'month', 4.4)
+            self.simplify('month', 'year', 12)
+
+    def simplify(self, fro, to, factor):
+        ton = getattr(self, to)
+        if ton > 0:
+            diff = round(getattr(self, fro)*1.0/factor)
+            setattr(self, to, ton+diff)
+            setattr(self, fro, 0)
+
+    def field(self, name):
+        n = getattr(self, name)
+        if n == 0:
+            return None
+        elif n == 1:
+            return '1 %s' % name
+        else:
+            return '%d %ss' % (n, name)
+
+    def __str__(self):
+        fields = [self.field(f) for f in self.fields]
+        while None in fields: fields.remove(None)
+        if not fields: return 'today'
+        return self.format % ', '.join(fields[:-2] + [' and '.join(fields[-2:])])
+
+@register.filter
+def humandate(value):
+    """
+    Returns number of days between today and value.
+
+    >>> from datetime import date
+    >>> from dateutil.relativedelta import relativedelta as delta
+    >>> today = date.today()
+
+
+    >>> humandate( today )
+    'today'
+
+    >>> humandate( today + delta(years=+1) )
+    'in 1 year'
+
+    Year-month crossover.
+
+    >>> humandate( today + delta(months=+12) )
+    'in 1 year'
+    >>> humandate( today + delta(months=+11) )
+    'in 11 months'
+
+    Month-month crossover.
+
+    >>> humandate( today + delta( months=+6, days=+16 ))
+    'in 7 months'
+    >>> humandate( today + delta( months=+6, days=+15 ))
+    'in 6 months'
+    >>> humandate( today + delta( months=+6 ))
+    'in 6 months'
+    >>> humandate( today + delta( months=+6, days=-15 ))
+    'in 6 months'
+    >>> humandate( today + delta( months=+6, days=-16 ))
+    'in 5 months'
+
+    Month-week crossover.
+
+    >>> humandate( today + delta(days=31) )
+    'in 1 month'
+    >>> humandate( today + delta(days=30) )
+    'in 1 month'
+    >>> humandate( today + delta(days=29) )
+    'in 4 weeks'
+    >>> humandate( today + delta(days=28) )
+    'in 4 weeks'
+
+    Week-week crossover.
+
+    >>> humandate( today + delta(days=7+4) )
+    'in 2 weeks'
+    >>> humandate( today + delta(days=7+3) )
+    'in 1 week'
+
+    Week-day crossover.
+
+    >>> humandate( today + delta(days=7) )
+    'in 1 week'
+    >>> humandate( today + delta(days=6) )
+    'in 6 days'
+
+    Day-day-tomorrow crossover.
+
+    >>> humandate( today + delta(days=3) )
+    'in 3 days'
+    >>> humandate( today + delta(days=2) )
+    'in 2 days'
+    >>> humandate( today + delta(days=1) )
+    'tomorrow'
+
+    >>> humandate( today - delta(days=2) )
+    '2 days ago'
+
+    """
+    if not value: return 'None'
+    today = date.today()
+    return str(HumanDelta(delta(value, today)))
+
+@register.filter
+def humanfulldate(value):
+    if not value: return 'None'
+    today = date.today()
+    return str(HumanDelta(delta(value, today), simplify=False))
+
+if __name__=='__main__':
+    import doctest
+    doctest.testmod()
+