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

[IMP] improved code in module.py to load translation. 

bzr revid: tpa@tinyerp.com-20120712095131-3tt25snidvafflhb
This commit is contained in:
Turkesh Patel (Open ERP) 2012-07-12 15:21:31 +05:30
parent 20646e9104
commit 976944bce2
2 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,7 +324,7 @@ class ir_translation(osv.osv):
"""
return ir_translation_import_cursor(cr, uid, self, context=context)
def load(self, cr, modules, langs, flag, context=None):
def load(self, cr, modules, langs, flag=None, context=None):
translated_data = {'messages':[]}
for module_name in modules:
modpath = openerp.modules.get_module_path(module_name)

30
openerp/addons/base/module/module.py
View File

@ -596,8 +596,8 @@ class module(osv.osv):
def update_translations(self, cr, uid, ids, filter_lang=None, context=None):
if context is None:
context = {}
pool = pooler.get_pool(cr.dbname)
if not filter_lang:
pool = pooler.get_pool(cr.dbname)
lang_obj = pool.get('res.lang')
lang_ids = lang_obj.search(cr, uid, [('translatable', '=', True)])
filter_lang = [lang.code for lang in lang_obj.browse(cr, uid, lang_ids)]
@ -607,32 +607,8 @@ class module(osv.osv):
for mod in self.browse(cr, uid, ids):
if mod.state != 'installed':
continue
modpath = modules.get_module_path(mod.name)
if not modpath:
# unable to find the module. we skip
continue
for lang in filter_lang:
iso_lang = tools.get_iso_codes(lang)
f = modules.get_module_resource(mod.name, 'i18n', iso_lang + '.po')
context2 = context and context.copy() or {}
if f and '_' in iso_lang:
iso_lang2 = iso_lang.split('_')[0]
f2 = modules.get_module_resource(mod.name, 'i18n', iso_lang2 + '.po')
if f2:
_logger.info('module %s: loading base translation file %s for language %s', mod.name, iso_lang2, lang)
tools.trans_load(cr, f2, lang, verbose=False, module_name=mod.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,
# like "en".
if (not f) and '_' in iso_lang:
iso_lang = iso_lang.split('_')[0]
f = modules.get_module_resource(mod.name, 'i18n', iso_lang + '.po')
if f:
_logger.info('module %s: loading translation file (%s) for language %s', mod.name, iso_lang, lang)
tools.trans_load(cr, f, lang, verbose=False, module_name=mod.name, context=context2)
elif iso_lang != 'en':
_logger.warning('module %s: no translation for language %s', mod.name, iso_lang)
traslation_obj = pool.get('ir.translation')
traslation_obj.load(cr, [mod.name], filter_lang, context=context)
def check(self, cr, uid, ids, context=None):
for mod in self.browse(cr, uid, ids, context=context):