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

0002432: Detailed reports place dots where they do not belong.

Browse Source 
svn: r11628
This commit is contained in:
Brian Matherly 2009-01-15 21:09:07 +00:00
parent 58222b68b1
commit 89bf35e342
2 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/DetAncestralReport.py
View File

@ -376,28 +376,26 @@ class DetAncestorReport(Report):
self.doc.start_paragraph('DAR-MoreDetails') self.doc.start_paragraph('DAR-MoreDetails')
evtName = str( event.get_type() ) evtName = str( event.get_type() )
if date and place: if date and place:
text += _('%(event_name)s: %(date)s, %(place)s') % { text += _('%(date)s, %(place)s') % {
'event_name' : _(evtName), 'date' : date, 'place' : place }
'date' : date,
'place' : place }
elif date: elif date:
text += _('%(event_name)s: %(date)s') % { text += _('%(date)s') % {'date' : date}
'event_name' : _(evtName),
'date' : date}
elif place: elif place:
text += _('%(event_name)s: %(place)s') % { text += _('%(place)s') % { 'place' : place }
'event_name' : _(evtName),
'place' : place }
else:
text += _('%(event_name)s: ') % {'event_name' : _(evtName)}
if event.get_description(): if event.get_description():
if text: if text:
text += ". " text += ". "
text += event.get_description() text += event.get_description()
text += self.endnotes(event)
if text: if text:
text += _('%(endnotes)s.') % { 'endnotes' : self.endnotes(event) } text += ". "
text = _('%(event_name)s: %(event_text)s') % {
'event_name' : _(evtName),
'event_text' : text }
self.doc.write_text(text) self.doc.write_text(text)

33
src/plugins/DetDescendantReport.py
View File

@ -309,30 +309,29 @@ class DetDescendantReport(Report):
self.doc.start_paragraph('DDR-MoreDetails') self.doc.start_paragraph('DDR-MoreDetails')
evtName = str( event.get_type() ) evtName = str( event.get_type() )
if date and place: if date and place:
text += _('%(event_name)s: %(date)s, %(place)s') % { text += _('%(date)s, %(place)s') % {
'event_name' : _(evtName), 'date' : date, 'place' : place }
'date' : date,
'place' : place }
elif date: elif date:
text += _('%(event_name)s: %(date)s') % { text += _('%(date)s') % {'date' : date}
'event_name' : _(evtName),
'date' : date}
elif place: elif place:
text += _('%(event_name)s: %(place)s') % { text += _('%(place)s') % { 'place' : place }
'event_name' : _(evtName),
'place' : place }
else:
text += _('%(event_name)s: ') % {'event_name' : _(evtName)}
if event.get_description(): if event.get_description():
if text and (date or place): if text:
text += ". " text += ". "
text += event.get_description() text += event.get_description()
text += "%s. " % self.endnotes(event) text += self.endnotes(event)
if text:
text += ". "
text = _('%(event_name)s: %(event_text)s') % {
'event_name' : _(evtName),
'event_text' : text }
self.doc.write_text(text) self.doc.write_text(text)
if self.inc_attrs: if self.inc_attrs:
text = "" text = ""
attr_list = event.get_attribute_list() attr_list = event.get_attribute_list()