[MERGE] from trunk

bzr revid: chm@openerp.com-20121017073146-9m5s2hffeekmj068

4 files changed, 18 insertions, 25 deletions

diff --git a/addons/mail/i18n/pt_BR.po b/addons/mail/i18n/pt_BR.po
index a08977769d0..d3985d00a31 100644
--- a/addons/mail/i18n/pt_BR.po
+++ b/addons/mail/i18n/pt_BR.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
-"PO-Revision-Date: 2011-01-17 18:39+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-10-17 00:25+0000\n"
+"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-17 04:36+0000\n"
+"X-Generator: Launchpad (build 16152)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
 #: field:mail.message.common,subtype:0
 msgid "Message Type"
-msgstr ""
+msgstr "Tipo de Mensagem"
 
 #. module: mail
 #: help:mail.compose.message,auto_delete:0
@@ -80,7 +80,7 @@ msgstr "Destinatários da mensagem"
 #: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
 #: field:mail.message.common,body_text:0
 msgid "Text Contents"
-msgstr ""
+msgstr "Conteúdo do Texto"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
@@ -196,7 +196,7 @@ msgstr "Destinatários"
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Assistente para compor Email"
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
@@ -219,7 +219,7 @@ msgstr "Re:"
 #: field:mail.compose.message,model:0 field:mail.message,model:0
 #: field:mail.message.common,model:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "Modelo de Documento Relacionado"
 
 #. module: mail
 #: view:mail.message:0
@@ -287,7 +287,7 @@ msgstr "%(sender_name)s escreveu:"
 #: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
 #: field:mail.message.common,body_html:0
 msgid "Rich-text Contents"
-msgstr ""
+msgstr "Conteúdo Rich-text"
 
 #. module: mail
 #: field:mail.message,original:0
@@ -360,7 +360,7 @@ msgstr "[OpenERP-Forward-Failed] %s"
 #. module: mail
 #: field:mail.message,user_id:0
 msgid "Related User"
-msgstr ""
+msgstr "Usuário Relacionado"
 
 #. module: mail
 #: help:mail.compose.message,headers:0 help:mail.message,headers:0
@@ -455,7 +455,7 @@ msgstr "Mensagens"
 #: field:mail.compose.message,headers:0 field:mail.message,headers:0
 #: field:mail.message.common,headers:0
 msgid "Message Headers"
-msgstr ""
+msgstr "Cabeçalhos da Mensagem"
 
 #. module: mail
 #: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 6211ca911ea..83f234f3d33 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1228,14 +1228,7 @@ openerp.mail = function(session) {
         _check_visibility: function() {
             this.$el.toggle(this.view.get("actual_mode") !== "create");
         },
-
-        /**
-         * Reinitialize the widget field and Display the threads
-         * @param {Object} new_context: context of the refresh
-          */
-        set_value: function() {
-            var self = this;
-            this._super.apply(this, arguments);
+        render_value: function() {
             if (! this.view.datarecord.id || session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
                 this.$('oe_mail_thread').hide();
                 return;
@@ -1343,7 +1336,7 @@ openerp.mail = function(session) {
                 domains: domains || [],
                 contexts: contexts || [],
                 group_by_seq: groupbys || []
-            }, function (results) {
+            }).then(function (results) {
                 self.search_results['context'] = results.context;
                 self.search_results['domain'] = results.domain;
                 self.thread.destroy();
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 2367705f1e9..58b7e910cb8 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -88,9 +88,9 @@ openerp_mail_followers = function(session, mail) {
             });
         },
 
-        set_value: function(value_) {
+        render_value: function() {
             this.reinit();
-            return this.fetch_followers(value_  || this.get_value());
+            return this.fetch_followers(this.get("value"));
         },
 
         set_is_follower: function(value_) {
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 216322003b5..a225fcc7f63 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -68,7 +68,7 @@
                         <t t-raw="attachment.name || attachment.filename"/>
                     </a>
                     <t t-if="widget.options.thread.show_attachment_delete and (!attachment.upload or attachment.percent_loaded&gt;=100)">
-                        <a class="oe_right oe_mail_attachment_delete" title="Delete this attachmentt" t-attf-data-id="{attachment.id}">x</a>
+                        <a class="oe_right oe_mail_attachment_delete" title="Delete this attachment" t-attf-data-id="{attachment.id}">x</a>
                     </t>
 
                 </li>
@@ -276,8 +276,8 @@
         </span>
         <button t-attf-class="oe_msg_vote oe_tag">
             <span>
-                <t t-if="!widget.datasets.has_voted">Agree</t>
-                <t t-if="widget.datasets.has_voted">Unagree</t>
+                <t t-if="!widget.has_voted">Agree</t>
+                <t t-if="widget.has_voted">Undo</t>
             </span>
         </button>
     </span>