From a5128e0791c7cd0db9f3775ff681cbc79160af3a Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 6 Dec 2013 00:30:35 +0100 Subject: Better date formatting for ooo file variables --- ishtar_common/ooo_replace.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'ishtar_common') diff --git a/ishtar_common/ooo_replace.py b/ishtar_common/ooo_replace.py index 2158bb473..d929d9359 100644 --- a/ishtar_common/ooo_replace.py +++ b/ishtar_common/ooo_replace.py @@ -63,7 +63,12 @@ def _format_value(value, default_value): c_locale = "_".join(c_locale) if locale.getlocale()[0] != c_locale: locale.setlocale(locale.LC_ALL, c_locale) - value = value.strftime('%x') + if settings.DATE_FORMAT: + value = unicode(value.strftime(settings.DATE_FORMAT).decode( + locale.getlocale()[1]).lower()) + else: + value = unicode(value.strftime('%x').decode( + locale.getlocale()[1])) value = unicode(value) if value else default_value return value -- cgit v1.2.3