From 781a14d67263e8c0caaa64d72d09fab39157d534 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 10 Jun 2009 10:11:57 +0200 Subject: [PATCH] [FIX] translations resynchro terms bzr revid: fp@tinyerp.com-20090610081157-5g0sw2ahciqpfbvd --- bin/addons/base/i18n/fr_FR.po | 1 + bin/addons/base/ir/ir.xml | 2 +- bin/tools/translate.py | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/bin/addons/base/i18n/fr_FR.po b/bin/addons/base/i18n/fr_FR.po index f9522f6f185..fcfe08ad585 100644 --- a/bin/addons/base/i18n/fr_FR.po +++ b/bin/addons/base/i18n/fr_FR.po @@ -3424,6 +3424,7 @@ msgstr "Configuration de l'action client" #. module: base #: model:ir.actions.act_window,name:base.action_partner_address_form #: model:ir.model,name:base.model_res_partner_address +#: model:ir.ui.menu,name:base.menu_partner_address_form #: view:res.partner.address:0 msgid "Partner Addresses" msgstr "Adresses des Partenaires" diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml index e7efd83dfb2..c1314cac2c3 100644 --- a/bin/addons/base/ir/ir.xml +++ b/bin/addons/base/ir/ir.xml @@ -928,7 +928,7 @@ ir.translation form - [('value', '=', False)] + ['|',('value', '=', False),('value','=','')] diff --git a/bin/tools/translate.py b/bin/tools/translate.py index 85acb9658fc..59d6630516f 100644 --- a/bin/tools/translate.py +++ b/bin/tools/translate.py @@ -524,8 +524,11 @@ def trans_generate(lang, modules, dbname=None): for field_name,field_def in pool.get(model)._columns.items(): if field_def.translate: name = model + "," + field_name - trad = getattr(obj, field_name) or '' - push_translation(module, 'model', name, xml_name, encode(trad)) + try: + trad = getattr(obj, field_name) or '' + push_translation(module, 'model', name, xml_name, encode(trad)) + except: + pass # parse source code for _() calls def get_module_from_path(path): @@ -643,8 +646,8 @@ def trans_load_data(db_name, fileobj, fileformat, lang, strict=False, lang_name= for row in reader: line += 1 # skip empty rows and rows where the translation field (=last fiefd) is empty - if (not row) or (not row[-1]): - continue + #if (not row) or (not row[-1]): + # continue # dictionary which holds values for this line of the csv file # {'lang': ..., 'type': ..., 'name': ..., 'res_id': ...,