From 29365457e74bc4f01dc305e4a00c33de059f621c Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 14 Feb 2014 11:32:56 +0100 Subject: More permissive management of locale --- ishtar_common/ooo_replace.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'ishtar_common') diff --git a/ishtar_common/ooo_replace.py b/ishtar_common/ooo_replace.py index d929d9359..73d855a8d 100644 --- a/ishtar_common/ooo_replace.py +++ b/ishtar_common/ooo_replace.py @@ -62,13 +62,16 @@ def _format_value(value, default_value): c_locale[1] = c_locale[1].upper() c_locale = "_".join(c_locale) if locale.getlocale()[0] != c_locale: - locale.setlocale(locale.LC_ALL, c_locale) + try: + locale.setlocale(locale.LC_ALL, c_locale) + except: + pass if settings.DATE_FORMAT: - value = unicode(value.strftime(settings.DATE_FORMAT).decode( - locale.getlocale()[1]).lower()) + value = value.strftime(settings.DATE_FORMAT).lower() else: - value = unicode(value.strftime('%x').decode( - locale.getlocale()[1])) + value = value.strftime('%x') + if locale.getlocale()[1]: + value = value.decode(locale.getlocale()[1]) value = unicode(value) if value else default_value return value -- cgit v1.2.3