revert change here, leave it in trunk

svn: r22416
This commit is contained in:
Paul Franklin 2013-05-24 01:19:28 +00:00
parent f99dfec5bc
commit 9f81ba6a54

View File

@ -255,14 +255,16 @@ class IndivCompleteReport(Report):
self.doc.end_cell() self.doc.end_cell()
self.doc.end_row() 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.doc.start_row()
self.normal_cell(label) self.normal_cell(label)
if parent_name:
# for example (a stepfather): John Smith, relationship: Step if parent:
text = self._('%(parent-name)s, relationship: %(rel-type)s') % { text = '%(parent)s, %(separator)s %(relation)s' % {
'parent-name' : parent_name, 'parent': parent,
'rel-type' : self._(rel_type)} # FIXME this should be lower-case:
'separator': self._('Relationship:'),
'relation': self._(rel)}
self.normal_cell(text, mark=pmark) self.normal_cell(text, mark=pmark)
else: else:
self.normal_cell('') self.normal_cell('')