Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #114 from uranusjr/timezone-field

Browse source 
Replace django-timezones w/ django-timezone-field
This commit is contained in:
Patrick Altman 2015-09-08 14:56:38 -05:00
commit ff07405ff0
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
requirements/base.txt
View file

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

4
symposion/conference/models.py
View file

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