openerp-expert-localization team mailing list archive

[Numérigraphe <informatique@xxxxxxxxxxxxxxxx>]

You have been requested to review the proposed merge of lp:~numerigraphe/openobject-server/wording-trunk into lp:openobject-server.

This is a small refactoring effort, writing some variable names in good English.


-- 
https://code.launchpad.net/~numerigraphe/openobject-server/wording-trunk/+merge/39246
Your team OpenERP Localization Experts is requested to review the proposed merge of lp:~numerigraphe/openobject-server/wording-trunk into lp:openobject-server.

=== modified file 'bin/addons/base/module/module.py'
--- bin/addons/base/module/module.py	2010-10-20 17:17:39 +0000
+++ bin/addons/base/module/module.py	2010-10-25 07:46:03 +0000
@@ -53,8 +53,8 @@
         result = dict(cr.fetchall())
         for id in ids:
             cr.execute('select id from ir_module_category where parent_id=%s', (id,))
-            childs = [c for c, in cr.fetchall()]
-            result[id] = reduce(lambda x,y:x+y, [result.get(c, 0) for c in childs], result.get(id, 0))
+            children = [c for c, in cr.fetchall()]
+            result[id] = reduce(lambda x,y:x+y, [result.get(c, 0) for c in children], result.get(id, 0))
         return result
 
     _columns = {

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2010-10-23 12:51:31 +0000
+++ bin/osv/orm.py	2010-10-25 07:46:03 +0000
@@ -1246,7 +1246,7 @@
             context = {}
         result = False
         fields = {}
-        childs = True
+        children = True
 
         def encode(s):
             if isinstance(s, unicode):
@@ -1301,7 +1301,7 @@
                 if column:
                     relation = self.pool.get(column._obj)
 
-                    childs = False
+                    children = False
                     views = {}
                     for f in node:
                         if f.tag in ('form', 'tree', 'graph'):
@@ -1362,8 +1362,10 @@
                 if trans:
                     node.set('sum', trans)
 
+        if children:
+            for f in node:
         for f in node:
-            if childs or (node.tag == 'field' and f.tag in ('filter','separator')):
+            if children or (node.tag == 'field' and f.tag in ('filter','separator')):
                 fields.update(self.__view_look_dom(cr, user, f, view_id, context))
 
         return fields
@@ -1410,7 +1412,7 @@
             fields = self.fields_get(cr, user, fields_def.keys(), context)
         for field in fields_def:
             if field == 'id':
-                # sometime, the view may containt the (invisible) field 'id' needed for a domain (when 2 objects have cross references)
+                # sometime, the view may contain the (invisible) field 'id' needed for a domain (when 2 objects have cross references)
                 fields['id'] = {'readonly': True, 'type': 'integer', 'string': 'ID'}
             elif field in fields:
                 fields[field].update(fields_def[field])
@@ -1420,7 +1422,7 @@
                 model = res[0][1]
                 res.insert(0, ("Can't find field '%s' in the following view parts composing the view of object model '%s':" % (field, model), None))
                 msg = "\n * ".join([r[0] for r in res])
-                msg += "\n\nEither you wrongly customised this view, or some modules bringing those views are not compatible with your current data model"
+                msg += "\n\nEither you wrongly customized this view, or some modules bringing those views are not compatible with your current data model"
                 netsvc.Logger().notifyChannel('orm', netsvc.LOG_ERROR, msg)
                 raise except_orm('View error', msg)
         return arch, fields
@@ -2329,8 +2331,8 @@
                 where += ' order by '+self._parent_order
             cr.execute('SELECT id FROM '+self._table+' WHERE '+where)
             pos2 = pos + 1
-            childs = cr.fetchall()
-            for id in childs:
+            children = cr.fetchall()
+            for id in children:
                 pos2 = browse_rec(id[0], pos2)
             cr.execute('update '+self._table+' set parent_left=%s, parent_right=%s where id=%s', (pos, pos2, root))
             return pos2 + 1

=== modified file 'bin/report/print_xml.py'
--- bin/report/print_xml.py	2010-05-03 23:49:53 +0000
+++ bin/report/print_xml.py	2010-10-25 07:46:03 +0000
@@ -254,7 +254,7 @@
                             for el_cld in node:
                                 self.parse_node(el_cld, el, v)
             else:
-                # if there is no "type" attribute in the node, copy it to the xml data and parse its childs
+                # if there is no "type" attribute in the node, copy it to the xml data and parse its children
                 if not node.tag == etree.Comment:
                     if node.tag == parent.tag:
                         el = parent

=== modified file 'bin/report/render/rml2pdf/trml2pdf.py'
--- bin/report/render/rml2pdf/trml2pdf.py	2010-10-07 10:11:27 +0000
+++ bin/report/render/rml2pdf/trml2pdf.py	2010-10-25 07:46:03 +0000
@@ -552,8 +552,8 @@
         return rc1
 
     def _table(self, node):
-        childs = utils._child_get(node,self,'tr')
-        if not childs:
+        children = utils._child_get(node,self,'tr')
+        if not children:
             return None
         length = 0
         colwidths = None
@@ -561,7 +561,7 @@
         data = []
         styles = []
         posy = 0
-        for tr in childs:
+        for tr in children:
             paraStyle = None
             if tr.get('style'):
                 st = copy.deepcopy(self.styles.table_styles[tr.get('style')])