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

* src/plugins/Calendar.py: fixed MenuOption's EnumeratedList to match

Browse Source 
Brian's changes on 2007-12-15.

2007-12-16  Douglas S. Blank  <dblank@cs.brynmawr.edu>


svn: r9522
This commit is contained in:
Doug Blank 2007-12-16 18:27:43 +00:00
parent 671726bf60
commit 4ba6f344a7
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2007-12-16 Douglas S. Blank <dblank@cs.brynmawr.edu>
* src/plugins/Calendar.py: fixed MenuOption's EnumeratedList to match
Brian's changes on 2007-12-15.
2007-12-16 Douglas S. Blank <dblank@cs.brynmawr.edu> 2007-12-16 Douglas S. Blank <dblank@cs.brynmawr.edu>
* src/DbManager.py: typo %{}s -> %()s; fixed rcs -q issue * src/DbManager.py: typo %{}s -> %()s; fixed rcs -q issue
* src/Utils.py: typo %{}s -> %()s * src/Utils.py: typo %{}s -> %()s

16
src/plugins/Calendar.py
View File

@ -132,11 +132,11 @@ class Calendar(Report):
else: else:
self.relationships = False self.relationships = False
self.year = options_class.handler.options_dict['year'] self.year = options_class.handler.options_dict['year']
self.name_format = options_class.handler.options_dict['name_format'][0] self.name_format = options_class.handler.options_dict['name_format']
self.country = options_class.handler.options_dict['country'] self.country = options_class.handler.options_dict['country']
self.anniversaries = options_class.handler.options_dict['anniversaries'] self.anniversaries = options_class.handler.options_dict['anniversaries']
self.start_dow = options_class.handler.options_dict['start_dow'][0] self.start_dow = options_class.handler.options_dict['start_dow']
self.maiden_name = options_class.handler.options_dict['maiden_name'][0] self.maiden_name = options_class.handler.options_dict['maiden_name']
self.alive = options_class.handler.options_dict['alive'] self.alive = options_class.handler.options_dict['alive']
self.birthdays = options_class.handler.options_dict['birthdays'] self.birthdays = options_class.handler.options_dict['birthdays']
self.text1 = options_class.handler.options_dict['text1'] self.text1 = options_class.handler.options_dict['text1']
@ -212,9 +212,8 @@ class Calendar(Report):
self.progress = ProgressMeter(_('Calendar')) self.progress = ProgressMeter(_('Calendar'))
self.calendar = {} self.calendar = {}
# get the information, first from holidays: # get the information, first from holidays:
country, country_name = self.country if self.country != 0: # Don't include holidays
if country != 0: # Don't include holidays self.get_holidays(self.year, _countries[self.country]) # _countries is currently global
self.get_holidays(self.year, _countries[country]) # _country is currently global
# get data from database: # get data from database:
self.collect_data() self.collect_data()
# generate the report: # generate the report:
@ -412,9 +411,8 @@ class CalendarReport(Calendar):
self.progress = ProgressMeter(_('Birthday and Anniversary Report')) self.progress = ProgressMeter(_('Birthday and Anniversary Report'))
self.calendar = {} self.calendar = {}
# get the information, first from holidays: # get the information, first from holidays:
country, country_name = self.country if self.country != 0:
if country != 0: self.get_holidays(self.year, _countries[self.country]) # _countries currently global
self.get_holidays(self.year, _countries[country]) # currently global
# get data from database: # get data from database:
self.collect_data() self.collect_data()
# generate the report: # generate the report: