diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-01-27 12:24:04 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-01-27 12:24:04 +0100 |
| commit | 78d20b552b4374b94aec7097c0e6a48a3dd2d961 (patch) | |
| tree | 5acd7cbf1cc9e2f277034f44fc0ebebaa3a1a79c /addons/web/controllers/main.py | |
| parent | 740a6eadd379cc3fa26aefb9350f1c95b3e05ebd (diff) | |
| parent | 7e44ddcda3f21c7e6401173539dc0fe93f9a7dd2 (diff) | |
[MERGE] forward port of branch saas-8 up to 7e44ddc
Diffstat (limited to 'addons/web/controllers/main.py')
| -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)) |