Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugs 2488 and 4251: spacing on families

Browse Source 
svn: r15934
This commit is contained in:
Jérôme Rapinat
2010-09-28 16:51:43 +00:00
parent 7abb29d568
commit 2262dc70da
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/export/ExportGeneWeb.py
View File

@@ -395,23 +395,25 @@ class GeneWebWriter(object):
if married == 1:
if m_date != "":
ret = ret + m_date
ret = ret + " "
if m_place != "" and m_source != "":
ret = ret + " #mp %s #ms %s" % (self.rem_spaces( m_place), self.rem_spaces( m_source))
if m_place != "":
if m_place != "" and m_source == "":
ret = ret + " #mp %s" % self.rem_spaces( m_place)
if m_source != "":
if m_source != "" and m_place == "":
ret = ret + " #ms %s" % self.rem_spaces( m_source)
elif engaged == 1:
"""Geneweb only supports either Marriage or engagement"""
if eng_date != "":
ret = ret + eng_date
ret = ret + " "
if m_place != "" and m_source != "":
ret = ret + " #mp %s #ms %s" % (self.rem_spaces( m_place), self.rem_spaces( m_source))
if eng_place != "":
if eng_place != "" and m_source == "":
ret = ret + " #mp %s" % self.rem_spaces( m_place)
if eng_source != "":
if eng_source != "" and m_place == "":
ret = ret + " #ms %s" % self.rem_spaces( m_source)
else:
if family.get_relationship() != gen.lib.FamilyRelType.MARRIED: