From a18cb17f04737f1d0a7624b631fb2d593418fac3 Mon Sep 17 00:00:00 2001 From: Erik Stein Date: Thu, 15 Nov 2018 10:00:22 +0100 Subject: [PATCH] lang parameter for time_format, date_format. --- shared/utils/dateformat.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/shared/utils/dateformat.py b/shared/utils/dateformat.py index 4e6bb45..c98a205 100644 --- a/shared/utils/dateformat.py +++ b/shared/utils/dateformat.py @@ -59,15 +59,19 @@ def format(value, format): return df.format(format) -def time_format(value, format=None, use_l10n=None): +def time_format(value, format=None, use_l10n=None, lang=None): # Copy of django.utils.dateformat.time_format, using our extended formatter + if not lang: + lang = get_language() tf = ExtendedFormat(value) - return tf.format(get_format(format or 'DATE_FORMAT', use_l10n=use_l10n, lang=get_language())) + return tf.format(get_format(format or 'DATE_FORMAT', use_l10n=use_l10n, lang=lang)) -def date_format(value, format=None, use_l10n=None): +def date_format(value, format=None, use_l10n=None, lang=None): + if not lang: + lang = get_language() df = ExtendedFormat(value) - return df.format(get_format(format or 'DATE_FORMAT', use_l10n=use_l10n, lang=get_language())) + return df.format(get_format(format or 'DATE_FORMAT', use_l10n=use_l10n, lang=lang)) def _normalize_variant(variant):