timezone selector in workout edit form

rowers/views.py

@@ -6,6 +6,7 @@ import zipfile
 import bleach
 import arrow
 import pytz
+from pytz import UnknownTimeZoneError
 import operator
 import warnings
 import urllib
@@ -9333,17 +9334,23 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
                 date,starttime
                 )
 
-            startdatetime = pytz.timezone(thetimezone).localize(
-                startdatetime
+            try:
+                startdatetime = pytz.timezone(thetimezone).localize(
+                    startdatetime
                 )
+            except UnknownTimeZoneError:
+                pass
 
             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))
+
+            try:
+                startdatetime = startdatetime.astimezone(pytz.timezone(thetimezone))
+            except UnknownTimeZoneError:
+                thetimezone = 'UTC'
 
 
             # check if user is owner of this workout