Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/7.0-opw-596725-han into lp:openobject-addons/7.0

  1. 7.0-opw-596725-han
  2. Merge into 7.0
Proposed by Hardik Ansodariya (OpenERP)
Status: Merged
Approved by: Naresh(OpenERP)
Approved revision: no longer in the source branch.
Merged at revision: 9633
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-opw-596725-han
Merge into: lp:openobject-addons/7.0
Diff against target: 12 lines (+1/-1)
1 file modified
mail/wizard/invite.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-opw-596725-han
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) Approve
Review via email: mp+180817@code.launchpad.net

Description of the change

Hello,

Fixed the issue of translation in follower invitation message.

Thanks

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve
Revision history for this message
Martin Trigaux (OpenERP) (mat-openerp) wrote :

LGTM, thanks for the patch

revno: 9633 [merge]
revision-id: <email address hidden>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'mail/wizard/invite.py'
--- mail/wizard/invite.py 2013-04-25 08:52:56 +0000
+++ mail/wizard/invite.py 2013-08-19 09:49:39 +0000
@@ -34,7 +34,7 @@
34 result = super(invite_wizard, self).default_get(cr, uid, fields, context=context)34 result = super(invite_wizard, self).default_get(cr, uid, fields, context=context)
35 if 'message' in fields and result.get('res_model') and result.get('res_id'):35 if 'message' in fields and result.get('res_model') and result.get('res_id'):
36 document_name = self.pool.get(result.get('res_model')).name_get(cr, uid, [result.get('res_id')], context=context)[0][1]36 document_name = self.pool.get(result.get('res_model')).name_get(cr, uid, [result.get('res_id')], context=context)[0][1]
37 message = _('<div>You have been invited to follow %s.</div>' % document_name)37 message = _('<div>You have been invited to follow %s.</div>') % document_name
38 result['message'] = message38 result['message'] = message
39 elif 'message' in fields:39 elif 'message' in fields:
40 result['message'] = _('<div>You have been invited to follow a new document.</div>')40 result['message'] = _('<div>You have been invited to follow a new document.</div>')