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

Merge branch 'fresh-start' into sponsorship

Browse source
This commit is contained in:
James Tauber 2012-02-22 17:37:16 -05:00
commit e614c907da
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
symposion_project/apps/conference/models.py
View file

@ -12,14 +12,14 @@ class Conference(models.Model):
the full conference for a specific year, e.g. US PyCon 2012. the full conference for a specific year, e.g. US PyCon 2012.
""" """
title = models.CharField(_('title'), max_length=100) title = models.CharField(_("title"), max_length=100)
# when the conference runs # when the conference runs
start_date = models.DateField(_('start date'), null=True, blank=True) start_date = models.DateField(_("start date"), null=True, blank=True)
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(_("timezone"), blank=True)
def __unicode__(self): def __unicode__(self):
return self.title return self.title
@ -36,10 +36,10 @@ class Conference(models.Model):
del CONFERENCE_CACHE[pk] del CONFERENCE_CACHE[pk]
except KeyError: except KeyError:
pass pass
class Meta(object): class Meta(object):
verbose_name = _('conference') verbose_name = _("conference")
verbose_name_plural = _('conferences') verbose_name_plural = _("conferences")
class Section(models.Model): class Section(models.Model):
@ -49,20 +49,20 @@ class Section(models.Model):
scheduling process. scheduling process.
""" """
conference = models.ForeignKey(Conference, verbose_name=_('conference')) conference = models.ForeignKey(Conference, verbose_name=_("conference"))
name = models.CharField(_('name'), max_length=100) name = models.CharField(_("name"), max_length=100)
# when the section runs # when the section runs
start_date = models.DateField(_('start date'), null=True, blank=True) start_date = models.DateField(_("start date"), null=True, blank=True)
end_date = models.DateField(_('end date'), null=True, blank=True) end_date = models.DateField(_("end date"), null=True, blank=True)
def __unicode__(self): def __unicode__(self):
return self.name return self.name
class Meta(object): class Meta(object):
verbose_name = _('section') verbose_name = _("section")
verbose_name_plural = _('sections') verbose_name_plural = _("sections")
def current_conference(): def current_conference():