[MERGE] Forward port of branch saas-7 up to c298cf3

1 files changed, 4 insertions, 3 deletions

diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py
index 85f49b1ea06..40cd1bbfd59 100644
--- a/openerp/modules/loading.py
+++ b/openerp/modules/loading.py
@@ -278,12 +278,13 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
         report = registry._assertion_report
         loaded_modules, processed_modules = load_module_graph(cr, graph, status, perform_checks=update_module, report=report)
 
-        if tools.config['load_language'] or update_module:
+        load_lang = tools.config.pop('load_language')
+        if load_lang or update_module:
             # some base models are used below, so make sure they are set up
             registry.setup_models(cr, partial=True)
 
-        if tools.config['load_language']:
-            for lang in tools.config['load_language'].split(','):
+        if load_lang:
+            for lang in load_lang.split(','):
                 tools.load_language(cr, lang)
 
         # STEP 2: Mark other modules to be loaded/updated