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 | 056c35c776c2ae6f2d9add152731d1e7a94164f4 (patch) | |
| tree | 85343921550ca38a9b5616f43faa6d0eb7775e50 | |
| parent | 93a13e9ea0d58a9182aa8f076c7e6bebb07e7724 (diff) | |
| parent | bdc4fe8091c4130d4ae1d9ee17c42d17fddd66a3 (diff) | |
| download | Ishtar-056c35c776c2ae6f2d9add152731d1e7a94164f4.tar.bz2 Ishtar-056c35c776c2ae6f2d9add152731d1e7a94164f4.zip | |
Merge branch 'new-stable' into dev
| -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() |