* src/ReportUtils.py: Use new RelLib API

svn: r5645
This commit is contained in:
Martin Hawlisch 2005-12-30 14:04:19 +00:00
parent 85fbf617d1
commit a0c8752fb0
2 changed files with 26 additions and 19 deletions

View File

@ -1,3 +1,6 @@
2005-12-30 Martin Hawlisch <Martin.Hawlisch@gmx.de>
* src/ReportUtils.py: Use new RelLib API
2005-12-29 Don Allingham <don@gramps-project.org> 2005-12-29 Don Allingham <don@gramps-project.org>
* src/GrampsLocale.py: handle platform specific locale issues * src/GrampsLocale.py: handle platform specific locale issues
* src/DateDisplay.py: use GrampsLocale * src/DateDisplay.py: use GrampsLocale

View File

@ -814,7 +814,7 @@ _rtype = {
RelLib.Family.UNMARRIED : _("unmarried"), RelLib.Family.UNMARRIED : _("unmarried"),
RelLib.Family.CIVIL_UNION : _("civil union"), RelLib.Family.CIVIL_UNION : _("civil union"),
RelLib.Family.UNKNOWN : _("Unknown"), RelLib.Family.UNKNOWN : _("Unknown"),
RelLib.Family.OTHER : _("Other"), RelLib.Family.CUSTOM : _("Other"),
} }
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -1305,9 +1305,11 @@ def get_birth_death_strings(database,person,empty_date="",empty_place=""):
bdate_mod = False bdate_mod = False
ddate_mod = False ddate_mod = False
birth_handle = person.get_birth_handle() birth_ref = person.get_birth_ref()
if birth_handle: if birth_ref and birth_ref.ref:
birth_handle = birth_ref.ref
birth = database.get_event_from_handle(birth_handle) birth = database.get_event_from_handle(birth_handle)
if birth:
bdate = DateHandler.get_date(birth) bdate = DateHandler.get_date(birth)
bplace_handle = birth.get_place_handle() bplace_handle = birth.get_place_handle()
if bplace_handle: if bplace_handle:
@ -1316,9 +1318,11 @@ def get_birth_death_strings(database,person,empty_date="",empty_place=""):
bdate_full = bdate_obj and bdate_obj.get_day_valid() bdate_full = bdate_obj and bdate_obj.get_day_valid()
bdate_mod = bdate_obj and bdate_obj.get_modifier() != Date.MOD_NONE bdate_mod = bdate_obj and bdate_obj.get_modifier() != Date.MOD_NONE
death_handle = person.get_death_handle() death_ref = person.get_death_ref()
if death_handle: if death_ref and death_ref.ref:
death_handle = death_ref.ref
death = database.get_event_from_handle(death_handle) death = database.get_event_from_handle(death_handle)
if death:
ddate = DateHandler.get_date(death) ddate = DateHandler.get_date(death)
dplace_handle = death.get_place_handle() dplace_handle = death.get_place_handle()
if dplace_handle: if dplace_handle: