altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

fix: deal with "GMT" time zone in iCalendar files (#8506)

Browse source 
* fix: omit vtimezone when None

* fix: fix ics time format for tz=GMT
This commit is contained in:
Jennifer Richards 2025-02-06 14:35:07 -04:00 committed by GitHub
parent af49f09c4d
commit ed19b54d8a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ietf/doc/templatetags/ietf_filters.py
View file

@ -533,11 +533,14 @@ def ics_date_time(dt, tzname):
>>> ics_date_time(datetime.datetime(2022,1,2,3,4,5), 'UTC') >>> ics_date_time(datetime.datetime(2022,1,2,3,4,5), 'UTC')
':20220102T030405Z' ':20220102T030405Z'
>>> ics_date_time(datetime.datetime(2022,1,2,3,4,5), 'GmT')
':20220102T030405Z'
>>> ics_date_time(datetime.datetime(2022,1,2,3,4,5), 'America/Los_Angeles') >>> ics_date_time(datetime.datetime(2022,1,2,3,4,5), 'America/Los_Angeles')
';TZID=America/Los_Angeles:20220102T030405' ';TZID=America/Los_Angeles:20220102T030405'
""" """
timestamp = dt.strftime('%Y%m%dT%H%M%S') timestamp = dt.strftime('%Y%m%dT%H%M%S')
if tzname.lower() == 'utc': if tzname.lower() in ('gmt', 'utc'):
return f':{timestamp}Z' return f':{timestamp}Z'
else: else:
return f';TZID={ics_esc(tzname)}:{timestamp}' return f';TZID={ics_esc(tzname)}:{timestamp}'

10
ietf/templates/meeting/agenda.ics
View file

@ -1,15 +1,15 @@
{% load humanize tz %}{% autoescape off %}{% timezone schedule.meeting.tz %}{% load ietf_filters textfilters %}{% load cache %}{% cache 1800 ietf_meeting_agenda_ics schedule.meeting.number request.path request.GET %}BEGIN:VCALENDAR {% load humanize tz %}{% autoescape off %}{% timezone schedule.meeting.tz %}{% with tzname=schedule.meeting.time_zone|lower %}{% load ietf_filters textfilters %}{% load cache %}{% cache 1800 ietf_meeting_agenda_ics schedule.meeting.number request.path request.GET %}BEGIN:VCALENDAR
VERSION:2.0 VERSION:2.0
METHOD:PUBLISH METHOD:PUBLISH
PRODID:-//IETF//datatracker.ietf.org ical agenda//EN PRODID:-//IETF//datatracker.ietf.org ical agenda//EN
{{schedule.meeting.vtimezone}}{% for item in assignments %}BEGIN:VEVENT {% if tzname != "utc" and tzname != "gmt" %}{% firstof schedule.meeting.vtimezone "" %}{% endif %}{% for item in assignments %}BEGIN:VEVENT
UID:ietf-{{schedule.meeting.number}}-{{item.timeslot.pk}}-{{item.session.group.acronym}} UID:ietf-{{schedule.meeting.number}}-{{item.timeslot.pk}}-{{item.session.group.acronym}}
SUMMARY:{% if item.session.name %}{{item.session.name|ics_esc}}{% else %}{{item.session.group_at_the_time.acronym|lower}} - {{item.session.group_at_the_time.name}}{%endif%}{% if item.session.agenda_note %} ({{item.session.agenda_note}}){% endif %} SUMMARY:{% if item.session.name %}{{item.session.name|ics_esc}}{% else %}{{item.session.group_at_the_time.acronym|lower}} - {{item.session.group_at_the_time.name}}{%endif%}{% if item.session.agenda_note %} ({{item.session.agenda_note}}){% endif %}
{% if item.timeslot.show_location %}LOCATION:{{item.timeslot.get_location}} {% if item.timeslot.show_location %}LOCATION:{{item.timeslot.get_location}}
{% endif %}STATUS:{{item.session.ical_status}} {% endif %}STATUS:{{item.session.ical_status}}
CLASS:PUBLIC CLASS:PUBLIC
DTSTART{% ics_date_time item.timeslot.local_start_time schedule.meeting.time_zone %} DTSTART{% ics_date_time item.timeslot.local_start_time tzname %}
DTEND{% ics_date_time item.timeslot.local_end_time schedule.meeting.time_zone %} DTEND{% ics_date_time item.timeslot.local_end_time tzname %}
DTSTAMP{% ics_date_time item.timeslot.modified|utc 'utc' %}{% if item.session.agenda %} DTSTAMP{% ics_date_time item.timeslot.modified|utc 'utc' %}{% if item.session.agenda %}
URL:{{item.session.agenda.get_versionless_href}}{% endif %} URL:{{item.session.agenda.get_versionless_href}}{% endif %}
DESCRIPTION:{{item.timeslot.name|ics_esc}}\n{% if item.session.agenda_note %} DESCRIPTION:{{item.timeslot.name|ics_esc}}\n{% if item.session.agenda_note %}
@ -29,4 +29,4 @@ DESCRIPTION:{{item.timeslot.name|ics_esc}}\n{% if item.session.agenda_note %}
\n{# link agenda for ietf meetings #} \n{# link agenda for ietf meetings #}
See in schedule: {% absurl 'agenda' num=schedule.meeting.number %}#row-{{ item.slug }}\n{% endif %} See in schedule: {% absurl 'agenda' num=schedule.meeting.number %}#row-{{ item.slug }}\n{% endif %}
END:VEVENT END:VEVENT
{% endfor %}END:VCALENDAR{% endcache %}{% endtimezone %}{% endautoescape %} {% endfor %}END:VCALENDAR{% endcache %}{% endwith %}{% endtimezone %}{% endautoescape %}