From 9f81ba6a54f86bd855b3bcc2c7fb87ad7b6d47d5 Mon Sep 17 00:00:00 2001 From: Paul Franklin Date: Fri, 24 May 2013 01:19:28 +0000 Subject: [PATCH] revert change here, leave it in trunk svn: r22416 --- gramps/plugins/textreport/indivcomplete.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gramps/plugins/textreport/indivcomplete.py b/gramps/plugins/textreport/indivcomplete.py index e1625a081..b1f7d3873 100644 --- a/gramps/plugins/textreport/indivcomplete.py +++ b/gramps/plugins/textreport/indivcomplete.py @@ -255,14 +255,16 @@ class IndivCompleteReport(Report): self.doc.end_cell() self.doc.end_row() - def write_p_entry(self, label, parent_name, rel_type, pmark=None): + def write_p_entry(self, label, parent, rel, pmark=None): self.doc.start_row() self.normal_cell(label) - if parent_name: - # for example (a stepfather): John Smith, relationship: Step - text = self._('%(parent-name)s, relationship: %(rel-type)s') % { - 'parent-name' : parent_name, - 'rel-type' : self._(rel_type)} + + if parent: + text = '%(parent)s, %(separator)s %(relation)s' % { + 'parent': parent, + # FIXME this should be lower-case: + 'separator': self._('Relationship:'), + 'relation': self._(rel)} self.normal_cell(text, mark=pmark) else: self.normal_cell('')