Private
Public Access
1
0

improved timezone handling of workout edit save form

This commit is contained in:
Sander Roosendaal
2018-03-16 12:23:41 +01:00
parent 977824d462
commit 4cdb3f4e68

View File

@@ -8722,7 +8722,14 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
startdatetime = (str(date) + ' ' + str(starttime))
startdatetime = datetime.datetime.strptime(startdatetime,
"%Y-%m-%d %H:%M:%S")
startdatetime = timezone.make_aware(startdatetime)
startdatetime = startdatetime.replace(tzinfo=pytz.timezone(thetimezone))
try:
# aware object can be in any timezone
out = startdatetime.astimezone(pytz.utc)
except (ValueError, TypeError):
startdatetime = timezone.make_aware(startdatetime)
startdatetime = startdatetime.astimezone(pytz.timezone(thetimezone))