Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dst change better #5206

Merged
merged 1 commit into from
Aug 18, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions bluebottle/time_based/utils.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from datetime import timedelta
from django.utils.timezone import get_current_timezone


def nth_weekday(date):
Expand All @@ -10,10 +11,10 @@ def nth_weekday(date):


def duplicate_slot(slot, interval, end):

dates = []
tz = get_current_timezone()

start = slot.start
start = slot.start.astimezone(tz)
for n in range(int((end - start.date()).days)):
date = start + timedelta(days=n + 1)
if interval == 'day':
Expand All @@ -29,8 +30,8 @@ def duplicate_slot(slot, interval, end):

for date in dates:
slot.id = None
slot.start = slot.start.tzinfo.localize(
slot.start.replace(tzinfo=None, day=date.day, month=date.month, year=date.year)
slot.start = tz.localize(
start.replace(tzinfo=None, day=date.day, month=date.month, year=date.year)
)
slot.status = 'open'
slot.save()