From e45bec4eb7160aadf1fa6ef090ad750bbec71242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Charette?= Date: Wed, 18 Jun 2008 05:06:25 +0000 Subject: [PATCH] bug report #2229: parental relationship redundantly says 'Birth'; merged from gramps30 svn: r10818 --- src/plugins/NarrativeWeb.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/plugins/NarrativeWeb.py b/src/plugins/NarrativeWeb.py index 3c860fc94..7c2891b8e 100644 --- a/src/plugins/NarrativeWeb.py +++ b/src/plugins/NarrativeWeb.py @@ -4,6 +4,7 @@ # Copyright (C) 2000-2007 Donald N. Allingham # Copyright (C) 2007 Johan Gonqvist # Copyright (C) 2007 Gary Burton +# Copyright (C) 2007-2008 Stephane Charette # Copyright (C) 2008 Brian G. Matherly # # This program is free software; you can redistribute it and/or modify @@ -2123,7 +2124,7 @@ class IndividualPage(BasePage): self.person_link(of, url, _nd.display(person), gid) else: of.write(_nd.display(person)) - if rel and rel != gen.lib.ChildRefType.BIRTH: + if rel and rel != gen.lib.ChildRefType(gen.lib.ChildRefType.BIRTH): of.write('   (%s)' % str(rel)) of.write('\n') @@ -2153,6 +2154,7 @@ class IndividualPage(BasePage): if child_ref.ref == child_handle: frel = child_ref.get_father_relation() mrel = child_ref.get_mother_relation() + break if not first: of.write('\t\t\t\n') @@ -3150,10 +3152,10 @@ class NavWebOptions(MenuReportOptions): showparents.set_help(_('Whether to include a parents column')) menu.add_option(category_name, 'showparents', showparents) - showhalfsiblings = BooleanOption(_("Include a column for half-siblings" - " on the index pages"), False) - showhalfsiblings.set_help(_("Whether to include a half-siblings " - "column")) + showhalfsiblings = BooleanOption(_("Include half-siblings on the " + "individual pages"), False) + showhalfsiblings.set_help(_("Whether to include half-siblings " + "with the parents and siblings")) menu.add_option(category_name, 'showhalfsiblings', showhalfsiblings) def __archive_changed(self):