# HG changeset patch # User Paul Boddie # Date 1298241997 -3600 # Node ID 0b86654d87d9c066b4937c68bb7a521a460527ce # Parent fd9fa883dcc577f6c9a1bd44a5a073099dadc7ca Fixed the link pop-up labels where no period has been specified for a calendar or view. diff -r fd9fa883dcc5 -r 0b86654d87d9 macros/EventAggregator.py --- a/macros/EventAggregator.py Sun Feb 20 23:21:57 2011 +0100 +++ b/macros/EventAggregator.py Sun Feb 20 23:46:37 2011 +0100 @@ -207,15 +207,20 @@ get_label = self.mode == "day" and self.getFullDateLabel or self.getFullMonthLabel - calendar_period = "%s - %s" % ( - get_label(self.calendar_start), - get_label(self.calendar_end) - ) - original_calendar_period = "%s - %s" % ( - get_label(self.original_calendar_start), - get_label(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" % ( + get_label(self.calendar_start), + get_label(self.calendar_end) + ) or _("All events") + + original_calendar_period = (self.original_calendar_start or self.original_calendar_end) and \ + "%s - %s" % ( + get_label(self.original_calendar_start), + get_label(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.