odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] mail: fix typos + wrong URL links + wrong translation marks in mail signature 

bzr revid: odo@openerp.com-20130507175432-kslh1hl7w6ule5fq
This commit is contained in:
Olivier Dony 2013-05-07 19:54:32 +02:00
parent 325f710360
commit aafd2a7fca
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addons/mail/mail_followers.py
View File

@ -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