Fixed USA Holidays error. Upon moving United States to the top of the holidays.xml file as asked, it no longer was giving holidays for USA.
svn: r12039
This commit is contained in:
parent
5ae168c618
commit
3b2deb1021
@ -1,5 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<calendar>
|
||||
<country name="">
|
||||
</country>
|
||||
<country name="United States">
|
||||
<date name="New Year's Eve" value="*/12/31" type="national" />
|
||||
<date name="New Year's Day" value="*/1/1" type="national" />
|
||||
|
@ -908,12 +908,12 @@ class WebCalReport(Report):
|
||||
for cal_year in range(self.start_year, (self.end_year + 1)):
|
||||
|
||||
# generate progress pass for year ????
|
||||
self.progress.set_pass(_('Creating year %d calendars') % cal_year, 1)
|
||||
self.progress.set_pass(_('Creating year %d calendars') % cal_year, '')
|
||||
|
||||
# initialize the holidays dict to fill:
|
||||
self.holidays = {}
|
||||
|
||||
# get the information, first from holidays:
|
||||
# get the information, USA is equal to zero now
|
||||
if self.country != 0:
|
||||
self.__get_holidays(cal_year)
|
||||
|
||||
@ -1447,11 +1447,10 @@ def get_day_list(event_date, holiday_list, bday_anniv_list):
|
||||
|
||||
# birthday/ anniversary on this day
|
||||
if bday_anniv_list > []:
|
||||
for text, event, date in bday_anniv_list:
|
||||
birth_anniversary = [(t, e, d) for t, e, d in bday_anniv_list if d.is_valid()]
|
||||
for text, event, date in birth_anniversary:
|
||||
|
||||
# '...' signifies an incomplete date for an event. See add_day_item()
|
||||
txt_str = None
|
||||
if date != '...':
|
||||
|
||||
# number of years married, ex: 10
|
||||
nyears = event_date.get_year() - date.get_year()
|
||||
|
Loading…
x
Reference in New Issue
Block a user