From bd2b65318b65bdf3b12aeaa1deae653422f58973 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <>
Date: Fri, 22 Jun 2012 19:06:39 +0200
Subject: [PATCH] [FIX] clean some mess left after branch merge console.log()
 comment in the wrong place typo in a comment remove useless french
 translations

bzr revid: abo@openerp.com-20120622170639-2cohro2awcv6qf2t
---
 addons/mail/i18n/fr.po            | 18 ------------------
 addons/mail/static/src/js/mail.js |  7 +++----
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po
index d732f47eba1..f985ac50a08 100644
--- a/addons/mail/i18n/fr.po
+++ b/addons/mail/i18n/fr.po
@@ -537,23 +537,5 @@ msgstr "Adresse de réponse préférée pour le message"
 #~ msgid "Message headers"
 #~ msgstr "En-têtes de message"
 
-#~ msgid "about a minute ago"
-#~ msgstr "il y a une minute"
-
-#~ msgid "%d minutes ago"
-#~ msgstr "il y a %d minutes"
-
-#~ msgid "a day ago"
-#~ msgstr "il y a un jour"
-
-#~ msgid "%d days ago"
-#~ msgstr "il y a %d jours"
-
-#~ msgid "a month ago"
-#~ msgstr "il y a un mois"
-
-#~ msgid "%d months ago"
-#~ msgstr "il y a %d mois"
-
 #~ msgid "History and Comments"
 #~ msgstr "Historique et commentaires"
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 26c83f188ab..5633a4bdae0 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -206,7 +206,6 @@ openerp.mail = function(session) {
             });
             // see more
             this.$element.on('click','a.oe_mail_msg_more', function (event) {
-                console.log("sadf");
                 $(this).siblings('.oe_mail_msg_tail').show();
                 $(this).hide();
                 return false;
@@ -234,8 +233,6 @@ openerp.mail = function(session) {
                 if (records.length <= self.params.limit) self.display.show_more = false;
                 else { self.display.show_more = true; records.pop(); }
                 
-                //build attachments download urls and compute time-relative from dates
-                
                 self.display_comments(records);
                 if (self.display.show_more == true) self.$element.find('div.oe_mail_thread_more:last').show();
                 else  self.$element.find('div.oe_mail_thread_more:last').hide();
@@ -255,6 +252,8 @@ openerp.mail = function(session) {
         
         display_comments: function (records) {
             var self = this;
+            
+            //build attachments download urls and compute time-relative from dates
             for (var k in records) {
                 records[k].timerelative = $.timeago(records[k].date);
                 if (records[k].attachments) {
@@ -303,7 +302,7 @@ openerp.mail = function(session) {
             record.body = this.do_clean_text(record.body);
             record.body = this.do_replace_internal_links(record.body);
 
-            // split for see mode
+            // split for see more
             var split = this.do_truncate_string(record.body, this.params.msg_more_limit);
             record.body_head = split[0];
             record.body_tail = split[1];