From 3daec8b5fb5738dc07b0ca3a53aa1c3de7833733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Lef=C3=A8vre?= <lul@odoo.com>
Date: Thu, 10 Oct 2019 13:12:03 +0000
Subject: [PATCH] [FIX] calendar_sms: Timezone event date in sms reminder

SMS reminders are not timezoned

closes #38243

closes odoo/odoo#38893

X-original-commit: 93d17be423d27c2e5eddf313327133082995f003
Signed-off-by: lul-odoo <LucasLefevre@users.noreply.github.com>
---
 addons/calendar_sms/data/sms_data.xml     |  2 +-
 addons/calendar_sms/i18n/calendar_sms.pot | 12 +++++-------
 addons/calendar_sms/models/calendar.py    |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/calendar_sms/data/sms_data.xml b/addons/calendar_sms/data/sms_data.xml
index 8016fd429fe..890004753a9 100644
--- a/addons/calendar_sms/data/sms_data.xml
+++ b/addons/calendar_sms/data/sms_data.xml
@@ -4,7 +4,7 @@
         <record id="sms_template_data_calendar_reminder" model="sms.template">
             <field name="name">Calendar Event: Reminder</field>
             <field name="model_id" ref="calendar.model_calendar_event"/>
-            <field name="body">Event reminder: ${object.name} on ${object.start_datetime or object.start_date}</field>
+            <field name="body">Event reminder: ${object.name}, ${object.display_time}</field>
         </record>
     </data>
 </odoo>
diff --git a/addons/calendar_sms/i18n/calendar_sms.pot b/addons/calendar_sms/i18n/calendar_sms.pot
index 1d6e45af707..d7eea88f46d 100644
--- a/addons/calendar_sms/i18n/calendar_sms.pot
+++ b/addons/calendar_sms/i18n/calendar_sms.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~12.5\n"
+"Project-Id-Version: Odoo Server 13.0+e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-26 08:16+0000\n"
-"PO-Revision-Date: 2019-08-26 08:16+0000\n"
+"POT-Creation-Date: 2019-10-10 13:47+0000\n"
+"PO-Revision-Date: 2019-10-10 13:47+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -37,15 +37,13 @@ msgstr ""
 
 #. module: calendar_sms
 #: model:sms.template,body:calendar_sms.sms_template_data_calendar_reminder
-msgid ""
-"Event reminder: ${object.name} on ${object.start_datetime or "
-"object.start_date}"
+msgid "Event reminder: ${object.name}, ${object.display_time}"
 msgstr ""
 
 #. module: calendar_sms
 #: code:addons/calendar_sms/models/calendar.py:0
 #, python-format
-msgid "Event reminder: %s on %s."
+msgid "Event reminder: %s, %s."
 msgstr ""
 
 #. module: calendar_sms
diff --git a/addons/calendar_sms/models/calendar.py b/addons/calendar_sms/models/calendar.py
index 9b7e8da6153..1bfccfe7521 100644
--- a/addons/calendar_sms/models/calendar.py
+++ b/addons/calendar_sms/models/calendar.py
@@ -22,7 +22,7 @@ class CalendarEvent(models.Model):
         for event in self:
             event._message_sms_with_template(
                 template_xmlid='calendar_sms.sms_template_data_calendar_reminder',
-                template_fallback=_("Event reminder: %s on %s.") % (event.name, event.start_datetime or event.start_date),
+                template_fallback=_("Event reminder: %s, %s.") % (event.name, event.display_time),
                 partner_ids=self._sms_get_default_partners().ids,
                 put_in_queue=False
             )