0001408: Low Verbosity / Succinct option for the Detailed Ancestral/Descendant Reports (patch from James Friedmann <jfriedmannj@gmail.com> modified by Raphael Ackermann <raphael.ackermann@gmail.com> and Brian Matherly)
svn: r9716
This commit is contained in:
Brian Matherly
parent
218e3d585c
commit
5c8214c843
12
ChangeLog
12
ChangeLog
@ -1,5 +1,15 @@
|
||||
2008-01-06 Brian Matherly <brian@gramps-project.org>
|
||||
Raphael Ackermann <raphael.ackermann@gmail.com>
|
||||
James Friedmann <jfriedmannj@gmail.com>
|
||||
* src/ReportBase/_ReportUtils.py:
|
||||
* src/plugins/DetDescendantReport.py:
|
||||
* src/plugins/DetAncestralReport.py:
|
||||
0001408: Low Verbosity / Succinct option for the Detailed
|
||||
Ancestral/Descendant Reports (patch from James Friedmann modified by
|
||||
Raphael Ackermann and Brian Matherly)
|
||||
|
||||
2008-01-05 Raphael Ackermann <raphael.ackermann@gmail.com>
|
||||
* src/src/plugins/Verify.py:
|
||||
* src/plugins/Verify.py:
|
||||
Patch from Raphael Ackermann
|
||||
Fix 0001505: Verifying database signals dead father, when he is not a father.
|
||||
|
||||
|
||||
@ -63,6 +63,7 @@ born_full_date_with_place = [
|
||||
gen.lib.Person.MALE : _("%(male_name)s was born on %(birth_date)s in %(birth_place)s."),
|
||||
gen.lib.Person.FEMALE : _("%(female_name)s was born on %(birth_date)s in %(birth_place)s."),
|
||||
},
|
||||
_("Born %(birth_date)s in %(birth_place)s."),
|
||||
]
|
||||
|
||||
born_modified_date_with_place = [
|
||||
@ -76,6 +77,7 @@ born_modified_date_with_place = [
|
||||
gen.lib.Person.MALE : _("%(male_name)s was born %(modified_date)s in %(birth_place)s."),
|
||||
gen.lib.Person.FEMALE : _("%(female_name)s was born %(modified_date)s in %(birth_place)s."),
|
||||
},
|
||||
_("Born %(modified_date)s in %(birth_place)s."),
|
||||
]
|
||||
|
||||
born_full_date_no_place = [
|
||||
@ -89,6 +91,7 @@ born_full_date_no_place = [
|
||||
gen.lib.Person.MALE : _("%(male_name)s was born on %(birth_date)s."),
|
||||
gen.lib.Person.FEMALE : _("%(female_name)s was born on %(birth_date)s."),
|
||||
},
|
||||
_("Born %(birth_date)s."),
|
||||
]
|
||||
|
||||
born_modified_date_no_place = [
|
||||
@ -102,6 +105,7 @@ born_modified_date_no_place = [
|
||||
gen.lib.Person.MALE : _("%(male_name)s was born %(modified_date)s."),
|
||||
gen.lib.Person.FEMALE : _("%(female_name)s was born %(modified_date)s."),
|
||||
},
|
||||
_("Born %(modified_date)s."),
|
||||
]
|
||||
|
||||
born_partial_date_with_place = [
|
||||
@ -115,6 +119,7 @@ born_partial_date_with_place = [
|
||||
gen.lib.Person.MALE : _("%(male_name)s was born in %(month_year)s in %(birth_place)s."),
|
||||
gen.lib.Person.FEMALE : _("%(female_name)s was born in %(month_year)s in %(birth_place)s."),
|
||||
},
|
||||
_("Born %(month_year)s in %(birth_place)s."),
|
||||
]
|
||||
|
||||
born_partial_date_no_place = [
|
||||
@ -127,7 +132,8 @@ born_partial_date_no_place = [
|
||||
gen.lib.Person.UNKNOWN : _("%(unknown_gender_name)s was born in %(month_year)s."),
|
||||
gen.lib.Person.MALE : _("%(male_name)s was born in %(month_year)s."),
|
||||
gen.lib.Person.FEMALE : _("%(female_name)s was born in %(month_year)s."),
|
||||
}
|
||||
},
|
||||
_("Born %(month_year)s."),
|
||||
]
|
||||
|
||||
born_no_date_with_place = [
|
||||
@ -140,7 +146,8 @@ born_no_date_with_place = [
|
||||
gen.lib.Person.UNKNOWN : _("%(unknown_gender_name)s was born in %(birth_place)s."),
|
||||
gen.lib.Person.MALE : _("%(male_name)s was born in %(birth_place)s."),
|
||||
gen.lib.Person.FEMALE : _("%(female_name)s was born in %(birth_place)s."),
|
||||
}
|
||||
},
|
||||
_("Born in %(birth_place)s."),
|
||||
]
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
@ -188,6 +195,12 @@ died_full_date_with_place = [
|
||||
_("%(female_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d days."),
|
||||
],
|
||||
},
|
||||
[
|
||||
_("Died %(death_date)s in %(death_place)s."),
|
||||
_("Died %(death_date)s in %(death_place)s (age %(age)d years)."),
|
||||
_("Died %(death_date)s in %(death_place)s (age %(age)d months)."),
|
||||
_("Died %(death_date)s in %(death_place)s (age %(age)d days)."),
|
||||
],
|
||||
]
|
||||
|
||||
died_modified_date_with_place = [
|
||||
@ -229,6 +242,12 @@ died_modified_date_with_place = [
|
||||
_("%(female_name)s died %(death_date)s in %(death_place)s at the age of %(age)d days."),
|
||||
],
|
||||
},
|
||||
[
|
||||
_("Died %(death_date)s in %(death_place)s."),
|
||||
_("Died %(death_date)s in %(death_place)s (age %(age)d years)."),
|
||||
_("Died %(death_date)s in %(death_place)s (age %(age)d months)."),
|
||||
_("Died %(death_date)s in %(death_place)s (age %(age)d days)."),
|
||||
],
|
||||
]
|
||||
|
||||
died_full_date_no_place = [
|
||||
@ -270,6 +289,12 @@ died_full_date_no_place = [
|
||||
_("%(female_name)s died on %(death_date)s at the age of %(age)d days."),
|
||||
],
|
||||
},
|
||||
[
|
||||
_("Died %(death_date)s."),
|
||||
_("Died %(death_date)s (age %(age)d years)."),
|
||||
_("Died %(death_date)s (age %(age)d months)."),
|
||||
_("Died %(death_date)s (age %(age)d days)."),
|
||||
],
|
||||
]
|
||||
|
||||
died_modified_date_no_place = [
|
||||
@ -311,6 +336,12 @@ died_modified_date_no_place = [
|
||||
_("%(female_name)s died %(death_date)s at the age of %(age)d days."),
|
||||
],
|
||||
},
|
||||
[
|
||||
_("Died %(death_date)s."),
|
||||
_("Died %(death_date)s (age %(age)d years)."),
|
||||
_("Died %(death_date)s (age %(age)d months)."),
|
||||
_("Died %(death_date)s (age %(age)d days)."),
|
||||
],
|
||||
]
|
||||
|
||||
died_partial_date_with_place = [
|
||||
@ -352,6 +383,12 @@ died_partial_date_with_place = [
|
||||
_("%(female_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d days."),
|
||||
],
|
||||
},
|
||||
[
|
||||
_("Died %(month_year)s in %(death_place)s."),
|
||||
_("Died %(month_year)s in %(death_place)s (age %(age)d years)."),
|
||||
_("Died %(month_year)s in %(death_place)s (age %(age)d months)."),
|
||||
_("Died %(month_year)s in %(death_place)s (age %(age)d days)."),
|
||||
],
|
||||
]
|
||||
|
||||
died_partial_date_no_place = [
|
||||
@ -392,7 +429,13 @@ died_partial_date_no_place = [
|
||||
_("%(female_name)s died in %(month_year)s at the age of %(age)d months."),
|
||||
_("%(female_name)s died in %(month_year)s at the age of %(age)d days."),
|
||||
],
|
||||
}
|
||||
},
|
||||
[
|
||||
_("Died %(month_year)s."),
|
||||
_("Died %(month_year)s (age %(age)d years)."),
|
||||
_("Died %(month_year)s (age %(age)d months)."),
|
||||
_("Died %(month_year)s (age %(age)d days)."),
|
||||
],
|
||||
]
|
||||
|
||||
died_no_date_with_place = [
|
||||
@ -434,7 +477,13 @@ died_no_date_with_place = [
|
||||
_("%(female_name)s died in %(death_place)s at the age of %(age)d months."),
|
||||
_("%(female_name)s died in %(death_place)s at the age of %(age)d days."),
|
||||
],
|
||||
}
|
||||
},
|
||||
[
|
||||
_("Died in %(death_place)s."),
|
||||
_("Died in %(death_place)s (age %(age)d years)."),
|
||||
_("Died in %(death_place)s (age %(age)d months)."),
|
||||
_("Died in %(death_place)s (age %(age)d days)."),
|
||||
],
|
||||
]
|
||||
|
||||
died_no_date_no_place = [
|
||||
@ -476,6 +525,12 @@ died_no_date_no_place = [
|
||||
_("%(female_name)s died at the age of %(age)d days."),
|
||||
],
|
||||
},
|
||||
[
|
||||
_(""),
|
||||
_("Died (age %(age)d years)."),
|
||||
_("Died (age %(age)d months)."),
|
||||
_("Died (age %(age)d days)."),
|
||||
],
|
||||
]
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
@ -626,6 +681,11 @@ marriage_first_date_place = {
|
||||
_('She married %(spouse)s on %(full_date)s in %(place)s%(endnotes)s.'),
|
||||
_('She married %(spouse)s %(modified_date)s in %(place)s%(endnotes)s.'),
|
||||
],
|
||||
'succinct' : [
|
||||
_('Married %(spouse)s %(partial_date)s in %(place)s%(endnotes)s.'),
|
||||
_('Married %(spouse)s %(full_date)s in %(place)s%(endnotes)s.'),
|
||||
_('Married %(spouse)s %(modified_date)s in %(place)s%(endnotes)s.'),
|
||||
],
|
||||
}
|
||||
|
||||
marriage_also_date_place = {
|
||||
@ -644,6 +704,11 @@ marriage_also_date_place = {
|
||||
_('She also married %(spouse)s on %(full_date)s in %(place)s%(endnotes)s.'),
|
||||
_('She also married %(spouse)s %(modified_date)s in %(place)s%(endnotes)s.'),
|
||||
],
|
||||
'succinct' : [
|
||||
_('Also married %(spouse)s %(partial_date)s in %(place)s%(endnotes)s.'),
|
||||
_('Also married %(spouse)s %(full_date)s in %(place)s%(endnotes)s.'),
|
||||
_('Also married %(spouse)s %(modified_date)s in %(place)s%(endnotes)s.'),
|
||||
],
|
||||
}
|
||||
|
||||
marriage_first_date = {
|
||||
@ -662,6 +727,11 @@ marriage_first_date = {
|
||||
_('She married %(spouse)s on %(full_date)s%(endnotes)s.'),
|
||||
_('She married %(spouse)s %(modified_date)s%(endnotes)s.'),
|
||||
],
|
||||
'succinct' : [
|
||||
_('Married %(spouse)s %(partial_date)s%(endnotes)s.'),
|
||||
_('Married %(spouse)s %(full_date)s%(endnotes)s.'),
|
||||
_('Married %(spouse)s %(modified_date)s%(endnotes)s.'),
|
||||
],
|
||||
}
|
||||
|
||||
marriage_also_date = {
|
||||
@ -680,30 +750,39 @@ marriage_also_date = {
|
||||
_('She also married %(spouse)s on %(full_date)s%(endnotes)s.'),
|
||||
_('She also married %(spouse)s %(modified_date)s%(endnotes)s.'),
|
||||
],
|
||||
'succinct' : [
|
||||
_('Also married %(spouse)s %(partial_date)s%(endnotes)s.'),
|
||||
_('Also married %(spouse)s %(full_date)s%(endnotes)s.'),
|
||||
_('Also married %(spouse)s %(modified_date)s%(endnotes)s.'),
|
||||
],
|
||||
}
|
||||
|
||||
marriage_first_place = {
|
||||
gen.lib.Person.UNKNOWN : _('This person married %(spouse)s in %(place)s%(endnotes)s.'),
|
||||
gen.lib.Person.MALE : _('He married %(spouse)s in %(place)s%(endnotes)s.'),
|
||||
gen.lib.Person.FEMALE : _('She married %(spouse)s in %(place)s%(endnotes)s.'),
|
||||
'succinct' : _('Married %(spouse)s in %(place)s%(endnotes)s.'),
|
||||
}
|
||||
|
||||
marriage_also_place = {
|
||||
gen.lib.Person.UNKNOWN : _('This person also married %(spouse)s in %(place)s%(endnotes)s.'),
|
||||
gen.lib.Person.MALE : _('He also married %(spouse)s in %(place)s%(endnotes)s.'),
|
||||
gen.lib.Person.FEMALE : _('She also married %(spouse)s in %(place)s%(endnotes)s.'),
|
||||
'succinct' : _('Also married %(spouse)s in %(place)s%(endnotes)s.'),
|
||||
}
|
||||
|
||||
marriage_first_only = {
|
||||
gen.lib.Person.UNKNOWN : _('This person married %(spouse)s%(endnotes)s.'),
|
||||
gen.lib.Person.MALE : _('He married %(spouse)s%(endnotes)s.'),
|
||||
gen.lib.Person.FEMALE : _('She married %(spouse)s%(endnotes)s.'),
|
||||
'succinct' : _('Married %(spouse)s%(endnotes)s.'),
|
||||
}
|
||||
|
||||
marriage_also_only = {
|
||||
gen.lib.Person.UNKNOWN : _('This person also married %(spouse)s%(endnotes)s.'),
|
||||
gen.lib.Person.MALE : _('He also married %(spouse)s%(endnotes)s.'),
|
||||
gen.lib.Person.FEMALE : _('She also married %(spouse)s%(endnotes)s.'),
|
||||
'succinct' : _('Also married %(spouse)s%(endnotes)s.'),
|
||||
}
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
@ -728,6 +807,11 @@ unmarried_first_date_place = {
|
||||
_('She had an unmarried relationship with %(spouse)s on %(full_date)s in %(place)s%(endnotes)s.'),
|
||||
_('She had an unmarried relationship with %(spouse)s %(modified_date)s in %(place)s%(endnotes)s.'),
|
||||
],
|
||||
'succinct' : [
|
||||
_('Unmarried relationship with %(spouse)s %(partial_date)s in %(place)s%(endnotes)s.'),
|
||||
_('Unmarried relationship with %(spouse)s %(full_date)s in %(place)s%(endnotes)s.'),
|
||||
_('Unmarried relationship with %(spouse)s %(modified_date)s in %(place)s%(endnotes)s.'),
|
||||
],
|
||||
}
|
||||
|
||||
unmarried_also_date_place = {
|
||||
@ -746,6 +830,11 @@ unmarried_also_date_place = {
|
||||
_('She also had an unmarried relationship with %(spouse)s on %(full_date)s in %(place)s%(endnotes)s.'),
|
||||
_('She also had an unmarried relationship with %(spouse)s %(modified_date)s in %(place)s%(endnotes)s.'),
|
||||
],
|
||||
'succinct' : [
|
||||
_('Unmarried relationship with %(spouse)s %(partial_date)s in %(place)s%(endnotes)s.'),
|
||||
_('Unmarried relationship with %(spouse)s %(full_date)s in %(place)s%(endnotes)s.'),
|
||||
_('Unmarried relationship with %(spouse)s %(modified_date)s in %(place)s%(endnotes)s.'),
|
||||
],
|
||||
}
|
||||
|
||||
unmarried_first_date = {
|
||||
@ -764,6 +853,11 @@ unmarried_first_date = {
|
||||
_('She had an unmarried relationship with %(spouse)s on %(full_date)s%(endnotes)s.'),
|
||||
_('She had an unmarried relationship with %(spouse)s %(modified_date)s%(endnotes)s.'),
|
||||
],
|
||||
'succinct' : [
|
||||
_('Unmarried relationship with %(spouse)s %(partial_date)s%(endnotes)s.'),
|
||||
_('Unmarried relationship with %(spouse)s %(full_date)s%(endnotes)s.'),
|
||||
_('Unmarried relationship with %(spouse)s %(modified_date)s%(endnotes)s.'),
|
||||
],
|
||||
}
|
||||
|
||||
unmarried_also_date = {
|
||||
@ -782,30 +876,39 @@ unmarried_also_date = {
|
||||
_('She also had an unmarried relationship with %(spouse)s on %(full_date)s%(endnotes)s.'),
|
||||
_('She also had an unmarried relationship with %(spouse)s %(modified_date)s%(endnotes)s.'),
|
||||
],
|
||||
'succinct' : [
|
||||
_('Also unmarried relationship with %(spouse)s %(partial_date)s%(endnotes)s.'),
|
||||
_('Also unmarried relationship with %(spouse)s %(full_date)s%(endnotes)s.'),
|
||||
_('Also unmarried relationship with %(spouse)s %(modified_date)s%(endnotes)s.'),
|
||||
],
|
||||
}
|
||||
|
||||
unmarried_first_place = {
|
||||
gen.lib.Person.UNKNOWN : _('This person had an unmarried relationship with %(spouse)s in %(place)s%(endnotes)s.'),
|
||||
gen.lib.Person.MALE : _('He had an unmarried relationship with %(spouse)s in %(place)s%(endnotes)s.'),
|
||||
gen.lib.Person.FEMALE : _('She had an unmarried relationship with %(spouse)s in %(place)s%(endnotes)s.'),
|
||||
'succinct' : _('Unmarried relationship with %(spouse)s in %(place)s%(endnotes)s.'),
|
||||
}
|
||||
|
||||
unmarried_also_place = {
|
||||
gen.lib.Person.UNKNOWN : _('This person also had an unmarried relationship with %(spouse)s in %(place)s%(endnotes)s.'),
|
||||
gen.lib.Person.MALE : _('He also had an unmarried relationship with %(spouse)s in %(place)s%(endnotes)s.'),
|
||||
gen.lib.Person.FEMALE : _('She also had an unmarried relationship with %(spouse)s in %(place)s%(endnotes)s.'),
|
||||
'succinct' : _('Unmarried relationship with %(spouse)s in %(place)s%(endnotes)s.'),
|
||||
}
|
||||
|
||||
unmarried_first_only = {
|
||||
gen.lib.Person.UNKNOWN : _('This person had an unmarried relationship with %(spouse)s%(endnotes)s.'),
|
||||
gen.lib.Person.MALE : _('He had an unmarried relationship with %(spouse)s%(endnotes)s.'),
|
||||
gen.lib.Person.FEMALE : _('She had an unmarried relationship with %(spouse)s%(endnotes)s.'),
|
||||
'succinct' : _('Unmarried relationship with %(spouse)s%(endnotes)s.'),
|
||||
}
|
||||
|
||||
unmarried_also_only = {
|
||||
gen.lib.Person.UNKNOWN : _('This person also had an unmarried relationship with %(spouse)s%(endnotes)s.'),
|
||||
gen.lib.Person.MALE : _('He also had an unmarried relationship with %(spouse)s%(endnotes)s.'),
|
||||
gen.lib.Person.FEMALE : _('She also had an unmarried relationship with %(spouse)s%(endnotes)s.'),
|
||||
'succinct' : _('Unmarried relationship with %(spouse)s%(endnotes)s.'),
|
||||
}
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
@ -831,6 +934,11 @@ relationship_first_date_place = {
|
||||
_('She had a relationship with %(spouse)s on %(full_date)s in %(place)s%(endnotes)s.'),
|
||||
_('She had a relationship with %(spouse)s %(modified_date)s in %(place)s%(endnotes)s.'),
|
||||
],
|
||||
'succinct' : [
|
||||
_('Relationship with %(spouse)s %(partial_date)s in %(place)s%(endnotes)s.'),
|
||||
_('Relationship with %(spouse)s %(full_date)s in %(place)s%(endnotes)s.'),
|
||||
_('Relationship with %(spouse)s %(modified_date)s in %(place)s%(endnotes)s.'),
|
||||
],
|
||||
}
|
||||
|
||||
relationship_also_date_place = {
|
||||
@ -849,6 +957,11 @@ relationship_also_date_place = {
|
||||
_('She also had a relationship with %(spouse)s on %(full_date)s in %(place)s%(endnotes)s.'),
|
||||
_('She also had a relationship with %(spouse)s %(modified_date)s in %(place)s%(endnotes)s.'),
|
||||
],
|
||||
'succinct' : [
|
||||
_('Also relationship with %(spouse)s %(partial_date)s in %(place)s%(endnotes)s.'),
|
||||
_('Also relationship with %(spouse)s %(full_date)s in %(place)s%(endnotes)s.'),
|
||||
_('Also relationship with %(spouse)s %(modified_date)s in %(place)s%(endnotes)s.'),
|
||||
],
|
||||
}
|
||||
|
||||
relationship_first_date = {
|
||||
@ -867,6 +980,11 @@ relationship_first_date = {
|
||||
_('She had a relationship with %(spouse)s on %(full_date)s%(endnotes)s.'),
|
||||
_('She had a relationship with %(spouse)s %(modified_date)s%(endnotes)s.'),
|
||||
],
|
||||
'succinct' : [
|
||||
_('Relationship with %(spouse)s %(partial_date)s%(endnotes)s.'),
|
||||
_('Relationship with %(spouse)s %(full_date)s%(endnotes)s.'),
|
||||
_('Relationship with %(spouse)s %(modified_date)s%(endnotes)s.'),
|
||||
],
|
||||
}
|
||||
|
||||
relationship_also_date = {
|
||||
@ -885,30 +1003,39 @@ relationship_also_date = {
|
||||
_('She also had a relationship with %(spouse)s on %(full_date)s%(endnotes)s.'),
|
||||
_('She also had a relationship with %(spouse)s %(modified_date)s%(endnotes)s.'),
|
||||
],
|
||||
'succinct' : [
|
||||
_('Also relationship with %(spouse)s %(partial_date)s%(endnotes)s.'),
|
||||
_('Also relationship with %(spouse)s %(full_date)s%(endnotes)s.'),
|
||||
_('Also relationship with %(spouse)s %(modified_date)s%(endnotes)s.'),
|
||||
],
|
||||
}
|
||||
|
||||
relationship_first_place = {
|
||||
gen.lib.Person.UNKNOWN : _('This person had a relationship with %(spouse)s in %(place)s%(endnotes)s.'),
|
||||
gen.lib.Person.MALE : _('He had a relationship with %(spouse)s in %(place)s%(endnotes)s.'),
|
||||
gen.lib.Person.FEMALE : _('She had a relationship with %(spouse)s in %(place)s%(endnotes)s.'),
|
||||
'succinct' : _('Relationship with %(spouse)s in %(place)s%(endnotes)s.'),
|
||||
}
|
||||
|
||||
relationship_also_place = {
|
||||
gen.lib.Person.UNKNOWN : _('This person also had a relationship with %(spouse)s in %(place)s%(endnotes)s.'),
|
||||
gen.lib.Person.MALE : _('He also had a relationship with %(spouse)s in %(place)s%(endnotes)s.'),
|
||||
gen.lib.Person.FEMALE : _('She also had a relationship with %(spouse)s in %(place)s%(endnotes)s.'),
|
||||
'succinct' : _('Also relationship with %(spouse)s in %(place)s%(endnotes)s.'),
|
||||
}
|
||||
|
||||
relationship_first_only = {
|
||||
gen.lib.Person.UNKNOWN : _('This person had a relationship with %(spouse)s%(endnotes)s.'),
|
||||
gen.lib.Person.MALE : _('He had a relationship with %(spouse)s%(endnotes)s.'),
|
||||
gen.lib.Person.FEMALE : _('She had a relationship with %(spouse)s%(endnotes)s.'),
|
||||
'succinct' : _('Relationship with %(spouse)s%(endnotes)s.'),
|
||||
}
|
||||
|
||||
relationship_also_only = {
|
||||
gen.lib.Person.UNKNOWN : _('This person also had a relationship with %(spouse)s%(endnotes)s.'),
|
||||
gen.lib.Person.MALE : _('He also had a relationship with %(spouse)s%(endnotes)s.'),
|
||||
gen.lib.Person.FEMALE : _('She also had a relationship with %(spouse)s%(endnotes)s.'),
|
||||
'succinct' : _('Also relationship with %(spouse)s%(endnotes)s.'),
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
@ -927,6 +1054,7 @@ child_father_mother = {
|
||||
_("%(male_name)s is the child of %(father)s and %(mother)s."),
|
||||
_("%(male_name)s was the child of %(father)s and %(mother)s."),
|
||||
],
|
||||
_("Child of %(father)s and %(mother)s."),
|
||||
],
|
||||
gen.lib.Person.MALE : [
|
||||
[
|
||||
@ -936,7 +1064,8 @@ child_father_mother = {
|
||||
[
|
||||
_("%(male_name)s is the son of %(father)s and %(mother)s."),
|
||||
_("%(male_name)s was the son of %(father)s and %(mother)s."),
|
||||
]
|
||||
],
|
||||
_("Son of %(father)s and %(mother)s."),
|
||||
],
|
||||
gen.lib.Person.FEMALE : [
|
||||
[
|
||||
@ -947,6 +1076,7 @@ child_father_mother = {
|
||||
_("%(female_name)s is the daughter of %(father)s and %(mother)s."),
|
||||
_("%(female_name)s was the daughter of %(father)s and %(mother)s."),
|
||||
],
|
||||
_("Daughter of %(father)s and %(mother)s."),
|
||||
]
|
||||
}
|
||||
|
||||
@ -960,6 +1090,7 @@ child_father = {
|
||||
_("%(male_name)s is the child of %(father)s."),
|
||||
_("%(male_name)s was the child of %(father)s."),
|
||||
],
|
||||
_("Child of %(father)s."),
|
||||
],
|
||||
gen.lib.Person.MALE : [
|
||||
[
|
||||
@ -970,6 +1101,7 @@ child_father = {
|
||||
_("%(male_name)s is the son of %(father)s."),
|
||||
_("%(male_name)s was the son of %(father)s."),
|
||||
],
|
||||
_("Son of %(father)s."),
|
||||
],
|
||||
gen.lib.Person.FEMALE : [
|
||||
[
|
||||
@ -980,6 +1112,7 @@ child_father = {
|
||||
_("%(female_name)s is the daughter of %(father)s."),
|
||||
_("%(female_name)s was the daughter of %(father)s."),
|
||||
],
|
||||
_("Daughter of %(father)s."),
|
||||
],
|
||||
}
|
||||
|
||||
@ -993,6 +1126,7 @@ child_mother = {
|
||||
_("%(male_name)s is the child of %(mother)s."),
|
||||
_("%(male_name)s was the child of %(mother)s."),
|
||||
],
|
||||
_("Child of %(mother)s."),
|
||||
],
|
||||
gen.lib.Person.MALE : [
|
||||
[
|
||||
@ -1003,6 +1137,7 @@ child_mother = {
|
||||
_("%(male_name)s is the son of %(mother)s."),
|
||||
_("%(male_name)s was the son of %(mother)s."),
|
||||
],
|
||||
_("Son of %(mother)s."),
|
||||
],
|
||||
gen.lib.Person.FEMALE : [
|
||||
[
|
||||
@ -1013,6 +1148,7 @@ child_mother = {
|
||||
_("%(female_name)s is the daughter of %(mother)s."),
|
||||
_("%(female_name)s was the daughter of %(mother)s."),
|
||||
],
|
||||
_("Daughter of %(mother)s."),
|
||||
],
|
||||
}
|
||||
|
||||
@ -1700,7 +1836,7 @@ def born_died_str(database, person, endnotes=None, name_object=None, person_name
|
||||
# married_str
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
def married_str(database, person, family, endnotes=None,
|
||||
def married_str(database, person, family, verbose=True, endnotes=None,
|
||||
empty_date="", empty_place="", is_first=True):
|
||||
"""
|
||||
Composes a string describing marriage of a person. Missing information will
|
||||
@ -1777,63 +1913,119 @@ def married_str(database, person, family, endnotes=None,
|
||||
# CUSTOM will be difficult as user can supply any arbitrary string to describe type
|
||||
|
||||
if is_first:
|
||||
if event and date and place:
|
||||
if event and date and place and verbose:
|
||||
if relationship == gen.lib.FamilyRelType.MARRIED:
|
||||
text = marriage_first_date_place[gender][date_full] % values
|
||||
elif relationship == gen.lib.FamilyRelType.UNMARRIED:
|
||||
text = unmarried_first_date_place[gender][date_full] % values
|
||||
else:
|
||||
text = relationship_first_date_place[gender][date_full] % values
|
||||
elif event and date:
|
||||
if event and date and place:
|
||||
if relationship == gen.lib.FamilyRelType.MARRIED:
|
||||
text = marriage_first_date_place['succinct'][date_full] % values
|
||||
elif relationship == gen.lib.FamilyRelType.UNMARRIED:
|
||||
text = unmarried_first_date_place['succinct'][date_full] % values
|
||||
else:
|
||||
text = relationship_first_date_place['succinct'][date_full] % values
|
||||
elif event and date and verbose:
|
||||
if relationship == gen.lib.FamilyRelType.MARRIED:
|
||||
text = marriage_first_date[gender][date_full] % values
|
||||
elif relationship == gen.lib.FamilyRelType.UNMARRIED:
|
||||
text = unmarried_first_date[gender][date_full] % values
|
||||
else:
|
||||
text = relationship_first_date[gender][date_full] % values
|
||||
elif event and place:
|
||||
elif event and date:
|
||||
if relationship == gen.lib.FamilyRelType.MARRIED:
|
||||
text = marriage_first_date['succinct'][date_full] % values
|
||||
elif relationship == gen.lib.FamilyRelType.UNMARRIED:
|
||||
text = unmarried_first_date['succinct'][date_full] % values
|
||||
else:
|
||||
text = relationship_first_date['succinct'][date_full] % values
|
||||
elif event and place and verbose:
|
||||
if relationship == gen.lib.FamilyRelType.MARRIED:
|
||||
text = marriage_first_place[gender] % values
|
||||
elif relationship == gen.lib.FamilyRelType.UNMARRIED:
|
||||
text = unmarried_first_place[gender] % values
|
||||
else:
|
||||
text = relationship_first_place[gender] % values
|
||||
else:
|
||||
elif event and place:
|
||||
if relationship == gen.lib.FamilyRelType.MARRIED:
|
||||
text = marriage_first_place['succinct'] % values
|
||||
elif relationship == gen.lib.FamilyRelType.UNMARRIED:
|
||||
text = unmarried_first_place['succinct'] % values
|
||||
else:
|
||||
text = relationship_first_place['succinct'] % values
|
||||
elif verbose:
|
||||
if relationship == gen.lib.FamilyRelType.MARRIED:
|
||||
text = marriage_first_only[gender] % values
|
||||
elif relationship == gen.lib.FamilyRelType.UNMARRIED:
|
||||
text = unmarried_first_only[gender] % values
|
||||
else:
|
||||
text = relationship_first_only[gender] % values
|
||||
else:
|
||||
if relationship == gen.lib.FamilyRelType.MARRIED:
|
||||
text = marriage_first_only['succinct'] % values
|
||||
elif relationship == gen.lib.FamilyRelType.UNMARRIED:
|
||||
text = unmarried_first_only['succinct'] % values
|
||||
else:
|
||||
text = relationship_first_only['succinct'] % values
|
||||
else:
|
||||
if event and date and place:
|
||||
if event and date and place and verbose:
|
||||
if relationship == gen.lib.FamilyRelType.MARRIED:
|
||||
text = marriage_also_date_place[gender][date_full] % values
|
||||
elif relationship == gen.lib.FamilyRelType.UNMARRIED:
|
||||
text = unmarried_also_date_place[gender][date_full] % values
|
||||
else:
|
||||
text = relationship_also_date_place[gender][date_full] % values
|
||||
elif event and date:
|
||||
if event and date and place:
|
||||
if relationship == gen.lib.FamilyRelType.MARRIED:
|
||||
text = marriage_also_date_place['succinct'][date_full] % values
|
||||
elif relationship == gen.lib.FamilyRelType.UNMARRIED:
|
||||
text = unmarried_also_date_place['succinct'][date_full] % values
|
||||
else:
|
||||
text = relationship_also_date_place['succinct'][date_full] % values
|
||||
elif event and date and verbose:
|
||||
if relationship == gen.lib.FamilyRelType.MARRIED:
|
||||
text = marriage_also_date[gender][date_full] % values
|
||||
elif relationship == gen.lib.FamilyRelType.UNMARRIED:
|
||||
text = unmarried_also_date[gender][date_full] % values
|
||||
else:
|
||||
text = relationship_also_date[gender][date_full] % values
|
||||
elif event and place:
|
||||
elif event and date:
|
||||
if relationship == gen.lib.FamilyRelType.MARRIED:
|
||||
text = marriage_also_date['succinct'][date_full] % values
|
||||
elif relationship == gen.lib.FamilyRelType.UNMARRIED:
|
||||
text = unmarried_also_date['succinct'][date_full] % values
|
||||
else:
|
||||
text = relationship_also_date['succinct'][date_full] % values
|
||||
elif event and place and verbose:
|
||||
if relationship == gen.lib.FamilyRelType.MARRIED:
|
||||
text = marriage_also_place[gender] % values
|
||||
elif relationship == gen.lib.FamilyRelType.UNMARRIED:
|
||||
text = unmarried_also_place[gender] % values
|
||||
else:
|
||||
text = relationship_also_place[gender] % values
|
||||
else:
|
||||
elif event and place:
|
||||
if relationship == gen.lib.FamilyRelType.MARRIED:
|
||||
text = marriage_also_place['succinct'] % values
|
||||
elif relationship == gen.lib.FamilyRelType.UNMARRIED:
|
||||
text = unmarried_also_place['succinct'] % values
|
||||
else:
|
||||
text = relationship_also_place['succinct'] % values
|
||||
elif verbose:
|
||||
if relationship == gen.lib.FamilyRelType.MARRIED:
|
||||
text = marriage_also_only[gender] % values
|
||||
elif relationship == gen.lib.FamilyRelType.UNMARRIED:
|
||||
text = unmarried_also_only[gender] % values
|
||||
else:
|
||||
text = relationship_also_only[gender] % values
|
||||
else:
|
||||
if relationship == gen.lib.FamilyRelType.MARRIED:
|
||||
text = marriage_also_only['succinct'] % values
|
||||
elif relationship == gen.lib.FamilyRelType.UNMARRIED:
|
||||
text = unmarried_also_only['succinct'] % values
|
||||
else:
|
||||
text = relationship_also_only['succinct'] % values
|
||||
|
||||
if text:
|
||||
text = text + " "
|
||||
@ -1845,7 +2037,8 @@ def married_str(database, person, family, endnotes=None,
|
||||
# child_str
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
def child_str(person, father_name="", mother_name="", dead=0, person_name=0):
|
||||
def child_str(person, father_name="", mother_name="", dead=0,
|
||||
person_name=0, verbose=True):
|
||||
"""
|
||||
Composes a string describing person being a child.
|
||||
|
||||
@ -1882,12 +2075,18 @@ def child_str(person, father_name="", mother_name="", dead=0, person_name=0):
|
||||
gender = person.get_gender()
|
||||
|
||||
text = ""
|
||||
if mother_name and father_name:
|
||||
if mother_name and father_name and verbose:
|
||||
text = child_father_mother[gender][index][dead] % values
|
||||
elif mother_name:
|
||||
elif mother_name and father_name:
|
||||
text = child_father_mother[gender][2] % values
|
||||
elif mother_name and verbose:
|
||||
text = child_mother[gender][index][dead] % values
|
||||
elif father_name:
|
||||
elif mother_name:
|
||||
text = child_mother[gender][2] % values
|
||||
elif father_name and verbose:
|
||||
text = child_father[gender][index][dead] % values
|
||||
elif father_name:
|
||||
text = child_father[gender][2] % values
|
||||
if text:
|
||||
text = text + " "
|
||||
return text
|
||||
@ -1921,7 +2120,8 @@ def find_marriage(database, family):
|
||||
# born_str
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
def born_str(database, person, person_name=None, empty_date="", empty_place=""):
|
||||
def born_str(database, person, person_name=None, verbose=True,
|
||||
empty_date="", empty_place=""):
|
||||
"""
|
||||
Check birth record.
|
||||
Statement formats name precedes this
|
||||
@ -1959,23 +2159,37 @@ def born_str(database, person, person_name=None, empty_date="", empty_place=""):
|
||||
|
||||
if bdate:
|
||||
if bdate_mod:
|
||||
if bplace:
|
||||
if bplace and verbose:
|
||||
text = born_modified_date_with_place[name_index][gender] % value_map
|
||||
else:
|
||||
elif bplace:
|
||||
text = born_modified_date_with_place[2] % value_map
|
||||
elif verbose:
|
||||
text = born_modified_date_no_place[name_index][gender] % value_map
|
||||
else:
|
||||
text = born_modified_date_no_place[2] % value_map
|
||||
elif bdate_full:
|
||||
if bplace:
|
||||
if bplace and verbose:
|
||||
text = born_full_date_with_place[name_index][gender] % value_map
|
||||
else:
|
||||
elif bplace:
|
||||
text = born_full_date_with_place[2] % value_map
|
||||
elif verbose:
|
||||
text = born_full_date_no_place[name_index][gender] % value_map
|
||||
else:
|
||||
if bplace:
|
||||
text = born_partial_date_with_place[name_index][gender] % value_map
|
||||
else:
|
||||
text = born_full_date_no_place[2] % value_map
|
||||
else:
|
||||
if bplace and verbose:
|
||||
text = born_partial_date_with_place[name_index][gender] % value_map
|
||||
elif bplace:
|
||||
text = born_partial_date_with_place[2] % value_map
|
||||
elif verbose:
|
||||
text = born_partial_date_no_place[name_index][gender] % value_map
|
||||
else:
|
||||
text = born_partial_date_no_place[2] % value_map
|
||||
else:
|
||||
if bplace:
|
||||
if bplace and verbose:
|
||||
text = born_no_date_with_place[name_index][gender] % value_map
|
||||
elif bplace:
|
||||
text = born_no_date_with_place[2] % value_map
|
||||
else:
|
||||
text = ""
|
||||
if text:
|
||||
@ -1987,8 +2201,8 @@ def born_str(database, person, person_name=None, empty_date="", empty_place=""):
|
||||
# died_str
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
def died_str(database, person, person_name=None, empty_date="", empty_place="",
|
||||
age=None, age_units=0):
|
||||
def died_str(database, person, person_name=None, verbose=True,
|
||||
empty_date="", empty_place="", age=None, age_units=0):
|
||||
"""
|
||||
Write obit sentence.
|
||||
FIRSTNAME died on Date
|
||||
@ -2044,25 +2258,41 @@ def died_str(database, person, person_name=None, empty_date="", empty_place="",
|
||||
|
||||
if ddate:
|
||||
if ddate_mod:
|
||||
if dplace:
|
||||
if dplace and verbose:
|
||||
text = died_modified_date_with_place[name_index][gender][age_units] % value_map
|
||||
else:
|
||||
elif dplace:
|
||||
text = died_modified_date_with_place[2][age_units] % value_map
|
||||
elif verbose:
|
||||
text = died_modified_date_no_place[name_index][gender][age_units] % value_map
|
||||
else:
|
||||
text = died_modified_date_no_place[2][age_units] % value_map
|
||||
elif ddate_full:
|
||||
if dplace:
|
||||
if dplace and verbose:
|
||||
text = died_full_date_with_place[name_index][gender][age_units] % value_map
|
||||
else:
|
||||
elif dplace:
|
||||
text = died_full_date_with_place[2][age_units] % value_map
|
||||
elif verbose:
|
||||
text = died_full_date_no_place[name_index][gender][age_units] % value_map
|
||||
else:
|
||||
if dplace:
|
||||
text = died_partial_date_with_place[name_index][gender][age_units] % value_map
|
||||
else:
|
||||
text = died_partial_date_no_place[name_index][gender][age_units] % value_map
|
||||
else:
|
||||
if dplace:
|
||||
text = died_no_date_with_place[name_index][gender][age_units] % value_map
|
||||
text = died_full_date_no_place[2][age_units] % value_map
|
||||
else:
|
||||
if dplace and verbose:
|
||||
text = died_partial_date_with_place[name_index][gender][age_units] % value_map
|
||||
elif dplace:
|
||||
text = died_partial_date_with_place[2][age_units] % value_map
|
||||
elif verbose:
|
||||
text = died_partial_date_no_place[name_index][gender][age_units] % value_map
|
||||
else:
|
||||
text = died_partial_date_no_place[2][age_units] % value_map
|
||||
else:
|
||||
if dplace and verbose:
|
||||
text = died_no_date_with_place[name_index][gender][age_units] % value_map
|
||||
elif dplace:
|
||||
text = died_no_date_with_place[2][age_units] % value_map
|
||||
elif verbose:
|
||||
text = died_no_date_no_place[name_index][gender][age_units] % value_map
|
||||
else:
|
||||
text = died_no_date_no_place[2][age_units] % value_map
|
||||
if text:
|
||||
text = text + " "
|
||||
return text
|
||||
@ -2458,3 +2688,4 @@ def get_person_filters(person, include_single=True):
|
||||
the_filters.extend(CustomFilters.get_filters('Person'))
|
||||
return the_filters
|
||||
|
||||
|
||||
|
||||
@ -84,6 +84,7 @@ class DetAncestorReport(Report):
|
||||
blankDate - Whether to replace missing Dates with ___________.
|
||||
calcAgeFlag - Whether to compute age.
|
||||
dupPerson - Whether to omit duplicate ancestors (e.g. when distant cousins mary).
|
||||
verbose - Whether to use complete sentences
|
||||
childRef - Whether to add descendant references in child list.
|
||||
addImages - Whether to include images.
|
||||
pid - The Gramps ID of the center person for the report.
|
||||
@ -102,6 +103,7 @@ class DetAncestorReport(Report):
|
||||
self.blankDate = options_class.handler.options_dict['repdate']
|
||||
self.calcAgeFlag = options_class.handler.options_dict['computeage']
|
||||
self.dupPerson = options_class.handler.options_dict['omitda']
|
||||
self.verbose = options_class.handler.options_dict['verbose']
|
||||
self.childRef = options_class.handler.options_dict['desref']
|
||||
self.addImages = options_class.handler.options_dict['incphotos']
|
||||
self.includeNames = options_class.handler.options_dict['incnames']
|
||||
@ -227,7 +229,11 @@ class DetAncestorReport(Report):
|
||||
# Check birth record
|
||||
|
||||
first = ReportUtils.common_name(person,self.usecall)
|
||||
text = ReportUtils.born_str(self.database,person,first,
|
||||
|
||||
if not self.verbose:
|
||||
self.write_parents(person, first)
|
||||
|
||||
text = ReportUtils.born_str(self.database,person,first,self.verbose,
|
||||
self.EMPTY_DATE,self.EMPTY_PLACE)
|
||||
if text:
|
||||
birth_ref = person.get_birth_ref()
|
||||
@ -239,7 +245,7 @@ class DetAncestorReport(Report):
|
||||
first = 0
|
||||
|
||||
age,units = self.calc_age(person)
|
||||
text = ReportUtils.died_str(self.database,person,first,
|
||||
text = ReportUtils.died_str(self.database,person,first,self.verbose,
|
||||
self.EMPTY_DATE,self.EMPTY_PLACE,age,units)
|
||||
if text:
|
||||
death_ref = person.get_death_ref()
|
||||
@ -257,8 +263,11 @@ class DetAncestorReport(Report):
|
||||
|
||||
first = ReportUtils.common_name(person,self.usecall)
|
||||
|
||||
self.write_parents(person, first)
|
||||
self.write_marriage(person)
|
||||
if self.verbose:
|
||||
self.write_parents(person, first)
|
||||
|
||||
if not key % 2 or key == 1:
|
||||
self.write_marriage(person)
|
||||
self.doc.end_paragraph()
|
||||
|
||||
if key == 1:
|
||||
@ -435,7 +444,7 @@ class DetAncestorReport(Report):
|
||||
|
||||
text = ReportUtils.child_str(person, father_name, mother_name,
|
||||
bool(person.get_death_ref()),
|
||||
firstName)
|
||||
firstName,self.verbose)
|
||||
if text:
|
||||
self.doc.write_text(text)
|
||||
if father_mark:
|
||||
@ -456,6 +465,7 @@ class DetAncestorReport(Report):
|
||||
spouse_mark = ReportUtils.get_person_mark(self.database, spouse)
|
||||
|
||||
text = ReportUtils.married_str(self.database,person,family,
|
||||
self.verbose,
|
||||
self.endnotes,
|
||||
self.EMPTY_DATE,self.EMPTY_PLACE,
|
||||
is_first)
|
||||
@ -488,8 +498,8 @@ class DetAncestorReport(Report):
|
||||
self.doc.start_paragraph("DAR-ChildTitle")
|
||||
self.doc.write_text(
|
||||
_("Children of %(mother_name)s and %(father_name)s") %
|
||||
{'mother_name': mother_name,
|
||||
'father_name': father_name} )
|
||||
{'father_name': father_name,
|
||||
'mother_name': mother_name} )
|
||||
self.doc.end_paragraph()
|
||||
|
||||
cnt = 1
|
||||
@ -507,10 +517,12 @@ class DetAncestorReport(Report):
|
||||
cnt += 1
|
||||
|
||||
self.doc.write_text("%s. " % child_name,child_mark)
|
||||
self.doc.write_text(ReportUtils.born_str(self.database, child, 0,
|
||||
self.EMPTY_DATE, self.EMPTY_PLACE))
|
||||
self.doc.write_text(ReportUtils.died_str(self.database, child, 0,
|
||||
self.EMPTY_DATE, self.EMPTY_PLACE))
|
||||
self.doc.write_text(
|
||||
ReportUtils.born_str(self.database, child, 0,
|
||||
self.verbose, self.EMPTY_DATE, self.EMPTY_PLACE))
|
||||
self.doc.write_text(
|
||||
ReportUtils.died_str(self.database, child, 0,
|
||||
self.verbose, self.EMPTY_DATE, self.EMPTY_PLACE))
|
||||
|
||||
self.doc.end_paragraph()
|
||||
|
||||
@ -588,16 +600,18 @@ class DetAncestorReport(Report):
|
||||
self.doc.start_paragraph("DAR-Entry")
|
||||
|
||||
self.doc.write_text(person_name,person_key)
|
||||
self.doc.write_text(". ")
|
||||
|
||||
text = ReportUtils.born_str(self.database,ind,print_name,
|
||||
self.EMPTY_DATE,self.EMPTY_PLACE)
|
||||
self.verbose, self.EMPTY_DATE,self.EMPTY_PLACE)
|
||||
if text:
|
||||
self.doc.write_text(text)
|
||||
print_name = 0;
|
||||
|
||||
age,units = self.calc_age(ind)
|
||||
text = ReportUtils.died_str(self.database,ind,print_name,
|
||||
self.EMPTY_DATE,self.EMPTY_PLACE,age,units)
|
||||
self.verbose, self.EMPTY_DATE,self.EMPTY_PLACE,
|
||||
age,units)
|
||||
if text:
|
||||
self.doc.write_text(text)
|
||||
print_name = 0;
|
||||
@ -701,6 +715,11 @@ class DetAncestorOptions(MenuReportOptions):
|
||||
omitda.set_help(_("Whether to omit duplicate ancestors."))
|
||||
menu.add_option(category_name,"omitda",omitda)
|
||||
|
||||
verbose = BooleanOption(_("Use Complete Sentences"),True)
|
||||
verbose.set_help(
|
||||
_("Whether to use complete sentences or succinct language."))
|
||||
menu.add_option(category_name,"verbose",verbose)
|
||||
|
||||
desref = BooleanOption(_("Add descendant reference in child list"),True)
|
||||
desref.set_help(
|
||||
_("Whether to add descendant references in child list."))
|
||||
|
||||
@ -87,6 +87,7 @@ class DetDescendantReport(Report):
|
||||
blankDate - Whether to replace missing Dates with ___________.
|
||||
calcAgeFlag - Whether to compute age.
|
||||
dupPerson - Whether to omit duplicate ancestors (e.g. when distant cousins mary).
|
||||
verbose - Whether to use complete sentences
|
||||
childRef - Whether to add descendant references in child list.
|
||||
addImages - Whether to include images.
|
||||
pid - The Gramps ID of the center person for the report.
|
||||
@ -105,6 +106,7 @@ class DetDescendantReport(Report):
|
||||
self.blankDate = options_class.handler.options_dict['repdate']
|
||||
self.calcAgeFlag = options_class.handler.options_dict['computeage']
|
||||
self.dupPerson = options_class.handler.options_dict['omitda']
|
||||
self.verbose = options_class.handler.options_dict['verbose']
|
||||
self.childRef = options_class.handler.options_dict['desref']
|
||||
self.addImages = options_class.handler.options_dict['incphotos']
|
||||
self.includeNames = options_class.handler.options_dict['incnames']
|
||||
@ -346,7 +348,7 @@ class DetDescendantReport(Report):
|
||||
|
||||
text = ReportUtils.child_str(person, father_name, mother_name,
|
||||
bool(person.get_death_ref()),
|
||||
firstName)
|
||||
firstName,self.verbose)
|
||||
if text:
|
||||
self.doc.write_text(text)
|
||||
if father_mark:
|
||||
@ -367,6 +369,7 @@ class DetDescendantReport(Report):
|
||||
spouse_mark = ReportUtils.get_person_mark(self.database, spouse)
|
||||
|
||||
text = ReportUtils.married_str(self.database,person,family,
|
||||
self.verbose,
|
||||
self.endnotes,
|
||||
self.EMPTY_DATE,self.EMPTY_PLACE,
|
||||
is_first)
|
||||
@ -399,8 +402,9 @@ class DetDescendantReport(Report):
|
||||
self.doc.start_paragraph("DDR-ChildTitle")
|
||||
self.doc.write_text(
|
||||
_("Children of %(mother_name)s and %(father_name)s") %
|
||||
{'mother_name': mother_name,
|
||||
'father_name': father_name} )
|
||||
{'father_name': father_name,
|
||||
'mother_name': mother_name
|
||||
} )
|
||||
self.doc.end_paragraph()
|
||||
|
||||
cnt = 1
|
||||
@ -425,10 +429,10 @@ class DetDescendantReport(Report):
|
||||
else:
|
||||
self.doc.write_text("%s. " % child_name,child_mark)
|
||||
|
||||
self.doc.write_text(ReportUtils.born_str(
|
||||
self.database, child, 0, self.EMPTY_DATE, self.EMPTY_PLACE))
|
||||
self.doc.write_text(ReportUtils.died_str(
|
||||
self.database, child, 0, self.EMPTY_DATE, self.EMPTY_PLACE))
|
||||
self.doc.write_text(ReportUtils.born_str( self.database, child, 0,
|
||||
self.verbose, self.EMPTY_DATE, self.EMPTY_PLACE))
|
||||
self.doc.write_text(ReportUtils.died_str( self.database, child, 0,
|
||||
self.verbose, self.EMPTY_DATE, self.EMPTY_PLACE))
|
||||
self.doc.end_paragraph()
|
||||
|
||||
def write_family_events(self,family):
|
||||
@ -473,7 +477,11 @@ class DetDescendantReport(Report):
|
||||
self.doc.start_paragraph("DDR-Entry")
|
||||
# Check birth record
|
||||
first = ReportUtils.common_name(person,self.usecall)
|
||||
text = ReportUtils.born_str(self.database,person,first,
|
||||
|
||||
if not self.verbose:
|
||||
self.write_parents(person, first)
|
||||
|
||||
text = ReportUtils.born_str(self.database,person,first, self.verbose,
|
||||
self.EMPTY_DATE,self.EMPTY_PLACE)
|
||||
if text:
|
||||
birth_ref = person.get_birth_ref()
|
||||
@ -485,7 +493,7 @@ class DetDescendantReport(Report):
|
||||
first = 0
|
||||
|
||||
age,units = self.calc_age(person)
|
||||
text = ReportUtils.died_str(self.database,person,first,
|
||||
text = ReportUtils.died_str(self.database,person,first,self.verbose,
|
||||
self.EMPTY_DATE,self.EMPTY_PLACE,age,units)
|
||||
if text:
|
||||
death_ref = person.get_death_ref()
|
||||
@ -503,7 +511,8 @@ class DetDescendantReport(Report):
|
||||
|
||||
first = ReportUtils.common_name(person,self.usecall)
|
||||
|
||||
self.write_parents(person, first)
|
||||
if self.verbose:
|
||||
self.write_parents(person, first)
|
||||
self.write_marriage(person)
|
||||
self.doc.end_paragraph()
|
||||
|
||||
@ -667,6 +676,11 @@ class DetDescendantOptions(MenuReportOptions):
|
||||
omitda.set_help(_("Whether to omit duplicate ancestors."))
|
||||
menu.add_option(category_name,"omitda",omitda)
|
||||
|
||||
verbose = BooleanOption(_("Use Complete Sentences"),True)
|
||||
verbose.set_help(
|
||||
_("Whether to use complete sentences or succinct language."))
|
||||
menu.add_option(category_name,"verbose",verbose)
|
||||
|
||||
desref = BooleanOption(_("Add descendant reference in child list"),True)
|
||||
desref.set_help(
|
||||
_("Whether to add descendant references in child list."))
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user