[FIX] handle the case when 'selection' in wizard are functions

[FIX] handle the case when the rml or the xsl are not correct xml

bzr revid: christophe@cobalt-20081219230001-n2o1s5nxfesgegdw
This commit is contained in:
Christophe Simonis 2008-12-20 00:00:01 +01:00
parent f16bd3f97e
commit 74b55c57e7
1 changed files with 4 additions and 4 deletions

View File

@ -366,10 +366,10 @@ def trans_generate(lang, modules, dbname=None):
if result['type'] != 'form':
continue
name = "%s,%s" % (encode(obj.wiz_name), state_name)
def_params = {
'string': ('wizard_field', lambda s: [encode(s)]),
'selection': ('selection', lambda s: [encode(e[1]) for e in s]),
'selection': ('selection', lambda s: [encode(e[1]) for e in (callable(s) and s(None, cr, uid, {}) or s)]),
'help': ('help', lambda s: [encode(s)]),
}
@ -444,9 +444,9 @@ def trans_generate(lang, modules, dbname=None):
d = xml.dom.minidom.parseString(xmlstr)
for t in parse_func(d.documentElement):
push_translation(module, report_type, name, 0, t)
except IOError:
except IOError, xml.dom.expatbuilder.expat.ExpatError:
if fname:
logger.notifyChannel("init", netsvc.LOG_WARNING, "couldn't export translation for report %s %s %s" % (name, report_type, fname))
logger.notifyChannel("init", netsvc.LOG_ERROR, "couldn't export translation for report %s %s %s" % (name, report_type, fname))
for constraint in pool.get(model)._constraints:
msg = constraint[1]