Merge lp:~camptocamp/openerp-product-attributes/7.0-fix-translate-view-lep into lp:~product-core-editors/openerp-product-attributes/7.0

[Leonardo Pistone]

[lp:~camptocamp/openerp-product-attributes/7.0-fix-translate-view-lep]

235. By Leonardo Pistone on 2014-03-19

[fix] production_lot_custom_attributes: translations in views are of type 'view'. The method "_" only gets other translation types. I then define my local translation method to avoid the magic of "_"

[Pedro Manuel Baeza (pedro.baeza)]

LGTM.

Thanks for discovering a method to do it.

Regards.

review: Approve (code review)

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

LGTM.

Maybe the (small) duplication could be avoided by using an intermediate class:

class Translator(object):
   def __init__(cr, context):
       self.cr = cr
       self.context = context

   def __call__(self, source):
       return translate(self.cr, None, 'view', self.context.get('lang'), source) or source

and then instantiate translate_view = Translator(cr, context), and call translate_view where needed.

review: Needs Information

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

add missing 'self' to __init__

[Leonardo Pistone (lepistone)]

Thanks Alexandre.

I like your proposal very much, but in that case I'd rather leave things as they are since I'm dealing with two different modules.

[Romain Deheele - Camptocamp (romaindeheele)]

Interesting, LGTM,

Romain

review: Approve (code review)

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

ok then

review: Approve (code review, no test)

=== modified file 'product_custom_attributes/product.py'
--- product_custom_attributes/product.py	2013-09-30 11:55:27 +0000
+++ product_custom_attributes/product.py	2014-03-19 17:54:31 +0000
@@ -23,7 +23,7 @@
 from openerp.osv import fields
 from openerp.osv.osv import except_osv
 from openerp.osv.orm import setup_modifiers
-from tools.translate import _
+from tools.translate import translate
 from lxml import etree
 
 class product_template(Model):
@@ -91,6 +91,13 @@
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         if context is None:
             context = {}
+
+        def translate_view(source):
+            """Return a translation of type view of source."""
+            return translate(
+                cr, None, 'view', context.get('lang'), source
+            ) or source
+
         result = super(product_product, self).fields_view_get(cr, uid, view_id,view_type,context,toolbar=toolbar, submenu=submenu)
         if view_type == 'form' and context.get('attribute_group_ids'):
             eview = etree.fromstring(result['arch'])
@@ -105,9 +112,14 @@
                 placeholder = eview.xpath("//separator[@string='attributes_placeholder']")[0]
                 placeholder.getparent().replace(placeholder, attributes_notebook)
             elif context.get('open_product_by_attribute_set'):
-                main_page = etree.Element('page', string=_('Custom Attributes'))
+                main_page = etree.Element(
+                    'page',
+                    string=translate_view('Custom Attributes')
+                )
                 main_page.append(attributes_notebook)
-                info_page = eview.xpath("//page[@string='%s']" % (_('Information'),))[0]
+                info_page = eview.xpath(
+                    "//page[@string='%s']" % (translate_view('Information'),)
+                )[0]
                 info_page.addnext(main_page)
             result['arch'] = etree.tostring(eview, pretty_print=True)
             result = self._fix_size_bug(cr, uid, result, context=context)

=== modified file 'production_lot_custom_attributes/lot.py'
--- production_lot_custom_attributes/lot.py	2013-11-25 16:18:26 +0000
+++ production_lot_custom_attributes/lot.py	2014-03-19 17:54:31 +0000
@@ -24,7 +24,7 @@
 
 from openerp.osv.orm import Model
 from openerp.osv import fields
-from tools.translate import _
+from tools.translate import translate
 from lxml import etree
 
 
@@ -89,6 +89,13 @@
                         context=None, toolbar=False, submenu=False):
         if context is None:
             context = {}
+
+        def translate_view(source):
+            """Return a translation of type view of source."""
+            return translate(
+                cr, None, 'view', context.get('lang'), source
+            ) or source
+
         attr_pool = self.pool.get('attribute.attribute')
         result = super(stock_production_lot, self).fields_view_get(
             cr, uid, view_id, view_type, context, toolbar=toolbar,
@@ -122,11 +129,11 @@
                 # in this case, we know the attribute set beforehand, and we
                 # add the attributes to the current view
                 main_page = etree.Element(
-                    'page', string=_('Custom Attributes')
+                    'page', string=translate_view('Custom Attributes')
                 )
                 main_page.append(attributes_notebook)
                 info_page = eview.xpath(
-                    "//page[@string='%s']" % (_('Stock Moves'),)
+                    "//page[@string='%s']" % (translate_view('Stock Moves'),)
                 )[0]
                 info_page.addnext(main_page)
             result['arch'] = etree.tostring(eview, pretty_print=True)