diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-12-09 15:04:42 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-12-09 15:04:42 +0100 |
| commit | 75e7f0da10d1b74af09b1afdf74b19ef7a504f58 (patch) | |
| tree | 613a6b948501d38fa54b341697ee854fa4e303fd /addons/auth_signup/controllers/main.py | |
| parent | da5d6289114c0cf687681bde8debed6676698abf (diff) | |
| parent | 5ece76b71754b5d048ab9a2f99fd905fcefeac6b (diff) | |
[MERGE] forward port branch 8.0 up to 5ece76b
Diffstat (limited to 'addons/auth_signup/controllers/main.py')
| -rw-r--r-- | addons/auth_signup/controllers/main.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py index 9a24aa3a39b..48d533b8cf6 100644 --- a/addons/auth_signup/controllers/main.py +++ b/addons/auth_signup/controllers/main.py @@ -84,8 +84,7 @@ class AuthSignupHome(openerp.addons.web.controllers.main.Home): qcontext['error'] = _("Could not reset your password") _logger.exception('error when resetting password') except Exception, e: - qcontext['error'] = _(e.message) - + qcontext['error'] = e.message or e.name return request.render('auth_signup.reset_password', qcontext) |