Merge lp:~openerp-dev/openobject-server/7.0-opw-593029-msh into lp:openobject-server/7.0

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of tranlation of selection field when there is callable instead of list of tuple.

Demo:- Go to Project form and see there privacy_visisbility field which is selection field, this selection field is never going to be translated as there is callable function instead of list of tuple values.

So fixed if from fields_get and from trans_generate.

Thanks.

[Olivier Dony (Odoo) (odo-openerp)]

I don't think we should change the behavior of the translation system for callable selection fields:

- in the API, when we have static strings we translate them automatically, but when we have callables they are responsible for translating their result. This is the case for the message of _constraints for example: if static it is translated, if callable it is not.
- in many cases the callables will read data from the database (e.g. a list of records), and if the results need to be translated it will already be done (with correct context lang)
- when exporting translations, if we take all results from callables we will have a lot of invalid/incorrect values that will pollute the POT files

Instead the right thing to do would be to fix the callable to make it return translated values correctly:

        return [('public', _('All Users')),
                ('employees', _('Employees Only')),
                ('followers', _('Followers Only'))]

Thanks!

review: Disapprove

Unmerged revisions

4990. By Mohammed Shekha<email address hidden> on 2013-05-29

[FIX]Fixed the issue of tranlation of selection field when there is callable instead of list of tuple.

=== modified file 'openerp/addons/base/module/wizard/base_export_language.py'
--- openerp/addons/base/module/wizard/base_export_language.py	2012-12-10 15:27:23 +0000
+++ openerp/addons/base/module/wizard/base_export_language.py	2013-05-30 05:19:40 +0000
@@ -32,7 +32,7 @@
 class base_language_export(osv.osv_memory):
     _name = "base.language.export"
 
-    def _get_languages(self, cr, uid, context):
+    def _get_languages(self, cr, uid, context=None):
         lang_obj = self.pool.get('res.lang')
         ids = lang_obj.search(cr, uid, [('translatable', '=', True)])
         langs = lang_obj.browse(cr, uid, ids)

=== modified file 'openerp/addons/base/module/wizard/base_update_translations.py'
--- openerp/addons/base/module/wizard/base_update_translations.py	2012-12-10 15:27:23 +0000
+++ openerp/addons/base/module/wizard/base_update_translations.py	2013-05-30 05:19:40 +0000
@@ -26,7 +26,7 @@
 from openerp.tools.translate import _
 
 class base_update_translations(osv.osv_memory):
-    def _get_languages(self, cr, uid, context):
+    def _get_languages(self, cr, uid, context=None):
         lang_obj = self.pool.get('res.lang')
         ids = lang_obj.search(cr, uid, ['&', ('active', '=', True), ('translatable', '=', True),])
         langs = lang_obj.browse(cr, uid, ids)

=== modified file 'openerp/osv/orm.py'
--- openerp/osv/orm.py	2013-04-19 14:54:17 +0000
+++ openerp/osv/orm.py	2013-05-30 05:19:40 +0000
@@ -3527,15 +3527,17 @@
                     if help_trans:
                         res[f]['help'] = help_trans
                 if 'selection' in res[f]:
+                    sel = sel2 = []
                     if isinstance(field.selection, (tuple, list)):
                         sel = field.selection
-                        sel2 = []
-                        for key, val in sel:
-                            val2 = None
-                            if val:
-                                val2 = translation_obj._get_source(cr, user, self._name + ',' + f, 'selection',  context['lang'], val)
-                            sel2.append((key, val2 or val))
-                        res[f]['selection'] = sel2
+                    elif callable(field.selection):
+                        sel = field.selection(self, cr, user, context=context)
+                    for key, val in sel:
+                        val2 = None
+                        if val:
+                            val2 = translation_obj._get_source(cr, user, self._name + ',' + f, 'selection',  context['lang'], val)
+                        sel2.append((key, val2 or val))
+                    res[f]['selection'] = sel2
 
         return res
 

=== modified file 'openerp/tools/translate.py'
--- openerp/tools/translate.py	2013-03-07 16:45:58 +0000
+++ openerp/tools/translate.py	2013-05-30 05:19:40 +0000
@@ -751,8 +751,13 @@
                     if not model_data_ids:
                         push_translation(module, 'model', name, 0, encode(obj_value[field_name]))
 
-            if hasattr(field_def, 'selection') and isinstance(field_def.selection, (list, tuple)):
-                for dummy, val in field_def.selection:
+            if hasattr(field_def, 'selection'):
+                sel = []
+                if isinstance(field_def.selection, (list, tuple)):
+                    sel = field_def.selection
+                elif callable(field_def.selection):
+                    sel = field_def.selection(objmodel, cr, uid, {})
+                for dummy, val in sel:
                     push_translation(module, 'selection', name, 0, encode(val))
 
         elif model=='ir.actions.report.xml':