diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index b4ef81039ca..a8949954986 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -152,9 +152,9 @@ class mail_notification(osv.Model):
company = "%s" % (website_url, user.company_id.name)
else:
company = user.company_id.name
- sent_by = _('Sent by %(company)s using %(odoo)s.')
+ sent_by = _('Sent by %(company)s using %(odoo)s')
- signature_company = '%s' % (sent_by % {
+ signature_company = '
%s' % (sent_by % {
'company': company,
'odoo': "Odoo"
})
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 _("""""") % (url, context.get('model_name', ''), mail.record_name)
+ return "" % {
+ '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
diff --git a/addons/portal/mail_mail.py b/addons/portal/mail_mail.py
index 44af0468657..6508904cb51 100644
--- a/addons/portal/mail_mail.py
+++ b/addons/portal/mail_mail.py
@@ -42,6 +42,10 @@ class mail_mail(osv.Model):
action='mail.action_mail_redirect',
model=mail.model, res_id=mail.res_id,
context=contex_signup)[partner.id]
- return _(""", """) % (context.get('model_name', ''), mail.record_name, signup_url)
+ return ", " % {
+ 'access_msg': _('access directly to'),
+ 'portal_link': signup_url,
+ 'portal_msg': '%s %s' % (context.get('model_name', ''), mail.record_name) if mail.record_name else _('your messages '),
+ }
else:
return super(mail_mail, self)._get_partner_access_link(cr, uid, mail, partner=partner, context=context)