improved timezone handling of workout edit save form
This commit is contained in:
+8
-1
@@ -8722,7 +8722,14 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
|
|||||||
startdatetime = (str(date) + ' ' + str(starttime))
|
startdatetime = (str(date) + ' ' + str(starttime))
|
||||||
startdatetime = datetime.datetime.strptime(startdatetime,
|
startdatetime = datetime.datetime.strptime(startdatetime,
|
||||||
"%Y-%m-%d %H:%M:%S")
|
"%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))
|
startdatetime = startdatetime.astimezone(pytz.timezone(thetimezone))
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user