From d4e2d3d89c4474acf1de14b658d89c8d902aa842 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 13 Aug 2013 12:00:19 +0200
Subject: [PATCH] [FIX] correctly place blocks

bzr revid: mat@openerp.com-20130813100019-l1tcja2ruc1nbf90
---
 addons/l10n_multilang/l10n_multilang.py | 37 +++++++++++++------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/addons/l10n_multilang/l10n_multilang.py b/addons/l10n_multilang/l10n_multilang.py
index 9047e700d8e..ccbe648e31c 100644
--- a/addons/l10n_multilang/l10n_multilang.py
+++ b/addons/l10n_multilang/l10n_multilang.py
@@ -175,25 +175,26 @@ class ir_translation(osv.osv):
         context = dict(context or {}) # local copy
         module_ids = self.pool.get('ir.module.module').search(cr, SUPERUSER_ID, [('name', 'in', modules)], context=context)
         for module in self.browse(cr, SUPERUSER_ID, module_ids, context=context):
-            for lang in langs:
-                lang_code = tools.get_iso_codes(lang)
-                base_lang_code = None
-                if '_' in lang_code:
-                    base_lang_code = lang_code.split('_')[0]
-
+            
             # Step 3: if additional translation folder is specified, load it as well
             if module.translation_folder:
-                module_name = module.name
-                base_trans_file = openerp.modules.get_module_resource(module_name, module.translation_folder, base_lang_code + '.po')
-                if base_trans_file:
-                    _logger.info('module %s: loading base translation file %s for language %s', module_name, base_lang_code, lang)
-                    tools.trans_load(cr, base_trans_file, lang, verbose=False, module_name=module_name, context=context)
-                    context['overwrite'] = True # make sure the requested translation will override the base terms later
-                trans_file = openerp.modules.get_module_resource(module_name, module.translation_folder, lang_code + '.po')
-                if trans_file:
-                    _logger.info('module %s: loading translation file (%s) for language %s', module_name, lang_code, lang)
-                    tools.trans_load(cr, trans_file, lang, verbose=False, module_name=module_name, context=context)
-                elif lang_code != 'en_US':
-                    _logger.warning('module %s: no translation for language %s', module_name, lang_code)
+                for lang in langs:
+                    lang_code = tools.get_iso_codes(lang)
+                    base_lang_code = None
+                    if '_' in lang_code:
+                        base_lang_code = lang_code.split('_')[0]
+
+                    module_name = module.name
+                    base_trans_file = openerp.modules.get_module_resource(module_name, module.translation_folder, base_lang_code + '.po')
+                    if base_trans_file:
+                        _logger.info('module %s: loading base translation file %s for language %s', module_name, base_lang_code, lang)
+                        tools.trans_load(cr, base_trans_file, lang, verbose=False, module_name=module_name, context=context)
+                        context['overwrite'] = True # make sure the requested translation will override the base terms later
+                    trans_file = openerp.modules.get_module_resource(module_name, module.translation_folder, lang_code + '.po')
+                    if trans_file:
+                        _logger.info('module %s: loading translation file (%s) for language %s', module_name, lang_code, lang)
+                        tools.trans_load(cr, trans_file, lang, verbose=False, module_name=module_name, context=context)
+                    elif lang_code != 'en_US':
+                        _logger.warning('module %s: no translation for language %s', module_name, lang_code)
 
         return res
\ No newline at end of file