Changeset 255 for trunk/datetime

Timestamp:

07/04/08 15:10:54 (2 years ago)

Author:

akaihola

Message:

[ambidatetime] Re-factored the duration formatting filter and added one with an alternate syntax (apostrophe for minutes).

Files:

• trunk/datetime/templatetags/ambidatetime.py (modified) (3 diffs)

trunk/datetime/templatetags/ambidatetime.py

@@ -5 +5 @@
 from django.utils.translation import ungettext
 from django.template import Library
+from django.utils.safestring import mark_safe
 register = Library()
 
@@ -40 +41 @@
 
 
-@register.filter
-def durationHMIN(value):
+def format_duration(value, hour_symbol, minute_symbol):
     try:
         value = Duration(value)
@@ -47 +47 @@
         pass
     if value.hour and value.minute:
-        return '%dh%dmin' % (value.hour, value.minute)
+        return '%d%s%d%s' % (
+            value.hour, hour_symbol, value.minute, minute_symbol)
     elif value.hour:
-        return '%dh' % value.hour
+        return '%d%s' % (value.hour, hour_symbol)
     else:
-        return '%dmin' % value.minute
+        return '%d%s' % (value.minute, minute_symbol)
+
+
+@register.filter
+def durationHMIN(value):
+    """
+    >>> from datetime import timedelta
+    >>> print durationHMIN(timedelta(0, 7205))
+    2h
+    >>> print durationHMIN(timedelta(0, 3590))
+    59min
+    >>> print durationHMIN(timedelta(0, 359))
+    5min
+    """
+    return format_duration(value, 'h', 'min')
+
+
+@register.filter
+def durationHMINsymb(value):
+    """
+    >>> from datetime import timedelta
+    >>> print durationHMINsymb(timedelta(0, 7205))
+    2h
+    >>> print durationHMINsymb(timedelta(0, 3590))
+    59'
+    >>> print durationHMINsymb(timedelta(0, 359))
+    5'
+    """
+    return mark_safe(format_duration(value, "h", "'"))
+durationHMINsymb.is_safe = True
+
+
+if __name__ == '__main__':
+    from doctest import testmod
+    testmod()