Merge lp:~savoirfairelinux-openerp/openobject-server/trunk_mail_thread_translate_bug1262000 into lp:openobject-server

Status: Needs review
Proposed branch: lp:~savoirfairelinux-openerp/openobject-server/trunk_mail_thread_translate_bug1262000
Merge into: lp:openobject-server
Diff against target: 15 lines (+5/-0)
1 file modified
openerp/tools/translate.py (+5/-0)
To merge this branch: bzr merge lp:~savoirfairelinux-openerp/openobject-server/trunk_mail_thread_translate_bug1262000
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+208823@code.launchpad.net

Description of the change

Related to https://code.launchpad.net/~savoirfairelinux-openerp/openobject-addons/trunk_mail_thread_translate_bug1262000/+merge/199373

Makes it so model descriptions are translated and chatter_widget can display the model in the proper language.

To post a comment you must log in.

Unmerged revisions

5104. By Sandy Carter (http://www.savoirfairelinux.com)

Add description to output of translation export so mail_tread creation messages can be translated

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/tools/translate.py'
2--- openerp/tools/translate.py 2014-02-27 16:18:19 +0000
3+++ openerp/tools/translate.py 2014-02-28 14:47:03 +0000
4@@ -736,6 +736,11 @@
5 except (IOError, etree.XMLSyntaxError):
6 _logger.exception("couldn't export translation for report %s %s %s", name, report_type, fname)
7
8+ elif model == 'ir.model':
9+ model_pool = pool.get(obj.model)
10+ if model_pool:
11+ push_translation(module, 'model', '_description', 0, model_pool._description)
12+
13 for field_name,field_def in obj._table._columns.items():
14 if field_def.translate:
15 name = model + "," + field_name