odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[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
This commit is contained in:
Antony Lesuisse 2012-06-22 19:06:39 +02:00 committed by Antonin Bourguignon
parent 4a88fba764
commit bd2b65318b
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
addons/mail/i18n/fr.po
View File

@ -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"

7
addons/mail/static/src/js/mail.js
View File

@ -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];