From 6191e3f6d0d064de9acdf0d1455b7de589dddb5a Mon Sep 17 00:00:00 2001 From: Richard Mathot Date: Wed, 23 Dec 2015 10:16:12 +0100 Subject: [PATCH] [FIX] mail: format_tz crash if server locale returns non-ascii month name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When there is no lang set, format_tz uses server locale to format a date. If my server is in French, date is formatted using '%B' (full localized month name). This can lead non-ascii strings like "décembre"... --- addons/mail/mail_template.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail/mail_template.py b/addons/mail/mail_template.py index f73ed0cffcd..61581475f93 100644 --- a/addons/mail/mail_template.py +++ b/addons/mail/mail_template.py @@ -59,7 +59,7 @@ def format_tz(pool, cr, uid, dt, tz=False, format=False, context=None): format_date = lang_params.get("date_format", '%B-%d-%Y') format_time = lang_params.get("time_format", '%I-%M %p') - fdate = ts.strftime(format_date) + fdate = ts.strftime(format_date).decode('utf-8') ftime = ts.strftime(format_time) return "%s %s%s" % (fdate, ftime, (' (%s)' % tz) if tz else '')