From aafd2a7fca02767af85677837b4dfc27a07ec0cd Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 7 May 2013 19:54:32 +0200
Subject: [PATCH] [FIX] mail: fix typos + wrong URL links + wrong translation
 marks in mail signature

bzr revid: odo@openerp.com-20130507175432-kslh1hl7w6ule5fq
---
 addons/mail/mail_followers.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 450b81dabbf..7b156883895 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -118,8 +118,8 @@ class mail_notification(osv.Model):
                     Administrator
                 </p>
                 <div>
-                    <small>Send by <a ...>Your Company</a> using <a ...>OpenERP</a>.</small> OR
-                    <small>Send by Administrator using <a ...>OpenERP</a>.</small>
+                    <small>Sent by <a ...>Your Company</a> using <a ...>OpenERP</a>.</small> OR
+                    <small>Sent by Administrator using <a ...>OpenERP</a>.</small>
                 </div>
         """
         footer = ""
@@ -135,14 +135,17 @@ class mail_notification(osv.Model):
         footer = tools.append_content_to_html(footer, signature, plaintext=False, container_tag='p')
 
         # add company signature
-        if user.company_id:
-            company = user.company_id.website and "<a style='color:inherit' href='%s'>%s</a>" % (user.company_id.website, user.company_id.name) or user.company_id.name
+        if user.company_id.website:
+            website_url = ('http://%s' % user.company_id.website) if not user.company_id.website.lower().startswith(('http:','https:')) \
+                else user.company_id.website
+            company = "<a style='color:inherit' href='%s'>%s</a>" % (website_url, user.company_id.name)
         else:
-            company = user.name
-        signature_company = _('<small>Send by %(company)s using %(openerp)s.</small>') % {
+            company = user.company_id.name
+        sent_by = _('Sent by %(company)s using %(openerp)s.')
+        signature_company = '<small>%s</small>' % (sent_by % {
                 'company': company,
                 'openerp': "<a style='color:inherit' href='https://www.openerp.com/'>OpenERP</a>"
-            }
+            })
         footer = tools.append_content_to_html(footer, signature_company, plaintext=False, container_tag='div')
 
         return footer