diff options
| author | Olivier Dony <odo@openerp.com> | 2010-10-20 19:17:39 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2010-10-20 19:17:39 +0200 |
| commit | 973af690b547f55aedccac941514bc4d47905d7b (patch) | |
| tree | 87acaf18c5ad90d425a9a66b511719b9820436b2 /bin/addons/base/module/module.py | |
| parent | 69ea0530937411a81bd3caff170b403dfdde3aea (diff) | |
[IMP] base: improve some error messages/translations (modified patch from P. Christeas)
bzr revid: odo@openerp.com-20101020171739-2uc9a6fechrl5iaj
Diffstat (limited to 'bin/addons/base/module/module.py')
| -rw-r--r-- | bin/addons/base/module/module.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py index b2c2da96d13..f552a24de64 100644 --- a/bin/addons/base/module/module.py +++ b/bin/addons/base/module/module.py @@ -232,7 +232,7 @@ class module(osv.osv): raise Exception('Unable to find %r in path' % (binary,)) - def state_update(self, cr, uid, ids, newstate, states_to_update, context={}, level=100): + def state_update(self, cr, uid, ids, newstate, states_to_update, context=None, level=100): if level<1: raise orm.except_orm(_('Error'), _('Recursion error in modules dependencies !')) demo = False @@ -240,7 +240,7 @@ class module(osv.osv): mdemo = False for dep in module.dependencies_id: if dep.state == 'unknown': - raise orm.except_orm(_('Error'), _("You try to install the module '%s' that depends on the module:'%s'.\nBut this module is not available in your system.") % (module.name, dep.name,)) + raise orm.except_orm(_('Error'), _("You try to install module '%s' that depends on module '%s'.\nBut the latter module is not available in your system.") % (module.name, dep.name,)) ids2 = self.search(cr, uid, [('name','=',dep.name)]) if dep.state != newstate: mdemo = self.state_update(cr, uid, ids2, newstate, states_to_update, context, level-1,) or mdemo @@ -252,7 +252,13 @@ class module(osv.osv): try: self._check_external_dependencies(terp) except Exception, e: - raise orm.except_orm(_('Error'), _('Unable %s the module "%s" because an external dependencie is not met: %s' % (newstate, module.name, e.args[0]))) + if newstate == 'to install': + msg = _('Unable to install module "%s" because an external dependency is not met: %s') + elif newstate == 'to upgrade': + msg = _('Unable to upgrade module "%s" because an external dependency is not met: %s') + else: + msg = _('Unable to process module "%s" because an external dependency is not met: %s') + raise orm.except_orm(_('Error'), msg % (module.name, e.args[0])) if not module.dependencies_id: mdemo = module.demo if module.state in states_to_update: |