diff options
author | Étienne Loks <etienne.loks@proxience.com> | 2014-09-19 08:16:55 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@proxience.com> | 2014-09-19 08:16:55 +0200 |
commit | 25c72bcd877868a0a00697c15fe68ca9e0002d66 (patch) | |
tree | 8eeed05124b985cde07d68a801d56354e14187ff | |
parent | 533d8c6a23250960a804caf652cedd3b1ff7db63 (diff) | |
parent | 3c779a01f8320bb833ed95eb871c20e988a4b026 (diff) | |
download | Chimère-25c72bcd877868a0a00697c15fe68ca9e0002d66.tar.bz2 Chimère-25c72bcd877868a0a00697c15fe68ca9e0002d66.zip |
Merge branch 'v2.1' into v2.2
-rw-r--r-- | chimere/utils.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chimere/utils.py b/chimere/utils.py index 338af34..2d74095 100644 --- a/chimere/utils.py +++ b/chimere/utils.py @@ -858,8 +858,12 @@ def get_month_name(month_no, locale): MONTH_NAMES = {locale:[get_month_name(no_month, locale+'.UTF-8') for no_month in xrange(1, 13)] for locale in ['fr_FR']} -UNI_MONTH_NAMES = {locale:[m.decode('utf-8') for m in MONTH_NAMES[locale]] +try: + UNI_MONTH_NAMES = {locale:[m.decode('utf-8') for m in MONTH_NAMES[locale]] for locale in MONTH_NAMES} +except UnicodeEncodeError: + UNI_MONTH_NAMES = {locale:[m for m in MONTH_NAMES[locale]] + for locale in MONTH_NAMES} DATE_PARSINGS = {'fr_FR':[ re.compile(r'(?P<day1>\d{1,2}) '\ |