From 6b9592d43a2bae57f46ca4921bb2963c2e4dfbb2 Mon Sep 17 00:00:00 2001
From: "Hubert (huvw)" <huvw@odoo.com>
Date: Wed, 7 Jul 2021 13:43:13 +0000
Subject: [PATCH] [FIX] calendar, mail: Use user supplied date format in the
 activity overview

Ticket: 2578903

In the overview menu, the time of a calendar event was not formatted according to the user preferences. This PR fixes that.

closes odoo/odoo#75039

X-original-commit: 0f9746adab26a792fba5d9cfe8e30ea90d7c2a67
Signed-off-by: Arnaud Joset <arj-odoo@users.noreply.github.com>
Signed-off-by: Hubert Van De Walle <hubvd@users.noreply.github.com>
---
 addons/calendar/static/src/xml/base_calendar.xml           | 2 +-
 addons/mail/static/src/js/systray/systray_activity_menu.js | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/calendar/static/src/xml/base_calendar.xml b/addons/calendar/static/src/xml/base_calendar.xml
index dfa1513efb7..ea6276d2924 100644
--- a/addons/calendar/static/src/xml/base_calendar.xml
+++ b/addons/calendar/static/src/xml/base_calendar.xml
@@ -32,7 +32,7 @@
                             <t t-if="meeting.allday">All Day</t>
                             <t t-else=''>
                                 <t t-set="is_next_meeting" t-value="false"/>
-                                <t t-esc="moment(meeting.start).local().format('hh:mm A')"/>
+                                <t t-esc="moment(meeting.start).local().format(Time.strftime_to_moment_format(_t.database.parameters.time_format))"/>
                             </t>
                         </span>
                     </div>
diff --git a/addons/mail/static/src/js/systray/systray_activity_menu.js b/addons/mail/static/src/js/systray/systray_activity_menu.js
index 3515078d2cc..0a90428c421 100644
--- a/addons/mail/static/src/js/systray/systray_activity_menu.js
+++ b/addons/mail/static/src/js/systray/systray_activity_menu.js
@@ -4,6 +4,7 @@ import { qweb as QWeb } from 'web.core';
 import session  from 'web.session';
 import SystrayMenu from 'web.SystrayMenu';
 import Widget from 'web.Widget';
+import Time from 'web.time';
 
 const { Component } = owl;
 
@@ -78,7 +79,8 @@ var ActivityMenu = Widget.extend({
         var self = this;
         self._getActivityData().then(function (){
             self._$activitiesPreview.html(QWeb.render('mail.systray.ActivityMenu.Previews', {
-                widget: self
+                widget: self,
+                Time: Time
             }));
         });
     },