Merged utils from m1.

utils/dateformat.py

@@ -3,6 +3,8 @@ from __future__ import unicode_literals
 # Erik Stein <code@classlibrary.net>, 2016
 """
 Extends django.utils.dateformat
+
+# TODO Describe custom formats
 """
 
 
@@ -15,6 +17,10 @@ from django.utils.encoding import force_text
 from django.utils.translation import get_language, ugettext_lazy as _
 
 
+# TODO Get DEFAULT_VARIANT from settings
+DEFAULT_VARIANT = 'SHORT'
+
+
 # Adding "q"
 re_formatchars = re.compile(r'(?<!\\)([aAbBcdDeEfFgGhHiIjlLmMnNoOPqrsStTUuwWyYzZ])')
 
@@ -60,13 +66,13 @@ def date_format(value, format=None, use_l10n=None):
 
 def _normalize_variant(variant):
     if variant.lower() not in ('short', 'long', ''):
-        variant = 'short'
+        variant = DEFAULT_VARIANT
     if variant and not variant.endswith("_"):
         variant = variant + "_"
     return variant.upper()
 
 
-def format_date_range(from_date, to_date, variant='short'):
+def format_date_range(from_date, to_date, variant=DEFAULT_VARIANT):
     """
     >>> import datetime
     >>> format_date_range(datetime.date(2009,1,15), datetime.date(2009,1,20))
@@ -112,7 +118,7 @@ def format_date_range(from_date, to_date, variant='short'):
         return separator.join((f, t))
 
 
-def format_time_range(from_time, to_time, variant='short'):
+def format_time_range(from_time, to_time, variant=DEFAULT_VARIANT):
     """
     Knows how to deal with left out from_time/to_time values.
     """
@@ -136,7 +142,7 @@ def format_time_range(from_time, to_time, variant='short'):
         return separator.join((f, t))
 
 
-def format_timespan_range(timespan_object, force_wholeday=False, variant='short'):
+def format_timespan_range(timespan_object, force_wholeday=False, variant=DEFAULT_VARIANT):
     """
     For Timespan-objects, i.e. object with start_date, end_date, start_time and end_time properties.
 
@@ -178,21 +184,7 @@ def format_timespan_range(timespan_object, force_wholeday=False, variant='short'
     return rv
 
 
-def format_partial_date(year=None, month=None, day=None, variant='short'):
+def format_partial_date(year=None, month=None, day=None, variant=DEFAULT_VARIANT):
-    """
-    >>> format_partial_date(2008)
-    2008
-    >>> format_partial_date(2008, 3)
-    2008
-    >>> format_partial_date(2008)
-    2008
-    >>> format_partial_date(2008)
-    2008
-    >>> format_partial_date(2008)
-    2008
-    >>> format_partial_date(2008)
-    2008
-    """
     if year and month and day:
         format_name = 'DATE_FORMAT'
     elif year and month:

utils/templatetags/daterange.py

@@ -1,67 +1,42 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 # Erik Stein <code@classlibrary.net>, 2016
-#            improved from https://djangosnippets.org/snippets/1405/
+#            Initially based on https://djangosnippets.org/snippets/1405/
-
 
 from django import template
-from ..dateformat import date_format, get_format
+from .. import dateformat
 
 
-"""
+# TODO Get DEFAULT_VARIANT from settings
-# TODO Describe custom formats
+DEFAULT_VARIANT = 'SHORT'
-"""
 
 
 register = template.Library()
 
 
 @register.simple_tag
-def format_date_range(from_date, to_date, variant='short'):
+def format_date_range(from_date, to_date, variant=DEFAULT_VARIANT):
     """
-    >>> import datetime
-    >>> format_date_range(datetime.date(2009,1,15), datetime.date(2009,1,20))
-    '15. - 20.01.2009.'
-    >>> format_date_range(datetime.date(2009,1,15), datetime.date(2009,2,20))
-    '15.01. - 20.02.2009.'
-    >>> format_date_range(datetime.date(2009,1,15), datetime.date(2010,2,20))
-    '15.01.2009. - 20.02.2010.'
-    >>> format_date_range(datetime.date(2009,1,15), datetime.date(2010,1,20))
-    '15.01.2009. - 20.01.2010.'
-
     Use in django templates:
 
     {% load date_range %}
-    {% format_date_range exhibition.start_on exhibition.end_on %}
+    {% format_date_range start_date end_date %}
     """
-    if variant.lower() not in ('short', 'long', ''):
+    return dateformat.format_date_range(from_date, to_date, variant)
-        variant = 'short'
-    if variant.endswith("_"):
-        variant = variant + "_"
-
-    from_format = to_format = get_format(variant.upper() + 'DATE_FORMAT')
-
-    if from_date == to_date:
-        return date_format(to_date, get_format(to_format))
-
-    if (from_date.year == to_date.year):
-        from_format = get_format(variant.upper() + 'DAYMONTH_FORMAT') or 'd/m/'
-        if (from_date.month == to_date.month):
-            from_format = get_format(variant.upper() + 'DAYONLY_FORMAT') or 'd'
-    separator = get_format('DATE_RANGE_SEPARATOR') or "–"
-    # import ipdb; ipdb.set_trace()
 
-    print from_format, to_format
 
-    f = date_format(from_date, get_format(from_format))
+@register.simple_tag
-    t = date_format(to_date, get_format(to_format))
+def format_time_range(from_time, to_time, variant=DEFAULT_VARIANT):
+    """
+    Knows how to deal with left out from_time/to_time values.
 
-    return variant.upper() + " " + separator.join((f, t))
+    Use in django templates:
 
+    {% load date_range %}
+    {% format_time_range start_time end_time %}
+    """
+    return dateformat.format_time_range(from_time, to_time, variant)
 
-def _test():
-    import doctest
-    doctest.testmod()
 
-if __name__ == "__main__":
+def format_timespan_range(timespan_object, force_wholeday=False, variant=DEFAULT_VARIANT):
-    _test()
+    return dateformat.format_timespan_range(timespan_object, force_wholeday, variant)