From e9db06c1068ab1920fd4f1854820c8c17358efb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20K=C3=BChn?= <aku@odoo.com>
Date: Wed, 22 Mar 2023 14:14:31 +0000
Subject: [PATCH] [FIX] mail: use 24-hour format for squashed message timestamp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes odoo/odoo#116216

Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 addons/mail/static/src/core/message_model.js   |  8 --------
 addons/mail/static/src/core/message_service.js | 17 ++++++++++++++++-
 addons/mail/static/src/core_ui/message.xml     |  8 ++++----
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/addons/mail/static/src/core/message_model.js b/addons/mail/static/src/core/message_model.js
index 00704cd8f6c..430c0970de1 100644
--- a/addons/mail/static/src/core/message_model.js
+++ b/addons/mail/static/src/core/message_model.js
@@ -107,14 +107,6 @@ export class Message {
         );
     }
 
-    get scheduledDateShort() {
-        return this.scheduledDate.toLocaleString(DateTime.TIME_SIMPLE);
-    }
-
-    get datetimeSimpleStr() {
-        return this.datetime.toLocaleString(DateTime.TIME_SIMPLE);
-    }
-
     get datetimeShort() {
         return this.datetime.toLocaleString(DateTime.DATETIME_SHORT);
     }
diff --git a/addons/mail/static/src/core/message_service.js b/addons/mail/static/src/core/message_service.js
index ee89f29a649..4ceb01809f3 100644
--- a/addons/mail/static/src/core/message_service.js
+++ b/addons/mail/static/src/core/message_service.js
@@ -13,6 +13,8 @@ import { assignDefined, createLocalId } from "../utils/misc";
 
 const commandRegistry = registry.category("mail.channel_commands");
 
+const { DateTime } = luxon;
+
 export class MessageService {
     constructor(env, services) {
         this.env = env;
@@ -20,6 +22,7 @@ export class MessageService {
         this.store = services["mail.store"];
         this.rpc = services.rpc;
         this.orm = services.orm;
+        this.userService = services.user;
         /** @type {import("@mail/core/persona_service").PersonaService} */
         this.personaService = services["mail.persona"];
         /** @type {import("@mail/attachments/attachment_service").AttachmentService} */
@@ -479,10 +482,22 @@ export class MessageService {
             return msg1.id - msg2.id;
         });
     }
+
+    scheduledDateSimple(message) {
+        return message.scheduledDate.toLocaleString(DateTime.TIME_SIMPLE, {
+            locale: this.userService.lang.replace("_", "-"),
+        });
+    }
+
+    dateSimple(message) {
+        return message.datetime.toLocaleString(DateTime.TIME_SIMPLE, {
+            locale: this.userService.lang.replace("_", "-"),
+        });
+    }
 }
 
 export const messageService = {
-    dependencies: ["mail.store", "rpc", "orm", "mail.persona", "mail.attachment"],
+    dependencies: ["mail.store", "rpc", "orm", "user", "mail.persona", "mail.attachment"],
     start(env, services) {
         return new MessageService(env, services);
     },
diff --git a/addons/mail/static/src/core_ui/message.xml b/addons/mail/static/src/core_ui/message.xml
index 847c50a015d..9542d0e897e 100644
--- a/addons/mail/static/src/core_ui/message.xml
+++ b/addons/mail/static/src/core_ui/message.xml
@@ -24,7 +24,7 @@
             >
                 <MessageInReply t-if="message.parentMessage" alignedRight="isAlignedRight" message="message" onClick="props.onParentMessageClick"/>
                 <div class="o-mail-Message-core position-relative d-flex flex-shrink-0">
-                    <div class="o-mail-Message-sidebar d-flex flex-shrink-0" t-att-class="{ 'justify-content-end': isAlignedRight }">
+                    <div class="o-mail-Message-sidebar d-flex flex-shrink-0" t-att-class="{ 'justify-content-end': isAlignedRight, 'align-items-center': props.squashed }">
                         <div t-if="!props.squashed" class="o-mail-Message-avatarContainer position-relative bg-view" t-on-click="ev => this.onClickAuthor(ev)">
                             <img class="o-mail-Message-avatar w-100 h-100 rounded-circle o_object_fit_cover"
                                 t-att-title="authorText"
@@ -33,8 +33,8 @@
                             <ImStatus t-if="message.author" persona="message.author" className="imStatusClassName"/>
                         </div>
                         <t t-elif="!message.isTransient">
-                            <small t-if="isActive" class="o-mail-Message-date text-muted opacity-50 ms-2" t-att-title="message.datetimeStr">
-                                <t t-esc="message.datetimeSimpleStr"/>
+                            <small t-if="isActive" class="o-mail-Message-date text-muted opacity-50 ms-2">
+                                <t t-esc="messageService.dateSimple(message)"/>
                             </small>
                             <div t-att-class="{ 'position-absolute bottom-0 mb-1': !env.inChatter }">
                                 <MessageSeenIndicator
@@ -66,7 +66,7 @@
                                     (from <a t-att-href="message.url">#<t t-esc="message.originThread?.displayName"/></a>)
                                 </t>
                             </small>
-                            <div t-if="props.message.scheduledDate" t-att-class="{ 'ms-2': props.isInChatWindow and isAlignedRight }" t-att-title="props.message.scheduledDateShort">
+                            <div t-if="props.message.scheduledDate" t-att-class="{ 'ms-2': props.isInChatWindow and isAlignedRight }" t-att-title="messageService.scheduledDateSimple(props.message)">
                                 <span class="text-600 cursor-pointer">
                                     <i class="fa fa-calendar-o"/>
                                 </span>