diff --git a/openerp-server b/openerp-server index 71a52d5f06b..b5275ec9859 100755 --- a/openerp-server +++ b/openerp-server @@ -140,7 +140,6 @@ def import_translation(): cr = openerp.pooler.get_db(dbname).cursor() openerp.tools.trans_load( cr, config["translate_in"], config["language"], context=context) - openerp.tools.trans_update_res_ids(cr) cr.commit() cr.close() diff --git a/openerp/addons/base/module/wizard/base_import_language.py b/openerp/addons/base/module/wizard/base_import_language.py index acc0aa9640a..94b9ae4db59 100644 --- a/openerp/addons/base/module/wizard/base_import_language.py +++ b/openerp/addons/base/module/wizard/base_import_language.py @@ -63,7 +63,6 @@ class base_language_import(osv.osv_memory): fileobj.seek(0) tools.trans_load_data(cr, fileobj, fileformat, import_data.code, lang_name=import_data.name, context=context) - tools.trans_update_res_ids(cr) fileobj.close() return {} diff --git a/openerp/addons/base/module/wizard/base_update_translations.py b/openerp/addons/base/module/wizard/base_update_translations.py index ebdfc05b75c..0a9f5e9cca9 100644 --- a/openerp/addons/base/module/wizard/base_update_translations.py +++ b/openerp/addons/base/module/wizard/base_update_translations.py @@ -47,7 +47,6 @@ class base_update_translations(osv.osv_memory): buf=cStringIO.StringIO() tools.trans_export(this.lang, ['all'], buf, 'csv', cr) tools.trans_load_data(cr, buf, 'csv', this.lang, lang_name=lang_name) - tools.trans_update_res_ids(cr) buf.close() return {'type': 'ir.actions.act_window_close'} diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py index 7ae4b29dd28..dbf6bd98f88 100644 --- a/openerp/tools/translate.py +++ b/openerp/tools/translate.py @@ -852,9 +852,7 @@ def trans_load(cr, filename, lang, verbose=True, context=None): return None def trans_load_data(cr, fileobj, fileformat, lang, lang_name=None, verbose=True, context=None): - """Populates the ir_translation table. Fixing the res_ids so that they point - correctly to ir_model_data is done in a separate step, using the - 'trans_update_res_ids' function below.""" + """Populates the ir_translation table.""" logger = logging.getLogger('i18n') if verbose: logger.info('loading translation file for language %s', lang)