From f8c206b1b885d33286299d620c55bdcd9176b16e Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 7 Dec 2012 10:09:41 +0100
Subject: [PATCH] [IMP] mail: display message attachment error

bzr revid: chm@openerp.com-20121207090941-65b2vgwy066wlsmg
---
 addons/mail/static/src/js/mail.js   | 4 +---
 addons/mail/static/src/xml/mail.xml | 5 +++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 12e83f8fccf..e1625089a51 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -422,9 +422,7 @@ openerp.mail = function (session) {
         on_attachment_loaded: function (event, result) {
 
             if (result.erorr || !result.id ) {
-                var error_title = result.error.split('\n')[0];
-                var error_content = result.error.replace(/^.*\n/, '');
-                this.do_warn(error_title, error_content);
+                this.do_warn( session.web.qweb.render('mail.error_upload'), result.error);
                 this.attachment_ids = _.filter(this.attachment_ids, function (val) { return !val.upload; });
             } else {
                 for (var i in this.attachment_ids) {
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index cca908a5d98..f10770a27e1 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -179,6 +179,11 @@
         <div class="oe_view_nocontent">No messages.</div>
     </t>
 
+    <!--
+        error message for uploading
+        -->
+    <t t-name="mail.error_upload">Uploading error</t>
+
     <!--
         record_thread main template
         Template used to display the communication history in documents