Merge lp:~openerp-dev/openobject-server/trunk-bug-885134-nch into lp:openobject-server

[Naresh(OpenERP)]

=== modified file 'openerp/addons/base/module/module.py'
--- openerp/addons/base/module/module.py	2011-11-22 08:58:48 +0000
+++ openerp/addons/base/module/module.py	2011-11-30 08:57:41 +0000
@@ -542,13 +542,13 @@
                     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)

=== modified file 'openerp/tools/translate.py'
--- openerp/tools/translate.py	2011-10-14 15:02:10 +0000
+++ openerp/tools/translate.py	2011-11-30 08:57:41 +0000
@@ -840,7 +840,7 @@
 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)