# HG changeset patch # User Paul Boddie # Date 1298245598 -3600 # Node ID f2b8b86168a387eb9c4e7a4a96c37fa6e8313223 # Parent a2f1f25d42711014464bc1fd34e353ab2111a085 Fixed the link pop-up labels where no period has been specified for a calendar or view. (Imported from revision 161.) diff -r a2f1f25d4271 -r f2b8b86168a3 macros/EventAggregator.py --- a/macros/EventAggregator.py Sun Feb 20 22:05:23 2011 +0100 +++ b/macros/EventAggregator.py Mon Feb 21 00:46:38 2011 +0100 @@ -191,15 +191,20 @@ # Pop-up descriptions of the downloadable calendars. - calendar_period = "%s - %s" % ( - self.getFullMonthLabel(self.calendar_start), - self.getFullMonthLabel(self.calendar_end) - ) - original_calendar_period = "%s - %s" % ( - self.getFullMonthLabel(self.original_calendar_start), - self.getFullMonthLabel(self.original_calendar_end) - ) - raw_calendar_period = "%s - %s" % (self.raw_calendar_start, self.raw_calendar_end) + calendar_period = (self.calendar_start or self.calendar_end) and \ + "%s - %s" % ( + self.getFullMonthLabel(self.calendar_start), + self.getFullMonthLabel(self.calendar_end) + ) or _("All events") + + original_calendar_period = (self.original_calendar_start or self.original_calendar_end) and \ + "%s - %s" % ( + self.getFullMonthLabel(self.original_calendar_start), + self.getFullMonthLabel(self.original_calendar_end) + ) or _("All events") + + raw_calendar_period = (self.raw_calendar_start or self.raw_calendar_end) and \ + "%s - %s" % (self.raw_calendar_start, self.raw_calendar_end) or _("No period specified") # Write the controls.