From 6b2c64ff4099a3ab7cb5f0643f20bda5943f3f6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 13 Mar 2013 12:19:26 +0100 Subject: [PATCH] [IMP] mail_mail: cleaned code about reply_to format: now uses tools.email_split, cleaned a bit the code. bzr revid: tde@openerp.com-20130313111926-45d9gct5nihr6f6n --- addons/mail/mail_mail.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py index 1ca3255fd84..7720df84f92 100644 --- a/addons/mail/mail_mail.py +++ b/addons/mail/mail_mail.py @@ -209,17 +209,15 @@ class mail_mail(osv.Model): email_reply_to = self.pool.get(mail.model).message_get_reply_to(cr, uid, [mail.res_id], context=context)[0] # no alias reply_to -> reply_to will be the email_from, only the email part if not email_reply_to and mail.email_from: - match = re.search(r'([^\s,<@]+@[^>\s,]+)', mail.email_from) # TDE TODO: simplify multiple same regex - if match: - email_reply_to = match.group(1) + emails = tools.email_split(mail.email_from) + if emails: + email_reply_to = emails[0] # format 'Document name ' - if email_reply_to: - document_name = '' - if mail.model and mail.res_id: - document_name = self.pool.get(mail.model).name_get(cr, SUPERUSER_ID, [mail.res_id], context=context)[0] + if email_reply_to and mail.model and mail.res_id: + document_name = self.pool.get(mail.model).name_get(cr, SUPERUSER_ID, [mail.res_id], context=context)[0] if document_name: - email_reply_to = 'Followers of %s <%s>' % (document_name[1], email_reply_to) + email_reply_to = _('Followers of %s <%s>') % (document_name[1], email_reply_to) return email_reply_to