From 44000e4b96aef8ba70c3f3e2d427269ddb4d0faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Charette?= Date: Wed, 27 Feb 2008 08:37:01 +0000 Subject: [PATCH] 1549: use standard date formats for FamilyLines svn: r10128 --- ChangeLog | 4 ++++ src/plugins/GVFamilyLines.py | 17 +++-------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8d6aafaef..9c3f2cb8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-02-27 Stéphane Charette + * src/plugins/GVFamilyLines.py: + 0001549: use standard date formats for FamilyLines + 2008-02-26 Brian Matherly * src/ReportBase/_CommandLineReport.py: 0001828: update cli handling of new options. (new in 3.0?) diff --git a/src/plugins/GVFamilyLines.py b/src/plugins/GVFamilyLines.py index 5084abcaa..c24bbcc8e 100644 --- a/src/plugins/GVFamilyLines.py +++ b/src/plugins/GVFamilyLines.py @@ -663,11 +663,7 @@ class FamilyLinesReport(Report): if (bth_event.private and self.includePrivate) or \ not bth_event.private: date = bth_event.get_date_object() - if date.get_day_valid() and date.get_month_valid() and \ - date.get_year_valid(): - birthStr = _dd.display(date) - elif date.get_year_valid(): - birthStr = '%d' % date.get_year() + birthStr = _dd.display(date) # get birth place (one of: city, state, or country) we can use birthplace = None @@ -690,11 +686,7 @@ class FamilyLinesReport(Report): if (dth_event.private and self.includePrivate) or \ not dth_event.private: date = dth_event.get_date_object() - if date.get_day_valid() and date.get_month_valid() and \ - date.get_year_valid(): - deathStr = _dd.display(date) - elif date.get_year_valid(): - deathStr = '%d' % date.get_year() + deathStr = _dd.display(date) # get death place (one of: city, state, or country) we can use deathplace = None @@ -793,10 +785,7 @@ class FamilyLinesReport(Report): if (event.private and self.includePrivate) or not event.private: if self.includeDates: date = event.get_date_object() - if date.get_day_valid() and date.get_month_valid() and date.get_year_valid(): - weddingDate = _dd.display(date) - elif date.get_year_valid(): - weddingDate = '%d' % date.get_year() + weddingDate = _dd.display(date) # get the wedding location if self.includePlaces: place = self.db.get_place_from_handle(event.get_place_handle())