GEDCOM date fix

svn: r4869
This commit is contained in:
Don Allingham 2005-06-23 21:28:57 +00:00
parent 629390c077
commit dfd0aea13c
2 changed files with 6 additions and 4 deletions

View File

@ -1,3 +1,6 @@
2005-06-23 Don Allingham <don@gramps-project.org>
* src/WriteGedcom.py: Fix GEDCOM date exporting.
2005-06-23 Alex Roitman <shura@gramps-project.org> 2005-06-23 Alex Roitman <shura@gramps-project.org>
* src/Relationship.py (is_spouse): Use context. * src/Relationship.py (is_spouse): Use context.
* src/get_strings: Add "__" to default keywords. * src/get_strings: Add "__" to default keywords.

View File

@ -1130,10 +1130,7 @@ class GedcomWriter:
def print_date(self,prefix,date): def print_date(self,prefix,date):
start = date.get_start_date() start = date.get_start_date()
val = date.get_text() if start != Date.EMPTY:
if val:
self.writeln("%s %s" % (prefix,self.cnvtxt(val)))
elif not date.is_empty ():
cal = date.get_calendar() cal = date.get_calendar()
mod = date.get_modifier() mod = date.get_modifier()
if date.get_modifier() == Date.MOD_SPAN: if date.get_modifier() == Date.MOD_SPAN:
@ -1145,6 +1142,8 @@ class GedcomWriter:
else: else:
val = make_date(start,cal,mod) val = make_date(start,cal,mod)
self.writeln("%s %s" % (prefix,val)) 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): def write_person_name(self,name,nick):
firstName = self.cnvtxt(name.get_first_name()) firstName = self.cnvtxt(name.get_first_name())