From 0cc88bd39733260557d811b4ca8663193b0f46a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Charette?= Date: Wed, 18 Jun 2008 04:43:02 +0000 Subject: [PATCH] bug report #2229: parental relationship redundantly says 'Birth' svn: r10817 --- 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 e8ab0d2c1..8f9174cb2 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 # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Pubilc License as published by @@ -2243,7 +2244,7 @@ class IndividualPage(BasePage): val) else: of.write(_nd.display(person)) - if rel != gen.lib.ChildRefType.BIRTH: + if rel != gen.lib.ChildRefType(gen.lib.ChildRefType.BIRTH): of.write('   (%s)' % str(rel)) of.write('\n') @@ -2272,6 +2273,7 @@ class IndividualPage(BasePage): if child_ref.ref == child_handle: frel = str(child_ref.get_father_relation()) mrel = str(child_ref.get_mother_relation()) + break if not first: of.write('\t\t\t\n') @@ -3117,10 +3119,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):