diff --git a/requirements/base.txt b/requirements/base.txt index 8cd92478fa19c8992e15f229abcd7f9c2d8b8362..b60e073dd01a2bae0d11e9fd821d97b02010c77f 100644 --- a/requirements/base.txt +++ b/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 diff --git a/symposion/conference/models.py b/symposion/conference/models.py index 01b595036634d554268791a1d06b9808580a35c7..d5876ffdd0ae3d89b3e62e403b35e2e21351d7d8 100644 --- a/symposion/conference/models.py +++ b/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