diff options
| author | Julien Legros <jle@odoo.com> | 2016-01-25 11:26:27 +0100 |
|---|---|---|
| committer | Julien Legros <jle@odoo.com> | 2016-01-25 11:26:27 +0100 |
| commit | e5e7c4c1217c04d93820cf6007fd8ceed30d0cfa (patch) | |
| tree | 0c475b2aa9f8f1b92f1550466cc189f1ba36230b /addons/web/controllers | |
| parent | 85b39df834c8689fd22e1a56d780af703a61909d (diff) | |
| parent | 6872aae8ef9c1a1fc6a8283aa9d12ce3a6859157 (diff) | |
[MERGE] forward port of branch 9.0 up to 6872aae
Diffstat (limited to 'addons/web/controllers')
| -rw-r--r-- | addons/web/controllers/main.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 9b2a3243866..aa4c1c32fcb 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1067,7 +1067,7 @@ class Binary(http.Controller): 'id': attachment_id } except Exception: - args = {'error': "Something horrible happened"} + args = {'error': _("Something horrible happened")} _logger.exception("Fail to upload attachment %s" % ufile.filename) return out % (json.dumps(callback), json.dumps(args)) |