From 3ec29ccd94bf8af3ec4cb72ffcf3958fcfbc2284 Mon Sep 17 00:00:00 2001 From: "Nasreddin (bon)" Date: Mon, 2 Nov 2020 12:14:49 +0000 Subject: [PATCH] [FIX] event: Google & Yahoo calendar link broken Issue - Install 'Event' module - Go to 'Event' and select any event - Click on "Attendees" stat button - Click on any attendee ( or create one if not any) - Confirm ( if not already confirm) registration - Click on "Send by email" - Change template to 'Event: Registration' then send - In the chatter, check Google or Yahoo calendar link Bad link. Cause Wrong 'dt_format' pattern generate a broken datetime value; current format work with time.strftime() but not 'babel' library. Solution Update 'dt_format' pattern to match with babel library since it's the one used in 'format_datetime' func. > Note that Babel uses different patterns for specifying number and date formats compared to the Python equivalents (such as time.strftime()), which have mostly been inherited from C and POSIX ref : http://babel.pocoo.org/en/latest/dates.html#pattern-syntax opw-2370895 closes odoo/odoo#61394 X-original-commit: ab03fa39c716f717ee78c30e41727a85234b5c9d Signed-off-by: bon-odoo --- addons/event/data/email_template_data.xml | 12 ++++++------ addons/event/i18n/event.pot | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/addons/event/data/email_template_data.xml b/addons/event/data/email_template_data.xml index b41bd61c623..8bf5414e11a 100644 --- a/addons/event/data/email_template_data.xml +++ b/addons/event/data/email_template_data.xml @@ -35,8 +35,8 @@ ${(object.email and '"%s" <%s>' % (object.name, object.email) or object.partner_id.email_formatted or '') | safe}
-% set date_begin = format_datetime(object.event_id.date_begin, tz='UTC', dt_format='%Y%m%dT%H%M%SZ') -% set date_end = format_datetime(object.event_id.date_end, tz='UTC', dt_format='%Y%m%dT%H%M%SZ') +% set date_begin = format_datetime(object.event_id.date_begin, tz='UTC', dt_format='yyyyMMdd\'T\'HHmmssZ') +% set date_end = format_datetime(object.event_id.date_end, tz='UTC', dt_format='yyyyMMdd\'T\'HHmmssZ') % set is_online = 'is_published' in object.event_id and object.event_id.is_published % set event_organizer = object.event_id.organizer_id % set event_address = object.event_id.address_id @@ -87,7 +87,7 @@ Add this event to your calendar Google iCal/Outlook - + Yahoo

@@ -259,8 +259,8 @@ ${(object.email and '"%s" <%s>' % (object.name, object.email) or object.partner_id.email_formatted or '') | safe}
-% set date_begin = format_datetime(object.event_id.date_begin, tz='UTC', dt_format='%Y%m%dT%H%M%SZ') -% set date_end = format_datetime(object.event_id.date_end, tz='UTC', dt_format='%Y%m%dT%H%M%SZ') +% set date_begin = format_datetime(object.event_id.date_begin, tz='UTC', dt_format='yyyyMMdd\'T\'HHmmssZ') +% set date_end = format_datetime(object.event_id.date_end, tz='UTC', dt_format='yyyyMMdd\'T\'HHmmssZ') % set is_online = 'is_published' in object.event_id and object.event_id.is_published % set event_organizer = object.event_id.organizer_id % set event_address = object.event_id.address_id @@ -311,7 +311,7 @@ Add this event to your calendar Google iCal/Outlook - + Yahoo

diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot index 0829f442ad9..4305dddc10e 100644 --- a/addons/event/i18n/event.pot +++ b/addons/event/i18n/event.pot @@ -237,8 +237,8 @@ msgstr "" #: model:mail.template,body_html:event.event_subscription msgid "" "
\n" -"% set date_begin = format_datetime(object.event_id.date_begin, tz='UTC', dt_format='%Y%m%dT%H%M%SZ')\n" -"% set date_end = format_datetime(object.event_id.date_end, tz='UTC', dt_format='%Y%m%dT%H%M%SZ')\n" +"% set date_begin = format_datetime(object.event_id.date_begin, tz='UTC', dt_format='yyyyMMdd\\'T\\'HHmmssZ')\n" +"% set date_end = format_datetime(object.event_id.date_end, tz='UTC', dt_format='yyyyMMdd\\'T\\'HHmmssZ')\n" "% set is_online = 'is_published' in object.event_id and object.event_id.is_published\n" "% set event_organizer = object.event_id.organizer_id\n" "% set event_address = object.event_id.address_id\n" @@ -288,7 +288,7 @@ msgid "" " Add this event to your calendar\n" " \"\"/ Google\n" " \"\"/ iCal/Outlook\n" -" \n" +" \n" " \"\"/ Yahoo\n" " \n" "

\n" @@ -455,8 +455,8 @@ msgstr "" #: model:mail.template,body_html:event.event_reminder msgid "" "
\n" -"% set date_begin = format_datetime(object.event_id.date_begin, tz='UTC', dt_format='%Y%m%dT%H%M%SZ')\n" -"% set date_end = format_datetime(object.event_id.date_end, tz='UTC', dt_format='%Y%m%dT%H%M%SZ')\n" +"% set date_begin = format_datetime(object.event_id.date_begin, tz='UTC', dt_format='yyyyMMdd\\'T\\'HHmmssZ')\n" +"% set date_end = format_datetime(object.event_id.date_end, tz='UTC', dt_format='yyyyMMdd\\'T\\'HHmmssZ')\n" "% set is_online = 'is_published' in object.event_id and object.event_id.is_published\n" "% set event_organizer = object.event_id.organizer_id\n" "% set event_address = object.event_id.address_id\n" @@ -506,7 +506,7 @@ msgid "" " Add this event to your calendar\n" " \"\"/ Google\n" " \"\"/ iCal/Outlook\n" -" \n" +" \n" " \"\"/ Yahoo\n" " \n" "

\n"