Skip to content

Commit

Permalink
[FIX] email_template: encode date/datetime format
Browse files Browse the repository at this point in the history
See more details here: odoo/odoo@6191e3f

This commit closes odoo#13704
  • Loading branch information
JKE-be committed Oct 11, 2016
1 parent ecb6055 commit f4aae1c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions addons/email_template/email_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ 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)
ftime = ts.strftime(format_time)
fdate = ts.strftime(format_date).decode('utf-8')
ftime = ts.strftime(format_time).decode('utf-8')
return "%s %s%s" % (fdate, ftime, (' (%s)' % tz) if tz else '')

try:
Expand Down

0 comments on commit f4aae1c

Please sign in to comment.