* src/plugins/FtmStyleAncestor.py (print_more_about,print_notes):
Change to regular name instead of formal name. * src/plugins/FtmStyleDescendants.py (print_more_about): Likewise. * src/plugins/FtmStyleDescendants.py (print_children): Table name includes only family id. svn: r1645
This commit is contained in:
		@@ -245,7 +245,8 @@ class FtmAncestorReport(Report.Report):
 | 
			
		||||
        if not note.strip():
 | 
			
		||||
            return
 | 
			
		||||
        self.doc.start_paragraph('SubEntry')
 | 
			
		||||
        self.doc.write_text(_('Notes for %(person)s:') % { 'person' : person.getPrimaryName().getName()} )
 | 
			
		||||
        self.doc.write_text(_('Notes for %(person)s:') % { 
 | 
			
		||||
        	'person' : person.getPrimaryName().getRegularName()} )
 | 
			
		||||
        self.doc.end_paragraph()
 | 
			
		||||
        for line in note.split('\n'):
 | 
			
		||||
            self.doc.start_paragraph('Details')
 | 
			
		||||
@@ -259,7 +260,8 @@ class FtmAncestorReport(Report.Report):
 | 
			
		||||
        for name in person.getAlternateNames():
 | 
			
		||||
            if first:
 | 
			
		||||
                self.doc.start_paragraph('SubEntry')
 | 
			
		||||
                self.doc.write_text(_('More about %(person_name)s:') % { 'person_name' : name })
 | 
			
		||||
                self.doc.write_text(_('More about %(person_name)s:') % { 
 | 
			
		||||
                	'person_name' : person.getPrimaryName().getRegularName() })
 | 
			
		||||
                self.doc.end_paragraph()
 | 
			
		||||
                first = 0
 | 
			
		||||
            self.doc.start_paragraph('Details')
 | 
			
		||||
@@ -278,8 +280,9 @@ class FtmAncestorReport(Report.Report):
 | 
			
		||||
                continue
 | 
			
		||||
            if first:
 | 
			
		||||
                self.doc.start_paragraph('SubEntry')
 | 
			
		||||
                name = person.getPrimaryName().getName()
 | 
			
		||||
                self.doc.write_text(_('More about %(person_name)s:') % { 'person_name' : name })
 | 
			
		||||
                name = person.getPrimaryName().getRegularName()
 | 
			
		||||
                self.doc.write_text(_('More about %(person_name)s:') % { 
 | 
			
		||||
                	'person_name' : name })
 | 
			
		||||
                self.doc.end_paragraph()
 | 
			
		||||
                first = 0
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -277,7 +277,8 @@ class FtmDescendantReport(Report.Report):
 | 
			
		||||
        if not note.strip():
 | 
			
		||||
            return
 | 
			
		||||
        self.doc.start_paragraph('SubEntry')
 | 
			
		||||
        self.doc.write_text(_('Notes for %(person)s:') % { 'person' : person.getPrimaryName().getName()} )
 | 
			
		||||
        self.doc.write_text(_('Notes for %(person)s:') % { 
 | 
			
		||||
            'person' : person.getPrimaryName().getRegularName()} )
 | 
			
		||||
        self.doc.end_paragraph()
 | 
			
		||||
        for line in note.split('\n'):
 | 
			
		||||
            self.doc.start_paragraph('Details')
 | 
			
		||||
@@ -291,7 +292,8 @@ class FtmDescendantReport(Report.Report):
 | 
			
		||||
        for name in person.getAlternateNames():
 | 
			
		||||
            if first:
 | 
			
		||||
                self.doc.start_paragraph('SubEntry')
 | 
			
		||||
                self.doc.write_text(_('More about %(person_name)s:') % { 'person_name' : person.getPrimaryName().getRegularName() })
 | 
			
		||||
                self.doc.write_text(_('More about %(person_name)s:') % { 
 | 
			
		||||
                   'person_name' : person.getPrimaryName().getRegularName() })
 | 
			
		||||
                self.doc.end_paragraph()
 | 
			
		||||
                first = 0
 | 
			
		||||
            self.doc.start_paragraph('Details')
 | 
			
		||||
@@ -310,7 +312,7 @@ class FtmDescendantReport(Report.Report):
 | 
			
		||||
                continue
 | 
			
		||||
            if first:
 | 
			
		||||
                self.doc.start_paragraph('SubEntry')
 | 
			
		||||
                name = person.getPrimaryName().getName()
 | 
			
		||||
                name = person.getPrimaryName().getRegularName()
 | 
			
		||||
                self.doc.write_text(_('More about %(person_name)s:') % { 'person_name' : name })
 | 
			
		||||
                self.doc.end_paragraph()
 | 
			
		||||
                first = 0
 | 
			
		||||
@@ -406,7 +408,7 @@ class FtmDescendantReport(Report.Report):
 | 
			
		||||
                    else:
 | 
			
		||||
                        self.doc.write_text(_('Children of %(person_name)s are:') % { 'person_name' : name })
 | 
			
		||||
                    self.doc.end_paragraph()
 | 
			
		||||
                    self.doc.start_table(family.getId() + '%d' % child_index,'ChildTable')
 | 
			
		||||
                    self.doc.start_table(family.getId(),'ChildTable')
 | 
			
		||||
 | 
			
		||||
                self.doc.start_row()
 | 
			
		||||
                self.doc.start_cell('Normal')
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user