summaryrefslogtreecommitdiff
path: root/addons/mail/static/src
diff options
context:
space:
mode:
authorNicolas Martinelli <nim@odoo.com>2015-12-08 15:42:07 +0100
committerNicolas Martinelli <nim@odoo.com>2015-12-08 15:44:04 +0100
commit6eba2582b680ac426a86e4bf4844a8d1ea6495e1 (patch)
tree0d459e34c233539728ae2e8bba143e1f2c255378 /addons/mail/static/src
parent521b90a8dabf84d85e705175198f5b52ba97d7a9 (diff)
[FIX] mail: localized time
Time is now localized in the discussion.
Diffstat (limited to 'addons/mail/static/src')
-rw-r--r--addons/mail/static/src/js/thread.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/mail/static/src/js/thread.js b/addons/mail/static/src/js/thread.js
index 609de2591aa..86b34255cf7 100644
--- a/addons/mail/static/src/js/thread.js
+++ b/addons/mail/static/src/js/thread.js
@@ -119,10 +119,10 @@ var Thread = Widget.extend({
msg.hour = msg.date.fromNow();
} else if (date === moment().subtract(1, 'days').format('YYYY-MM-DD')) {
msg.day = _t("Yesterday");
- msg.hour = msg.date.format('hh:mm');
+ msg.hour = msg.date.format('LT');
} else {
msg.day = msg.date.format('LL');
- msg.hour = msg.date.format('hh:mm');
+ msg.hour = msg.date.format('LT');
}
msg.display_subject = message.subject && message.message_type !== 'notification' && !(message.model && (message.model !== 'mail.channel'));