From b997206104ea4405ba5cba31ebf0a388ad8c5bb8 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Mon, 11 Aug 2003 17:10:17 +0000
Subject: [PATCH] 2003-08-11  Tim Waugh  <twaugh@redhat.com>         *
 src/plugins/Ancestors.py: Use Relationship.get_grandparents_string.

svn: r1990
---
 gramps2/ChangeLog                |  3 +++
 gramps2/src/plugins/Ancestors.py | 29 ++++++++++-------------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index f645d60e9..5d84379a2 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,6 @@
+2003-08-11  Tim Waugh  <twaugh@redhat.com>
+	* src/plugins/Ancestors.py: Use Relationship.get_grandparents_string.
+
 2003-08-10  Don Allingham  <dallingham@users.sourceforge.net>
 	* src/Relationship.py: add "get_grandparents_string" to return the
 	grandparents relationship between to people.
diff --git a/gramps2/src/plugins/Ancestors.py b/gramps2/src/plugins/Ancestors.py
index 423f15f0a..fda0a83f2 100644
--- a/gramps2/src/plugins/Ancestors.py
+++ b/gramps2/src/plugins/Ancestors.py
@@ -33,6 +33,7 @@ import Report
 import TextDoc
 import RelLib
 import Errors
+import Relationship
 from QuestionDialog import ErrorDialog
 from intl import gettext as _
 
@@ -221,25 +222,15 @@ class ComprehensiveAncestorsReport (Report.Report):
                 if self.pgbrk:
                     self.doc.page_break()
                 self.doc.start_paragraph ("AR-Heading")
-                if thisgen > 4:
-                    n = thisgen - 3
-                    if n % 10 == 1 and n != 11:
-                        nth = 'st'
-                    elif n % 10 == 2 and n != 12:
-                        nth = 'nd'
-                    elif n % 10 == 3 and n != 13:
-                        nth = 'rd'
-                    else:
-                        nth = 'th'
-                    heading = '%d%s great grandparents' % (n, nth)
-                elif thisgen == 4:
-                    heading = 'Great grandparents'
-                elif thisgen == 3:
-                    heading = 'Grandparents'
-                elif thisgen == 2:
-                    heading = 'Parents'
-                else:
-                    heading = 'Generation %d' % thisgen
+                for self.gp in [families[0].getFather (),
+                                families[0].getMother ()]:
+                    if self.gp:
+                        break
+                heading = _("%(name)s's %(grandparents)s") % \
+                          { 'name': self.first_name_or_nick (self.start),
+                            'grandparents':
+                            Relationship.get_grandparents_string (self.start,
+                                                                  self.gp)[0]}
                 self.doc.write_text (heading)
                 self.doc.end_paragraph ()
                 self.write_paragraphs (people)