From c43b1f298bb39d3f1a0175220fa906e36eb94e86 Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Thu, 23 Aug 2012 18:19:59 +0200 Subject: [PATCH 1/2] [IMP] module: set two distinct fields for module's description: one for the RST and the other for the HTML this way, we keep translatable the text field bzr revid: abo@openerp.com-20120823161959-3hewgtegb5h1yw93 --- openerp/addons/base/module/module.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py index bdd9bcf2fb2..db953356ab9 100644 --- a/openerp/addons/base/module/module.py +++ b/openerp/addons/base/module/module.py @@ -193,7 +193,8 @@ class module(osv.osv): 'category_id': fields.many2one('ir.module.category', 'Category', readonly=True, select=True), 'shortdesc': fields.char('Module Name', size=64, readonly=True, translate=True), 'summary': fields.char('Summary', size=64, readonly=True, translate=True), - 'description': fields.function(_get_desc, string='Description', type='html', method=True, readonly=True, store=True), + 'description': fields.text("Description", readonly=True, translate=True), + 'description_html': fields.function(_get_desc, string='Description HTML', type='html', method=True, readonly=True), 'author': fields.char("Author", size=128, readonly=True), 'maintainer': fields.char('Maintainer', size=128, readonly=True), 'contributors': fields.text('Contributors', readonly=True), @@ -233,7 +234,7 @@ class module(osv.osv): ('AGPL-3', 'Affero GPL-3'), ('Other OSI approved licence', 'Other OSI Approved Licence'), ('Other proprietary', 'Other Proprietary') - ], string='License', readonly=True), + ], string='License', readonly=True), 'menus_by_module': fields.function(_get_views, string='Menus', type='text', multi="meta", store=True), 'reports_by_module': fields.function(_get_views, string='Reports', type='text', multi="meta", store=True), 'views_by_module': fields.function(_get_views, string='Views', type='text', multi="meta", store=True), From b28a9562482a8e9837f3a79093354b767d32c07d Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Thu, 23 Aug 2012 19:34:18 +0200 Subject: [PATCH 2/2] [IMP] module: properly translate module's description bzr revid: abo@openerp.com-20120823173418-1qed27su2x0jy1ku --- openerp/addons/base/module/module.py | 3 +-- openerp/addons/base/module/module_view.xml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py index db953356ab9..617a31dae66 100644 --- a/openerp/addons/base/module/module.py +++ b/openerp/addons/base/module/module.py @@ -99,9 +99,8 @@ class module(osv.osv): def _get_desc(self, cr, uid, ids, field_name=None, arg=None, context=None): res = dict.fromkeys(ids, '') for module in self.browse(cr, uid, ids, context=context): - desc = self.get_module_info(module.name).get('description', '') overrides = dict(embed_stylesheet=False, doctitle_xform=False, output_encoding='unicode') - output = publish_string(source=desc, writer_name='html', settings_overrides=overrides) + output = publish_string(source=module.description, writer_name='html', settings_overrides=overrides) res[module.id] = output return res diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml index ec7db50bbe6..27eccf020b2 100644 --- a/openerp/addons/base/module/module_view.xml +++ b/openerp/addons/base/module/module_view.xml @@ -133,7 +133,7 @@ - +