From 523062dbe4fe05fd7d1a136865f937b0f4066f28 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Tue, 27 Jun 2006 04:55:07 +0000 Subject: [PATCH] 2006-06-26 Don Allingham * src/Filters/Rules/Person/_HasDeath.py: use references instead of handles svn: r6968 --- gramps2/ChangeLog | 4 ++++ gramps2/src/Filters/Rules/Person/_HasDeath.py | 5 +++-- gramps2/src/NameDisplay.py | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 3f943d81c..e919b6b3e 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,7 @@ +2006-06-26 Don Allingham + * src/Filters/Rules/Person/_HasDeath.py: use references instead of + handles + 2006-06-24 Alex Roitman * src/NameDisplay.py (_format_base): Add format string display; (_format_raw, _format): Add format string methods. diff --git a/gramps2/src/Filters/Rules/Person/_HasDeath.py b/gramps2/src/Filters/Rules/Person/_HasDeath.py index d6fa59592..20c17a313 100644 --- a/gramps2/src/Filters/Rules/Person/_HasDeath.py +++ b/gramps2/src/Filters/Rules/Person/_HasDeath.py @@ -57,9 +57,10 @@ class HasDeath(Rule): self.date = None def apply(self,db,person): - event_handle = person.get_death_handle() - if not event_handle: + event_ref = person.get_death_ref() + if not event_ref: return False + event_handle = event_ref.ref event = db.get_event_from_handle(event_handle) ed = event.get_description().upper() if self.list[2] \ diff --git a/gramps2/src/NameDisplay.py b/gramps2/src/NameDisplay.py index d737e90c3..dfc67f402 100644 --- a/gramps2/src/NameDisplay.py +++ b/gramps2/src/NameDisplay.py @@ -24,6 +24,8 @@ Class handling language-specific displaying of names. """ +from gettext import gettext as _ + #------------------------------------------------------------------------- # # GRAMPS modules