From dfd0aea13c082b3ef592c621fdb14282f35998f3 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Thu, 23 Jun 2005 21:28:57 +0000 Subject: [PATCH] GEDCOM date fix svn: r4869 --- gramps2/ChangeLog | 3 +++ gramps2/src/WriteGedcom.py | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index bc7225f5b..5ba1e21d4 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,6 @@ +2005-06-23 Don Allingham + * src/WriteGedcom.py: Fix GEDCOM date exporting. + 2005-06-23 Alex Roitman * src/Relationship.py (is_spouse): Use context. * src/get_strings: Add "__" to default keywords. diff --git a/gramps2/src/WriteGedcom.py b/gramps2/src/WriteGedcom.py index 0649c99d1..2797883b9 100644 --- a/gramps2/src/WriteGedcom.py +++ b/gramps2/src/WriteGedcom.py @@ -1130,10 +1130,7 @@ class GedcomWriter: def print_date(self,prefix,date): start = date.get_start_date() - val = date.get_text() - if val: - self.writeln("%s %s" % (prefix,self.cnvtxt(val))) - elif not date.is_empty (): + if start != Date.EMPTY: cal = date.get_calendar() mod = date.get_modifier() if date.get_modifier() == Date.MOD_SPAN: @@ -1145,6 +1142,8 @@ class GedcomWriter: else: val = make_date(start,cal,mod) self.writeln("%s %s" % (prefix,val)) + elif date.get_text(): + self.writeln("%s %s" % (prefix,self.cnvtxt(date.get_text()))) def write_person_name(self,name,nick): firstName = self.cnvtxt(name.get_first_name())