summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErnesto Rico-Schmidt <e.rico.schmidt@gmail.com>2011-03-25 21:07:29 (GMT)
committerErnesto Rico-Schmidt <e.rico.schmidt@gmail.com>2011-03-25 21:07:29 (GMT)
commita5ccb836a3a281c6526a497a4426335eedbcad93 (patch)
treea5556e688356fbffc50facd01f27c4a9bd726935
parentd9719a5b23879fae94b439ca361bd695254f8b93 (diff)
simplified unicode representation of a program slot.
-rw-r--r--program/models.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/program/models.py b/program/models.py
index b73e7ac..f6839e2 100644
--- a/program/models.py
+++ b/program/models.py
@@ -171,14 +171,13 @@ class ProgramSlot(models.Model):
tend = self.tend.strftime('%H:%M')
dstart = self.dstart.strftime('%d. %b %Y')
tstart = self.tstart.strftime('%H:%M')
- until = self.until.strftime('%d. %b %Y')
if self.rrule.freq == 0:
- return u'%s - %s, %s - %s' % (tstart, tend, dstart, until)
+ return u'%s, %s - %s' % (dstart, tstart, tend)
if self.rrule.freq == 3:
- return u'%s, %s - %s, %s - %s' % (self.rrule, tstart, tend, dstart, until)
+ return u'%s, %s - %s' % (self.rrule, tstart, tend)
else:
- return u'%s, %s, %s - %s, %s - %s' % (self.rrule, weekday, tstart, tend, dstart, until)
+ return u'%s, %s, %s - %s' % (weekday, self.rrule, tstart, tend)
def save(self, *args, **kwargs):
if not self.pk: