|
|
|
@ -117,7 +117,7 @@ def format_date_range(from_date, to_date, variant=DEFAULT_VARIANT):
|
|
|
|
|
if from_date: |
|
|
|
|
f = date_format(from_date, get_format(from_format, lang=get_language())) |
|
|
|
|
if to_date: |
|
|
|
|
t = date_format(to_date, get_format(to_format), lang=get_language()) |
|
|
|
|
t = date_format(to_date, get_format(to_format, lang=get_language())) |
|
|
|
|
|
|
|
|
|
separator = get_format('DATE_RANGE_SEPARATOR', lang=get_language()) or " - " |
|
|
|
|
return separator.join((f, t)) |
|
|
|
@ -158,7 +158,7 @@ def format_time_range(from_time, to_time, variant=DEFAULT_VARIANT):
|
|
|
|
|
if from_time: |
|
|
|
|
f = time_format(from_time, get_format(from_format, lang=get_language())) |
|
|
|
|
if to_time: |
|
|
|
|
t = time_format(to_time, get_format(to_format), lang=get_language()) |
|
|
|
|
t = time_format(to_time, get_format(to_format, lang=get_language())) |
|
|
|
|
|
|
|
|
|
separator = get_format('DATE_RANGE_SEPARATOR', lang=get_language()) or "–" |
|
|
|
|
return separator.join((f, t)) |
|
|
|
|