Merge branch 'release/v18.9.18'
This commit is contained in:
@@ -686,7 +686,7 @@ def createc2workoutdata(w):
|
|||||||
wendtime = w.startdatetime.astimezone(pytz.timezone(
|
wendtime = w.startdatetime.astimezone(pytz.timezone(
|
||||||
w.timezone))+datetime.timedelta(seconds=makeseconds(durationstr))
|
w.timezone))+datetime.timedelta(seconds=makeseconds(durationstr))
|
||||||
except UnknownTimeZoneError:
|
except UnknownTimeZoneError:
|
||||||
wendtime = w.startdatetime+datetime.timedelta(seconds=makeseconds(durationstr))
|
wendtime = w.startdatetime.astimezone(pytz.utc)+datetime.timedelta(seconds=makeseconds(durationstr))
|
||||||
|
|
||||||
data = {
|
data = {
|
||||||
"type": mytypes.c2mapping[workouttype],
|
"type": mytypes.c2mapping[workouttype],
|
||||||
|
|||||||
Reference in New Issue
Block a user