From 973af690b547f55aedccac941514bc4d47905d7b Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 20 Oct 2010 19:17:39 +0200
Subject: [PATCH] [IMP] base: improve some error messages/translations
 (modified patch from P. Christeas)

bzr revid: odo@openerp.com-20101020171739-2uc9a6fechrl5iaj
---
 bin/addons/base/ir/ir_model.py    |  2 +-
 bin/addons/base/module/module.py  | 12 +++++++++---
 bin/addons/base/res/res_config.py |  3 +--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index e6b4a2da98f..3f3700b0e45 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -209,7 +209,7 @@ class ir_model_fields(osv.osv):
                 raise except_orm(_('Error'), _("Custom fields must have a name that starts with 'x_' !"))
 
             if vals.get('relation',False) and not self.pool.get('ir.model').search(cr, user, [('model','=',vals['relation'])]):
-                 raise except_orm(_('Error'), _("Model %s Does not Exist !" % vals['relation']))
+                 raise except_orm(_('Error'), _("Model %s does not exist!") % vals['relation'])
 
             if self.pool.get(vals['model']):
                 self.pool.get(vals['model']).__init__(self.pool, cr)
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:
diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index 47667a5ba81..1b4df76ec1d 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -99,8 +99,7 @@ class res_config_configurable(osv.osv_memory):
         if not previous_todo:
             raise LookupError(_("Couldn't find previous ir.actions.todo"))
         if not state:
-            raise ValueError(_("Can't set an ir.actions.todo's state to "
-                               "nothingness"))
+            raise ValueError(_("Can't set an ir.actions.todo's state to an empty value."))
         previous_todo.write({'state':state})
 
     def _next(self, cr, uid, context=None):