diff options
| -rw-r--r-- | ishtar_common/ooo_replace.py | 13 |
1 files changed, 8 insertions, 5 deletions
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 |