diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-02-02 18:36:25 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-02-02 18:36:25 +0100 |
| commit | 0e8a7d9b16273aa83d7d2962fb088ec8bffcffb1 (patch) | |
| tree | 85343921550ca38a9b5616f43faa6d0eb7775e50 /ishtar_common/ooo_replace.py | |
| parent | 8062e43024d2d6bea9c39aaf18ddd7ff5afe5276 (diff) | |
| parent | 2e5e969823e4e7d5b16a4742eae4cc1d13959c09 (diff) | |
| download | Ishtar-0e8a7d9b16273aa83d7d2962fb088ec8bffcffb1.tar.bz2 Ishtar-0e8a7d9b16273aa83d7d2962fb088ec8bffcffb1.zip | |
Merge branch 'new-stable' into dev
Diffstat (limited to 'ishtar_common/ooo_replace.py')
| -rw-r--r-- | ishtar_common/ooo_replace.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ishtar_common/ooo_replace.py b/ishtar_common/ooo_replace.py index 2fb01724b..08ee17b63 100644 --- a/ishtar_common/ooo_replace.py +++ b/ishtar_common/ooo_replace.py @@ -62,10 +62,12 @@ def _format_value(value, default_value): c_locale[1] = c_locale[1].upper() c_locale = "_".join(c_locale) if locale.getlocale()[0] != c_locale: - try: - locale.setlocale(locale.LC_ALL, c_locale) - except: - pass + for loc in (c_locale, c_locale+'.utf8'): + try: + locale.setlocale(locale.LC_ALL, loc) + break + except: + pass try: if settings.DATE_FORMAT: value = value.strftime(settings.DATE_FORMAT).lower() |