From ddc5d6804edebf4d3a2db9fc19091a9dada46c9b Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 21 Nov 2012 11:04:34 +0100 Subject: [PATCH] [IMP] portal: unify wording as `Customer Portal` + make footer link translatable + cleanup bzr revid: odo@openerp.com-20121121100434-wq5julc2njlee7t1 --- addons/account/edi/invoice_action_data.xml | 2 +- addons/portal/mail_mail.py | 8 +++++--- addons/portal_sale/portal_sale_data.xml | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/addons/account/edi/invoice_action_data.xml b/addons/account/edi/invoice_action_data.xml index 723f5c06c22..88073c7dff6 100644 --- a/addons/account/edi/invoice_action_data.xml +++ b/addons/account/edi/invoice_action_data.xml @@ -34,7 +34,7 @@

Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},

-

A new invoice is available for ${object.partner_id.name}:

+

A new invoice is available for you:

  REFERENCES
diff --git a/addons/portal/mail_mail.py b/addons/portal/mail_mail.py index 0dc7348f2c8..c7cf0eb5d65 100644 --- a/addons/portal/mail_mail.py +++ b/addons/portal/mail_mail.py @@ -19,8 +19,9 @@ # ############################################################################## -from osv import osv -import tools +from openerp.osv import osv +from openerp.tools import append_content_to_html +from openerp.tools.translate import _ class mail_mail(osv.Model): """ Update of mail_mail class, to add the signin URL to notifications. """ @@ -36,5 +37,6 @@ class mail_mail(osv.Model): if partner: context = dict(context or {}, signup_valid=True) partner = self.pool.get('res.partner').browse(cr, uid, partner.id, context) - body = tools.append_content_to_html(body, ("

Log in our portal at: %s

" % partner.signup_url), plaintext=False) + text = _("""Access your personal documents through our Customer Portal""") % partner.signup_url + body = append_content_to_html(body, ("

%s

" % text), plaintext=False) return body diff --git a/addons/portal_sale/portal_sale_data.xml b/addons/portal_sale/portal_sale_data.xml index 2abb70b068c..72e64dc15bd 100644 --- a/addons/portal_sale/portal_sale_data.xml +++ b/addons/portal_sale/portal_sale_data.xml @@ -43,7 +43,7 @@ %> % if signup_url:

- You can access this document and pay online via our Customers Portal: + You can access this document and pay online via our Customer Portal:

View ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} @@ -122,7 +122,7 @@

Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},

-

A new invoice is available for ${object.partner_id.name}:

+

A new invoice is available for you:

  REFERENCES
@@ -144,7 +144,7 @@ %> % if signup_url:

- You can access the invoice document and pay online via our Customers Portal: + You can access the invoice document and pay online via our Customer Portal:

View Invoice