Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed USA holidays problem. There was no holidays being listed.

Browse Source 
svn: r12040
This commit is contained in:
Rob G. Healey 2009-02-19 17:43:53 +00:00
parent 83e0d61ca4
commit 0e26998664
2 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/lib/holidays.xml
View File

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<calendar> <calendar>
<country name="">
</country>
<country name="United States"> <country name="United States">
<date name="New Year's Eve" value="*/12/31" type="national" /> <date name="New Year's Eve" value="*/12/31" type="national" />
<date name="New Year's Day" value="*/1/1" type="national" /> <date name="New Year's Day" value="*/1/1" type="national" />

65
src/plugins/webreport/WebCal.py
View File

@ -426,8 +426,7 @@ class WebCalReport(Report):
num_years = (self.end_year - self.start_year) num_years = (self.end_year - self.start_year)
cal_year = self.start_year cal_year = self.start_year
nrows = (num_years / 16) for rows in range((num_years // 16) + 1):
for rows in range(0, (nrows + 1)):
of.write('<div id="navigation">\n') of.write('<div id="navigation">\n')
of.write('\t<ul>\n') of.write('\t<ul>\n')
cols = 0 cols = 0
@ -1447,49 +1446,47 @@ def get_day_list(event_date, holiday_list, bday_anniv_list):
# birthday/ anniversary on this day # birthday/ anniversary on this day
if bday_anniv_list > []: 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 txt_str = None
if date != '...':
# number of years married, ex: 10 # number of years married, ex: 10
nyears = event_date.get_year() - date.get_year() nyears = event_date.get_year() - date.get_year()
# no negative years # no negative years; have to be at least zero
# years have to be at least zero if nyears > -1:
if nyears > -1:
# number of years for birthday, ex: 10 years # number of years for birthday, ex: 10 years
age_str = event_date - date age_str = event_date - date
age_str.format(precision=1) age_str.format(precision=1)
# a birthday # a birthday
if event == 'Birthday': if event == 'Birthday':
if nyears == 0: if nyears == 0:
txt_str = _('%(person)s, <em>birth</em>') % { txt_str = _('%(person)s, <em>birth</em>') % {
'person' : text} 'person' : text}
else: else:
txt_str = _('%(person)s, <em>%(age)s</em> old') % { txt_str = _('%(person)s, <em>%(age)s</em> old') % {
'person' : text, 'age' : age_str} 'person' : text, 'age' : age_str}
# an anniversary # an anniversary
elif event == 'Anniversary': elif event == 'Anniversary':
if nyears == 0: if nyears == 0:
txt_str = _('%(couple)s, <em>wedding</em>') % { txt_str = _('%(couple)s, <em>wedding</em>') % {
'couple' : text} 'couple' : text}
else: else:
txt_str = (ngettext('%(couple)s, <em>%(years)d' txt_str = (ngettext('%(couple)s, <em>%(years)d'
'</em> year anniversary', '</em> year anniversary',
'%(couple)s, <em>%(years)d' '%(couple)s, <em>%(years)d'
'</em> year anniversary', nyears) '</em> year anniversary', nyears)
% {'couple' : text, 'years' : nyears}) % {'couple' : text, 'years' : nyears})
txt_str = '<span class="yearsmarried">%s</span>' % txt_str txt_str = '<span class="yearsmarried">%s</span>' % txt_str
if txt_str is not None: if txt_str is not None:
day_list.append((nyears, date, txt_str, event)) day_list.append((nyears, date, txt_str, event))
# sort them based on number of years # sort them based on number of years
# holidays will always be on top of day # holidays will always be on top of day