From fd4f6efe1b778b48cfef86e217d73f67b42a4ca5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 29 Aug 2014 13:08:06 +0200
Subject: [PATCH] [IMP] mail: various cleaning and fixes in the notification
email links (wording, missing document name management)
---
addons/mail/mail_followers.py | 4 ++--
addons/mail/mail_mail.py | 6 +++++-
addons/portal/mail_mail.py | 6 +++++-
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index b4ef81039caa..a89499549860 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -152,9 +152,9 @@ class mail_notification(osv.Model):
company = "<a style='color:inherit' href='%s'>%s</a>" % (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 = '<small>%s</small>' % (sent_by % {
+ signature_company = '<br /><small>%s</small>' % (sent_by % {
'company': company,
'odoo': "<a style='color:inherit' href='https://www.odoo.com/'>Odoo</a>"
})
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index fe931fa8ad13..3d5185379ac6 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
diff --git a/addons/portal/mail_mail.py b/addons/portal/mail_mail.py
index 44af0468657b..6508904cb519 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 _(""", <span class='oe_mail_footer_access'><small>access %s %s through <a style='color:inherit' href="%s">our Customer Portal</a></small></span>""") % (context.get('model_name', ''), mail.record_name, signup_url)
+ 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': _('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)
--
GitLab