Fixed USA holidays problem. There was no holidays being listed.
svn: r12040
This commit is contained in:
parent
83e0d61ca4
commit
0e26998664
@ -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" />
|
||||
|
@ -426,8 +426,7 @@ class WebCalReport(Report):
|
||||
num_years = (self.end_year - self.start_year)
|
||||
cal_year = self.start_year
|
||||
|
||||
nrows = (num_years / 16)
|
||||
for rows in range(0, (nrows + 1)):
|
||||
for rows in range((num_years // 16) + 1):
|
||||
of.write('<div id="navigation">\n')
|
||||
of.write('\t<ul>\n')
|
||||
cols = 0
|
||||
@ -1447,17 +1446,15 @@ 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()
|
||||
|
||||
# no negative years
|
||||
# years have to be at least zero
|
||||
# no negative years; have to be at least zero
|
||||
if nyears > -1:
|
||||
|
||||
# number of years for birthday, ex: 10 years
|
||||
|
Loading…
Reference in New Issue
Block a user