Merge pull request #114 from uranusjr/timezone-field

Replace django-timezones w/ django-timezone-field

requirements/base.txt

@@ -5,7 +5,7 @@ django-model-utils==2.2
 django-reversion==1.8.5
 django-sitetree==1.2.1
 django-taggit==0.12.2
-django-timezones==0.2
+django-timezone-field==1.2
 django-user-accounts==1.0
 easy-thumbnails==2.2
 html5lib==0.999

symposion/conference/models.py

@@ -3,7 +3,7 @@ from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import python_2_unicode_compatible
 
-from timezones.fields import TimeZoneField
+from timezone_field import TimeZoneField
 
 
 CONFERENCE_CACHE = {}
@@ -22,7 +22,7 @@ class Conference(models.Model):
     end_date = models.DateField(_("end date"), null=True, blank=True)
 
     # timezone the conference is in
-    timezone = TimeZoneField(_("timezone"), blank=True)
+    timezone = TimeZoneField(blank=True, verbose_name=_("timezone"))
 
     def __str__(self):
         return self.title