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

This commit is contained in:
Raphael Collet 2014-11-27 11:07:09 +01:00
parent 4d6fb49b8f
commit be10d1e573
1 changed files with 3 additions and 4 deletions

View File

@ -667,8 +667,7 @@ def trans_generate(lang, modules, cr):
return return
tnx = (module, source, name, id, type, tuple(comments or ())) 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): def encode(s):
if isinstance(s, unicode): 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: if not res_id:
return return
if unicode(res_id).isdigit(): if isinstance(res_id, (int, long)) or \
# res_id is either an integer, or a string composed of digits only (isinstance(res_id, basestring) and res_id.isdigit()):
dic['res_id'] = int(res_id) dic['res_id'] = int(res_id)
dic['module'] = module_name dic['module'] = module_name
else: else: