1
0
Fork 0
mirror of https://github.com/Kunsi/pretalx-plugin-broadcast-tools synced 2024-11-22 01:51:05 +00:00

Merge pull request #13 from rixx/timezone

Safe timezone handling
This commit is contained in:
fkusei 2023-06-19 10:35:01 +02:00 committed by GitHub
commit c6ceedf041
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,7 +1,6 @@
import datetime as dt import datetime as dt
from xml.etree import ElementTree as ET from xml.etree import ElementTree as ET
import pytz
import qrcode import qrcode
import qrcode.image.svg import qrcode.image.svg
from django.conf import settings from django.conf import settings
@ -112,7 +111,6 @@ class BroadcastToolsScheduleView(EventPermissionRequired, ScheduleMixin, View):
event=self.request.event, event=self.request.event,
schedule=self.schedule, schedule=self.schedule,
) )
tz = pytz.timezone(schedule.event.timezone)
infoline = str( infoline = str(
schedule.event.settings.broadcast_tools_lower_thirds_info_string or "" schedule.event.settings.broadcast_tools_lower_thirds_info_string or ""
) )
@ -129,9 +127,9 @@ class BroadcastToolsScheduleView(EventPermissionRequired, ScheduleMixin, View):
"talks": [ "talks": [
{ {
"id": talk.submission.id, "id": talk.submission.id,
"start": talk.start.astimezone(tz).isoformat(), "start": talk.start.astimezone(schedule.event.tz).isoformat(),
"end": (talk.start + dt.timedelta(minutes=talk.duration)) "end": (talk.start + dt.timedelta(minutes=talk.duration))
.astimezone(tz) .astimezone(schedule.event.tz)
.isoformat(), .isoformat(),
"slug": talk.frab_slug, "slug": talk.frab_slug,
"title": talk.submission.title, "title": talk.submission.title,