NaNtic
/
trytond-electronic_mail-old-ts
mirror of https://github.com/NaN-tic/trytond-electronic_mail-old-ts.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Migrate to py3 (utf-8)

This commit is contained in:
Raimon Esteve 2018-09-19 07:33:17 +02:00
parent d31c38abcd
commit f6e49e429e
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
template.py
View File

@ -148,7 +148,7 @@ class Template(ModelSQL, ModelView):
template = TextTemplate(expression)
template_context = cls.template_context(record)
return template.generate(**template_context).render(encoding='UTF-8')
return template.generate(**template_context).render()
@classmethod
def _engine_jinja2(cls, expression, record):
@ -161,7 +161,7 @@ class Template(ModelSQL, ModelView):
template = Jinja2Template(expression)
template_context = cls.template_context(record)
return template.render(template_context).encode('utf-8')
return template.render(template_context)
@classmethod
def create(cls, vlist):
@ -374,11 +374,9 @@ class Template(ModelSQL, ModelView):
if value['signature']:
user = User(Transaction().user)
if user.signature:
plain = '%s\n-- \n%s' % (
plain, user.signature.encode('utf-8'))
plain = '%s\n-- \n%s' % (plain, user.signature)
if user.signature_html:
html = '%s<br/>-- <br/>%s' % (
html, user.signature_html.encode('utf-8'))
html = '%s<br/>-- <br/>%s' % (html, user.signature_html)
# TODO Add styles
if html: