[IMP] mail: various cleaning and fixes in the notification email links (wording, missing document name management)

1 files changed, 5 insertions, 1 deletions

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index fe931fa8ad1..3d5185379ac 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -156,7 +156,11 @@ class mail_mail(osv.Model):
             base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
             mail_model = mail.model or 'mail.thread'
             url = urljoin(base_url, self.pool[mail_model]._get_access_link(cr, uid, mail, partner, context=context))
-            return _("""<span class='oe_mail_footer_access'><small>about <a style='color:inherit' href="%s">%s %s</a></small></span>""") % (url, context.get('model_name', ''), mail.record_name)
+            return "<span class='oe_mail_footer_access'><small>%(access_msg)s <a style='color:inherit' href='%(portal_link)s'>%(portal_msg)s</a></small></span>" % {
+                'access_msg': _('about') if mail.record_name else _('access'),
+                'portal_link': url,
+                'portal_msg': '%s %s' % (context.get('model_name', ''), mail.record_name) if mail.record_name else _('your messages'),
+            }
         else:
             return None