From: Raphael Collet <rco@openerp.com>
Date: Thu, 27 Nov 2014 10:07:09 +0000 (+0100)
Subject: [IMP] translate: small, non-breaking code improvements
X-Git-Url: http://git.inspyration.org/?p=odoo%2Fodoo.git;a=commitdiff_plain;h=be10d1e573c09806c105a04bc3ca956c90923423

[IMP] translate: small, non-breaking code improvements
---

diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py
index e02319f..32fd5bc 100644
--- a/openerp/tools/translate.py
+++ b/openerp/tools/translate.py
@@ -667,8 +667,7 @@ def trans_generate(lang, modules, cr):
             return
 
         tnx = (module, source, name, id, type, tuple(comments or ()))
-        if tnx not in _to_translate:
-            _to_translate.add(tnx)
+        _to_translate.add(tnx)
 
     def encode(s):
         if isinstance(s, unicode):
@@ -1002,8 +1001,8 @@ def trans_load_data(cr, fileobj, fileformat, lang, lang_name=None, verbose=True,
             if not res_id:
                 return
 
-            if unicode(res_id).isdigit():
-                # res_id is either an integer, or a string composed of digits only
+            if isinstance(res_id, (int, long)) or \
+                    (isinstance(res_id, basestring) and res_id.isdigit()):
                 dic['res_id'] = int(res_id)
                 dic['module'] = module_name
             else: