[IMP] portal: unify wording as `Customer Portal` + make footer link translatable...

bzr revid: odo@openerp.com-20121121100434-wq5julc2njlee7t1

diff --git a/addons/account/edi/invoice_action_data.xml b/addons/account/edi/invoice_action_data.xml
index 723f5c0..88073c7 100644 (file)
--- a/addons/account/edi/invoice_action_data.xml
+++ b/addons/account/edi/invoice_action_data.xml
@@ -34,7 +34,7 @@
 
     <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},</p>
 
-    <p>A new invoice is available for ${object.partner_id.name}: </p>
+    <p>A new invoice is available for you: </p>
     
     <p style="border-left: 1px solid #8e0000; margin-left: 30px;">
        &nbsp;&nbsp;<strong>REFERENCES</strong><br />

diff --git a/addons/portal/mail_mail.py b/addons/portal/mail_mail.py
index 0dc7348..c7cf0eb 100644 (file)
--- 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, ("<div><p>Log in our portal at: %s</p></div>" % partner.signup_url), plaintext=False)
+            text = _("""Access your personal documents through <a href="%s">our Customer Portal</a>""") % partner.signup_url
+            body = append_content_to_html(body, ("<div><p>%s</p></div>" % text), plaintext=False)
         return body

diff --git a/addons/portal_sale/portal_sale_data.xml b/addons/portal_sale/portal_sale_data.xml
index 2abb70b..72e64dc 100644 (file)
--- a/addons/portal_sale/portal_sale_data.xml
+++ b/addons/portal_sale/portal_sale_data.xml
@@ -43,7 +43,7 @@
     %>
     % if signup_url:
     <p>
-    You can access this document and pay online via our Customers Portal:
+    You can access this document and pay online via our Customer Portal:
     </p>
         <a style="display:block; width: 150px; height:20px; margin-left: 120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat no-repeat;"
            href="${signup_url}">View ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'}</a>
@@ -122,7 +122,7 @@
 
     <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},</p>
 
-    <p>A new invoice is available for ${object.partner_id.name}: </p>
+    <p>A new invoice is available for you: </p>
     
     <p style="border-left: 1px solid #8e0000; margin-left: 30px;">
        &nbsp;&nbsp;<strong>REFERENCES</strong><br />
@@ -144,7 +144,7 @@
     %>
     % if signup_url:
     <p>
-    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:
     </p>
         <a style="display:block; width: 150px; height:20px; margin-left: 120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat no-repeat;"
            href="${signup_url}">View Invoice</a>