1.1 --- a/macros/EventAggregator.py Sun Feb 20 22:05:23 2011 +0100
1.2 +++ b/macros/EventAggregator.py Mon Feb 21 00:46:38 2011 +0100
1.3 @@ -191,15 +191,20 @@
1.4
1.5 # Pop-up descriptions of the downloadable calendars.
1.6
1.7 - calendar_period = "%s - %s" % (
1.8 - self.getFullMonthLabel(self.calendar_start),
1.9 - self.getFullMonthLabel(self.calendar_end)
1.10 - )
1.11 - original_calendar_period = "%s - %s" % (
1.12 - self.getFullMonthLabel(self.original_calendar_start),
1.13 - self.getFullMonthLabel(self.original_calendar_end)
1.14 - )
1.15 - raw_calendar_period = "%s - %s" % (self.raw_calendar_start, self.raw_calendar_end)
1.16 + calendar_period = (self.calendar_start or self.calendar_end) and \
1.17 + "%s - %s" % (
1.18 + self.getFullMonthLabel(self.calendar_start),
1.19 + self.getFullMonthLabel(self.calendar_end)
1.20 + ) or _("All events")
1.21 +
1.22 + original_calendar_period = (self.original_calendar_start or self.original_calendar_end) and \
1.23 + "%s - %s" % (
1.24 + self.getFullMonthLabel(self.original_calendar_start),
1.25 + self.getFullMonthLabel(self.original_calendar_end)
1.26 + ) or _("All events")
1.27 +
1.28 + raw_calendar_period = (self.raw_calendar_start or self.raw_calendar_end) and \
1.29 + "%s - %s" % (self.raw_calendar_start, self.raw_calendar_end) or _("No period specified")
1.30
1.31 # Write the controls.
1.32