diff options
| author | Denis Ledoux <dle@odoo.com> | 2014-08-12 15:16:49 +0200 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2014-08-12 15:16:49 +0200 |
| commit | 7b0eb9b1a8c02aa1476fdc0c5a1cc58656fdb5f9 (patch) | |
| tree | dfbb53417a0d59e354e826bf4c3955247a43df15 | |
| parent | 2c9a116c74047b615c989751e330500faba95b85 (diff) | |
[FIX] mail: forward-port of rev 245bb4ebdfeccb05134b3ff943c9fd0fb01173c2
| -rw-r--r-- | addons/mail/mail_message.py | 4 | ||||
| -rw-r--r-- | addons/mail/tests/test_mail_message.py | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index 2a8529e6893..e54708c77d9 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -816,10 +816,8 @@ class mail_message(osv.Model): email_reply_to = emails[0] document_name = self.pool[model].name_get(cr, SUPERUSER_ID, [res_id], context=context)[0] if document_name: - # sanitize document name - sanitized_doc_name = re.sub(r'[^\w+.]+', '-', document_name[1]) # generate reply to - email_reply_to = _('"Followers of %s" <%s>') % (sanitized_doc_name, email_reply_to) + email_reply_to = formataddr((_('Followers of %s') % document_name[1], email_reply_to)) return email_reply_to diff --git a/addons/mail/tests/test_mail_message.py b/addons/mail/tests/test_mail_message.py index 180661a0707..031ef6c3a09 100644 --- a/addons/mail/tests/test_mail_message.py +++ b/addons/mail/tests/test_mail_message.py @@ -81,8 +81,8 @@ class TestMailMessage(TestMail): alias_domain = 'schlouby.fr' raoul_from = 'Raoul Grosbedon <raoul@raoul.fr>' raoul_from_alias = 'Raoul Grosbedon <raoul@schlouby.fr>' - raoul_reply = '"Followers of Pigs" <raoul@raoul.fr>' - raoul_reply_alias = '"Followers of Pigs" <group+pigs@schlouby.fr>' + raoul_reply = 'Followers of Pigs <raoul@raoul.fr>' + raoul_reply_alias = 'Followers of Pigs <group+pigs@schlouby.fr>' # -------------------------------------------------- # Case1: without alias_domain |