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 @@ >
-
+
- - + +
#) -
+