user move timezone choices from model to form

nitely · Jun 6, 2016 · 2811791 · 2811791
1 parent 4d6fa35
commit 2811791
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 26 deletions.
diff --git a/spirit/user/forms.py b/spirit/user/forms.py
@@ -9,9 +9,11 @@
 from django.template import defaultfilters
 from django.conf import settings
 
+from ..core.utils.timezone import timezones
 from .models import UserProfile
 
 User = get_user_model()
+TIMEZONE_CHOICES = timezones()
 
 
 class CleanEmailMixin(object):
@@ -70,6 +72,8 @@ class Meta:
 
 class UserProfileForm(forms.ModelForm):
 
+    timezone = forms.ChoiceField(label=_("Time zone"), choices=TIMEZONE_CHOICES)
+
     class Meta:
         model = UserProfile
         fields = ("location", "timezone")
@@ -79,5 +83,4 @@ def __init__(self, *args, **kwargs):
         now = timezone.localtime(timezone.now())
         self.fields['timezone'].help_text = _('Current time is: %(date)s %(time)s') % {
             'date': defaultfilters.date(now),
-            'time': defaultfilters.time(now)
-        }
+            'time': defaultfilters.time(now)}