Merge lp:~savoirfairelinux-openerp/ocb-server/7.0_mail_thread_translate_bug1262000 into lp:ocb-server

[Sandy Carter (http://www.savoirfairelinux.com)]

Related to https://code.launchpad.net/~savoirfairelinux-openerp/ocb-addons/7.0_mail_thread_translate_bug1262000/+merge/207992

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

[Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter)]

example output:

#. module: email_template
#: code:_description:0
#: model:ir.model,name:email_template.model_email_template
#, python-format
msgid "Email Templates"
msgstr ""

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks! Something like this would really help in returning properly translated errors to the user, using _(model._description) in general. However, turning module names in a model name seems a bit simplistic.

Maybe try something like this instead:

=== modified file 'openerp/tools/translate.py'
--- openerp/tools/translate.py 2014-02-06 10:51:41 +0000
+++ openerp/tools/translate.py 2014-02-27 11:46:26 +0000
@@ -670,6 +670,11 @@
             _logger.warning("Unable to find object %r with id %d", model, res_id)
             continue
         obj = pool.get(model).browse(cr, uid, res_id)
+
+ if model == 'ir.model':
+ model_pool = pool.get(obj.model)
+ if model_pool:
+ push_translation(module, 'code', '_description', 0, model_pool._description)

         if model=='ir.ui.view':
             d = etree.XML(encode(obj.arch))

This will give duplicates for every module in which a model is inherited, but this is already the case for the equivalent "model:ir.model,name" entries.

review: Needs Fixing

[Stefan Rijnhart (Opener) (stefan-opener)]

Launchpad oh launchpad, why drop meaningful whitespace...

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks for taking my suggestion! I see you changed the translation type from 'code' to 'model'. For our purposes, I believe this is incorrect and does not lead to translations being fetched by _(model._description). Are you sure this works?

review: Needs Information

[Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter)]

You are right, that was an oops on my part

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks!

review: Approve

[lp:~savoirfairelinux-openerp/ocb-server/7.0_mail_thread_translate_bug1262000]

5275. By Launchpad Translations on behalf of openerp on 2014-03-01

Launchpad automatic translations update.

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

[lp:~savoirfairelinux-openerp/ocb-server/7.0_mail_thread_translate_bug1262000]

5276. By Olivier Dony (Odoo) on 2014-02-28

[FIX] orm.read_group: fix various issues introduced in recent commit, cleanup

Fixed the implementation of the sorting for inherited
columns, many2one columns, and aggregated columns.
Added corresponding tests with increased coverage of
the read_group() method.

5277. By Olivier Dony (Odoo) on 2014-03-04

[FIX] orm.read_group: improve test coverage and corner case handling:

- allow leading spaces in orderby spec for m2o columns
- extra test for read_group on multiple columns
- proper handling of groupby on numeric column with default order

5278. By Martin Trigaux (OpenERP) on 2014-03-05

[MERGE] [FIX] orm: create a foreign key for the function fields of type many2one and store value (opw #604792)

5279. By Launchpad Translations on behalf of openerp on 2014-03-06

Launchpad automatic translations update.

5280. By Martin Trigaux (OpenERP) on 2014-03-06

[MERGE] [FIX] test ir.sequence: when testing the lock mechanism, verify the error based on an error code instead of the error message which is sensible to the locale of the system

5281. By Sandy Carter (http://www.savoirfairelinux.com) on 2014-03-07

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

5282. By Launchpad Translations on behalf of openerp on 2014-03-07

Launchpad automatic translations update.

=== modified file 'openerp/tools/translate.py'
--- openerp/tools/translate.py	2014-02-06 10:51:41 +0000
+++ openerp/tools/translate.py	2014-02-27 23:46:31 +0000
@@ -778,6 +778,11 @@
                 except (IOError, etree.XMLSyntaxError):
                     _logger.exception("couldn't export translation for report %s %s %s", name, report_type, fname)
 
+        elif model == 'ir.model':
+            model_pool = pool.get(obj.model)
+            if model_pool:
+                push_translation(module, 'code', '_description', 0, model_pool._description)
+
         for field_name,field_def in obj._table._columns.items():
             if field_def.translate:
                 name = model + "," + field_name