summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2013-12-06 00:30:35 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2013-12-06 00:30:35 +0100
commita5128e0791c7cd0db9f3775ff681cbc79160af3a (patch)
tree61fedce75f20d19e2e0419f97b0b702278cacb29 /ishtar_common
parent4fe7989786ec2a0110b2fb2ad9356d7cc24b18e4 (diff)
downloadIshtar-a5128e0791c7cd0db9f3775ff681cbc79160af3a.tar.bz2
Ishtar-a5128e0791c7cd0db9f3775ff681cbc79160af3a.zip
Better date formatting for ooo file variables
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/ooo_replace.py7
1 files changed, 6 insertions, 1 deletions
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