From f211942d6a7b08b6f65bbfcd17c3d01da8ad39a2 Mon Sep 17 00:00:00 2001 From: "Naresh (OpenERP)" Date: Wed, 30 Nov 2011 14:24:52 +0530 Subject: [PATCH] [FIX]:loading translation of .zip module lp bug: https://launchpad.net/bugs/885134 fixed bzr revid: nch@tinyerp.com-20111130085452-vcrxnv86avhfihom --- openerp/addons/base/module/module.py | 2 +- openerp/tools/translate.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py index 8e8181c89a2..2955d1d33a2 100644 --- a/openerp/addons/base/module/module.py +++ b/openerp/addons/base/module/module.py @@ -542,13 +542,13 @@ class module(osv.osv): 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, 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 = addons.get_module_resource(mod.name, 'i18n', iso_lang + '.po') + context2['overwrite'] = True 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, context=context2) diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py index e163c59a82f..72c8798ce84 100644 --- a/openerp/tools/translate.py +++ b/openerp/tools/translate.py @@ -840,7 +840,7 @@ def trans_generate(lang, modules, cr): def trans_load(cr, filename, lang, verbose=True, context=None): logger = logging.getLogger('i18n') try: - fileobj = open(filename,'r') + fileobj = misc.file_open(filename) logger.info("loading %s", filename) fileformat = os.path.splitext(filename)[-1][1:].lower() r = trans_load_data(cr, fileobj, fileformat, lang, verbose=verbose, context=context)