From b224b40fac486b542dc23dc2d61af80afe8ebc71 Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Tue, 17 Sep 2013 14:23:12 +0200 Subject: [PATCH 1/3] [FIX] Restore compatibility with Babel > 0.9.6 lp bug: https://launchpad.net/bugs/1226576 fixed bzr revid: stefan@therp.nl-20130917122312-r6s7dgzdsfil7xyg --- openerp/tools/translate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py index f1efbc17f2d..08cfa362b9e 100644 --- a/openerp/tools/translate.py +++ b/openerp/tools/translate.py @@ -874,7 +874,7 @@ def trans_generate(lang, modules, cr): if module: src_file = open(fabsolutepath, 'r') try: - for lineno, message, comments in extract.extract(extract_method, src_file, + for lineno, message, comments, _context in extract.extract(extract_method, src_file, keywords=extract_keywords): push_translation(module, trans_type, display_path, lineno, encode(message), comments + extra_comments) From a9b8936a4dfddb0ce20b458427c7d91d76e4163a Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Wed, 18 Sep 2013 09:44:07 +0200 Subject: [PATCH 2/3] [RVT] Undo previous fix bzr revid: stefan@therp.nl-20130918074407-ae6yu2f001vxl0le --- openerp/tools/translate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py index 08cfa362b9e..f1efbc17f2d 100644 --- a/openerp/tools/translate.py +++ b/openerp/tools/translate.py @@ -874,7 +874,7 @@ def trans_generate(lang, modules, cr): if module: src_file = open(fabsolutepath, 'r') try: - for lineno, message, comments, _context in extract.extract(extract_method, src_file, + for lineno, message, comments in extract.extract(extract_method, src_file, keywords=extract_keywords): push_translation(module, trans_type, display_path, lineno, encode(message), comments + extra_comments) From 7de17a9358a190f1e1bc231e5c30fb3cbea8e6be Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Wed, 18 Sep 2013 09:45:05 +0200 Subject: [PATCH 3/3] [FIX] Keep backwards compatibility with Babel 0.9.6 bzr revid: stefan@therp.nl-20130918074505-59q1fs3ixlev1ein --- openerp/tools/translate.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py index f1efbc17f2d..7f6f4fd99eb 100644 --- a/openerp/tools/translate.py +++ b/openerp/tools/translate.py @@ -874,8 +874,11 @@ def trans_generate(lang, modules, cr): if module: src_file = open(fabsolutepath, 'r') try: - for lineno, message, comments in extract.extract(extract_method, src_file, - keywords=extract_keywords): + for extracted in extract.extract(extract_method, src_file, + keywords=extract_keywords): + # Babel 0.9.6 yields lineno, message, comments + # Babel 1.3 yields lineno, message, comments, context + lineno, message, comments = extracted[:3] push_translation(module, trans_type, display_path, lineno, encode(message), comments + extra_comments) except Exception: