Ticket #2053: timesince.diff

django/utils/timesince.py

@@ -47 +47 @@
-            s += ', %d %s' % (count2, name2(count2))
-    return s
-
-
+, now=None
-    """
-    Like timesince, but returns a string measuring the time until
-    the given time.
-    """
-
+
+
-    return timesince(now, d)

django/template/defaultfilters.py

@@ -341 +341 @@
-        arg = settings.TIME_FORMAT
-    return time_format(value, arg)
-
-
+, arg=None
-    'Formats a date as the time since that date (i.e. "4 days, 6 hours")'
-    from django.utils.timesince import timesince
-
+
+
+
+
-
+def timeuntil(value, arg=None):
+    'Formats a date as the time until that date (i.e. "4 days, 6 hours")'
+    from django.utils.timesince import timesince
+    from datetime import datetime
+    if arg:
+        return timesince(value, arg)
+    else:
+        return timesince(value, datetime.now())
+
+
-###################
-# LOGIC           #
-###################
@@ -479 +492 @@
-register.filter(striptags)
-register.filter(time)
-register.filter(timesince)
+register.filter(timeuntil)
-register.filter(title)
-register.filter(truncatewords)
-register.filter(unordered_list)

tests/othertests/templates.py

@@ -4 +4 @@
-from django import template
-from django.template import loader
-from django.utils.translation import activate, deactivate, install
-
+, timedelta
-import traceback
-
-#################################
@@ -57 +57 @@
-    def method(self):
-        return "OtherClass.method"
-
+# NOW used by timesince tag tests.
+NOW = datetime.now()
+
-# SYNTAX --
-# 'template_name': ('template contents', 'context dict', 'expected string output' or Exception class)
-TEMPLATE_TESTS = {
@@ -449 +452 @@
-    'now02' : ('{% now "j "n" Y"%}', {}, template.TemplateSyntaxError),
-#    'now03' : ('{% now "j \"n\" Y"%}', {}, str(datetime.now().day) + '"' + str(datetime.now().month) + '"' + str(datetime.now().year)),
-#    'now04' : ('{% now "j \nn\n Y"%}', {}, str(datetime.now().day) + '\n' + str(datetime.now().month) + '\n' + str(datetime.now().year))
+
+    ### TIMESINCE TAG ##################################################
+    # Default compare with datetime.now()
+    'timesince01' : ('{{ a|timesince }}', {'a':datetime.now()}, '0 minutes'),
+    'timesince02' : ('{{ a|timesince }}', {'a':(datetime.now() - timedelta(days=1))}, '1 day'),
+
+    # Compare to a given parameter
+    'timesince03' : ('{{ a|timesince:b }}', {'a':NOW + timedelta(days=2), 'b':NOW + timedelta(days=1)}, '1 day'),
+    'timesince04' : ('{{ a|timesince:b }}', {'a':NOW + timedelta(days=2), 'b':NOW + timedelta(days=2)}, '0 minutes'),
+
+    ### TIMEUNTIL TAG ##################################################
+    # Default compare with datetime.now()
+    'timeuntil01' : ('{{ a|timeuntil }}', {'a':datetime.now()}, '0 minutes'),
+    'timeuntil02' : ('{{ a|timeuntil }}', {'a':(datetime.now() - timedelta(days=1))}, '1 day'),
+
+    # Compare to a given parameter
+    'timeuntil03' : ('{{ a|timeuntil:b }}', {'a':NOW - timedelta(days=2), 'b':NOW - timedelta(days=1)}, '1 day'),
+    'timeuntil04' : ('{{ a|timeuntil:b }}', {'a':NOW - timedelta(days=2), 'b':NOW - timedelta(days=2)}, '0 minutes'),
-}
-
-def test_template_loader(template_name, template_dirs=None):