From 6f930404ed0d67116a30161a5827f61d57f7833b Mon Sep 17 00:00:00 2001 From: Julien Thewys Date: Tue, 26 Oct 2010 14:19:07 +0200 Subject: [PATCH] [REF] Manages languages loading just after loading 'base' module. bzr revid: jth@openerp.com-20101026121907-zw39q62c3s3qjp6o --- bin/addons/__init__.py | 4 ++++ bin/openerp-server.py | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py index 72e9fb2c6e2..c0c7641b86c 100644 --- a/bin/addons/__init__.py +++ b/bin/addons/__init__.py @@ -808,6 +808,10 @@ def load_modules(db, force_demo=False, status=None, update_module=False): raise osv.osv.except_osv('Could not load base module', 'module base cannot be loaded! (hint: verify addons-path)') has_updates = load_module_graph(cr, graph, status, perform_checks=(not update_module), report=report) + if tools.config['load_language']: + for lang in tools.config['load_language'].split(','): + tools.load_language(cr, lang) + if update_module: modobj = pool.get('ir.module.module') logger.notifyChannel('init', netsvc.LOG_INFO, 'updating modules list') diff --git a/bin/openerp-server.py b/bin/openerp-server.py index 18a2238daea..7a811bb137e 100755 --- a/bin/openerp-server.py +++ b/bin/openerp-server.py @@ -126,10 +126,6 @@ if tools.config['db_name']: tools.convert_yaml_import(cr, 'base', file(tools.config["test_file"]), {}, 'test', True) cr.rollback() - if tools.config['load_language']: - for lang in tools.config['load_language'].split(','): - tools.load_language(cr, lang) - pool.get('ir.cron')._poolJobs(db.dbname) cr.close()