odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] improved code. 

bzr revid: tpa@tinyerp.com-20120712132308-1qvurv572sxmsnqe
This commit is contained in:
Turkesh Patel (Open ERP) 2012-07-12 18:53:08 +05:30
parent 976944bce2
commit bc76991e24
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openerp/addons/base/ir/ir_translation.py
View File

@ -340,9 +340,7 @@ class ir_translation(osv.osv):
f2 = openerp.modules.get_module_resource(module_name, 'i18n', iso_lang2 + '.po')
if f2:
_logger.info('module %s: loading base translation file %s for language %s', module_name, iso_lang2, lang)
trans = tools.trans_load(cr, f2, lang, verbose=False, flag=flag, module_name=module_name, context=context)
if trans:
translated_data['messages'].extend(trans)
translated_data['messages'].extend(tools.trans_load(cr, f2, lang, verbose=False, flag=flag, module_name=module_name, context=context))
context2['overwrite'] = True
# Implementation notice: we must first search for the full name of
# the language derivative, like "en_UK", and then the generic,
@ -352,9 +350,7 @@ class ir_translation(osv.osv):
f = openerp.modules.get_module_resource(module_name, 'i18n', iso_lang + '.po')
if f:
_logger.info('module %s: loading translation file (%s) for language %s', module_name, iso_lang, lang)
trans = tools.trans_load(cr, f, lang, verbose=False, flag=flag, module_name=module_name, context=context2)
if trans:
translated_data['messages'].extend(trans)
translated_data['messages'].extend(tools.trans_load(cr, f, lang, verbose=False, flag=flag, module_name=module_name, context=context2))
elif iso_lang != 'en':
_logger.warning('module %s: no translation for language %s', module_name, iso_lang)
return translated_data

4
openerp/tools/translate.py
View File

@ -857,9 +857,9 @@ def trans_load(cr, filename, lang, verbose=True, flag=None, module_name=None, co
return transl
else:
fileformat = os.path.splitext(filename)[-1][1:].lower()
r = trans_load_data(cr, fileobj, fileformat, lang, verbose=verbose, module_name=module_name, context=context)
trans_load_data(cr, fileobj, fileformat, lang, verbose=verbose, module_name=module_name, context=context)
fileobj.close()
return r
return []
except IOError:
if verbose:
_logger.error("couldn't read translation file %s", filename)