Merge some changes from #3530

author: Greg Roach <greg@subaqua.co.uk> 2021-02-07 17:24:58 +0000
committer: Greg Roach <greg@subaqua.co.uk> 2021-02-07 21:56:58 +0000
commit: b56fa9dd6a5e9075de5337fd34748412e9e559a7 (patch)
tree: 2552f12a68776282bf4c47503062ce31d9468a82 /resources
parent: c775048cc6cab830cc839789b27d653f48ee0cff (diff)
download: webtrees-b56fa9dd6a5e9075de5337fd34748412e9e559a7.tar.gz
webtrees-b56fa9dd6a5e9075de5337fd34748412e9e559a7.tar.bz2
webtrees-b56fa9dd6a5e9075de5337fd34748412e9e559a7.zip
4 files changed, 44 insertions, 28 deletions
diff --git a/resources/xml/reports/ahnentafel_report.xml b/resources/xml/reports/ahnentafel_report.xml
index ffb0e04329..c3d76c484b 100644
--- a/resources/xml/reports/ahnentafel_report.xml
+++ b/resources/xml/reports/ahnentafel_report.xml
@@ -52,7 +52,7 @@
 
 	<Doc pageSize="$pageSize">
 		<Header>
-			<Cell align="center" height="30" newline="1" style="header"><var var="I18N::translate('Ancestors of ')" /><GetPersonName id="$pid" /></Cell>
+			<Cell style="header" align="center" height="30" newline="1"><var var="I18N::translate('Ancestors of ')" /><GetPersonName id="$pid" /></Cell>
 			<Cell align="rightrtl" newline="1" style="pagenum"><var var="I18N::translate('Page')" /> <PageNum /> <var var="I18N::translate('of')" /> <TotalPages /></Cell>
 		</Header>
 		<Body>
@@ -105,7 +105,7 @@
 					</TextBox>
 					<!-- Sentence 1 Individual, name... -->
 					<TextBox height="12" newline="1">
-						<Text style="name"><GetPersonName id="" /> </Text>
+						<Text style="name"><GetPersonName id="" /></Text>
 						<if condition="$sources=='on'">
 							<!-- print level 1 sources -->
 							<RepeatTag tag="SOUR">
@@ -134,6 +134,7 @@
 								<SetVar name="source_exist" value="1" />
 							</RepeatTag>
 						</if>
+						<Text style="name">  </Text>
 						<!-- Individual, birth... -->
 						<Gedcom id="BIRT">
 							<Text style="text">
@@ -419,7 +420,7 @@
 											<if condition="$familyChildNumber==20"><SetVar name="familyChildRoman" value="xx" /></if>
 											<TextBox left="25" height="20" newline="1">
 												<Text style="label1"><var var="familyChildRoman" /></Text>
-												<Text style="namech">  <GetPersonName id="" /> </Text>
+												<Text style="namech">  <GetPersonName id="" /></Text>
 												<if condition="$sources=='on'">
 													<RepeatTag tag="SOUR">
 														<Footnote>
diff --git a/resources/xml/reports/individual_ext_report.xml b/resources/xml/reports/individual_ext_report.xml
index 15a03617e9..7a2db775d3 100644
--- a/resources/xml/reports/individual_ext_report.xml
+++ b/resources/xml/reports/individual_ext_report.xml
@@ -86,9 +86,17 @@
 		<SetVar name="width2" value="0"/>
 	</if>
 
+	<if condition="$relatives=='child-family'"><SetVar name="explain" value="I18N::translate('Parents and siblings')"/></if>
+	<if condition="$relatives=='spouse-family'"><SetVar name="explain" value="I18N::translate('Spouses and children')"/></if>
+	<if condition="$relatives=='direct-ancestors'"><SetVar name="explain" value="I18N::translate('Direct line ancestors')"/></if>
+	<if condition="$relatives=='ancestors'"><SetVar name="explain" value="I18N::translate('Direct line ancestors and their families')"/></if>
+	<if condition="$relatives=='descendants'"><SetVar name="explain" value="I18N::translate('Descendants')"/></if>
+	<if condition="$relatives=='all'"><SetVar name="explain" value="I18N::translate('All')"/></if>
+
+
 	<Doc pageSize="$pageSize">
 		<Header>
-			<Cell align="center" newline="1" style="header"><var var="I18N::translate('Related families')"/></Cell>
+			<Cell align="center" newline="1" style="header"><GetPersonName id="$pid" /> — <var var="$explain"/></Cell>
 			<Cell align="rightrtl" newline="1" style="pagenum"><var var="I18N::translate('Page')"/> <PageNum/> / <TotalPages/></Cell>
 		</Header>
 
@@ -103,7 +111,7 @@
 				<SetVar name="mid" value="@ID"/>
 				<!-- Individual name -->
 				<TextBox newline="1">
-					<Text style="pageheader"><GetPersonName id=""/> </Text>
+					<Text style="pageheader"><GetPersonName id=""/></Text>
 					<if condition="$sources=='on'">
 						<!-- print level 1 sources -->
 						<RepeatTag tag="SOUR">
@@ -241,7 +249,7 @@
 						<Gedcom id="@HUSB">
 							<TextBox bgcolor="$mbgcolor" border="1" newline="1" width="$width">
 								<Text color="$tcolor" style="text"><var var="I18N::translate('Father')"/>  </Text>
-								<Text color="$tcolor" style="name"><GetPersonName id=""/> </Text>
+								<Text color="$tcolor" style="name"><GetPersonName id=""/></Text>
 								<if condition="$sources=='on'">
 									<!-- print level 1 sources -->
 									<RepeatTag tag="SOUR">
@@ -270,14 +278,14 @@
 										<SetVar name="source_exist" value="1" />
 									</RepeatTag>
 								</if>
-								<Text color="$tcolor" style="text"> (<var var="I18N::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="I18N::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text>
+								<Text color="$tcolor" style="text">  (<var var="I18N::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="I18N::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text>
 							</TextBox>
 						</Gedcom>
 						<!-- mother -->
 						<Gedcom id="@WIFE">
 							<TextBox bgcolor="$fbgcolor" border="1" newline="1" width="$width">
 								<Text color="$tcolor" style="text"><var var="I18N::translate('Mother')"/>  </Text>
-								<Text color="$tcolor" style="name"><GetPersonName id=""/> </Text>
+								<Text color="$tcolor" style="name"><GetPersonName id=""/></Text>
 								<if condition="$sources=='on'">
 									<!-- print level 1 sources -->
 									<RepeatTag tag="SOUR">
@@ -306,7 +314,7 @@
 										<SetVar name="source_exist" value="1" />
 									</RepeatTag>
 								</if>
-								<Text color="$tcolor" style="text"> (<var var="I18N::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="I18N::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text>
+								<Text color="$tcolor" style="text">  (<var var="I18N::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="I18N::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text>
 							</TextBox>
 						</Gedcom>
 						<!-- siblings -->
@@ -317,7 +325,7 @@
 								<if condition="@SEX=='M'">
 									<TextBox bgcolor="$mbgcolor" border="1" left="15" newline="1" width="$width1">
 										<Text color="$tcolor" style="text"><var var="I18N::translate('Brother')"/>  </Text>
-										<Text color="$tcolor" style="name"><GetPersonName id=""/> </Text>
+										<Text color="$tcolor" style="name"><GetPersonName id=""/></Text>
 										<if condition="$sources=='on'">
 											<!-- print level 1 sources -->
 											<RepeatTag tag="SOUR">
@@ -346,14 +354,14 @@
 												<SetVar name="source_exist" value="1" />
 											</RepeatTag>
 										</if>
-										<Text color="$tcolor" style="text"> (<var var="I18N::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="I18N::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text>
+										<Text color="$tcolor" style="text">  (<var var="I18N::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="I18N::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text>
 									</TextBox>
 								</if>
 								<!-- Sister -->
 								<if condition="@SEX=='F'">
 									<TextBox bgcolor="$fbgcolor" border="1" left="15" newline="1" width="$width1">
 										<Text color="$tcolor" style="text"><var var="I18N::translate('Sister')"/>  </Text>
-										<Text color="$tcolor" style="name"><GetPersonName id=""/> </Text>
+										<Text color="$tcolor" style="name"><GetPersonName id=""/></Text>
 										<if condition="$sources=='on'">
 											<!-- print level 1 sources -->
 											<RepeatTag tag="SOUR">
@@ -382,14 +390,14 @@
 												<SetVar name="source_exist" value="1" />
 											</RepeatTag>
 										</if>
-										<Text color="$tcolor" style="text"> (<var var="I18N::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="I18N::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text>
+										<Text color="$tcolor" style="text">  (<var var="I18N::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="I18N::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text>
 									</TextBox>
 								</if>
 								<!-- Unknown gender for Sibling -->
 								<if condition="@SEX=='U'">
 									<TextBox bgcolor="$ugbgcolor" border="1" left="15" newline="1" width="$width1">
 										<Text color="$tcolor" style="text"><var var="I18N::translate('Gender')"/> <var var="I18N::translateContext('unknown gender', 'Unknown')"/>  </Text>
-										<Text color="$tcolor" style="name"><GetPersonName id=""/> </Text>
+										<Text color="$tcolor" style="name"><GetPersonName id=""/></Text>
 										<if condition="$sources=='on'">
 											<!-- print level 1 sources -->
 											<RepeatTag tag="SOUR">
@@ -418,7 +426,7 @@
 												<SetVar name="source_exist" value="1" />
 											</RepeatTag>
 										</if>
-										<Text color="$tcolor" style="text"> (<var var="I18N::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="I18N::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text>
+										<Text color="$tcolor" style="text">  (<var var="I18N::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="I18N::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text>
 									</TextBox>
 								</if>
 							</Gedcom>
@@ -447,7 +455,7 @@
 							<if condition="@SEX!='F'">
 								<TextBox bgcolor="$mbgcolor" border="1" newline="1" width="$width">
 									<Text color="$tcolor" style="text"><var var="I18N::translate('Husband')"/>  </Text>
-									<Text color="$tcolor" style="name"><GetPersonName id=""/> </Text>
+									<Text color="$tcolor" style="name"><GetPersonName id=""/></Text>
 									<if condition="$sources=='on'">
 										<!-- print level 1 sources -->
 										<RepeatTag tag="SOUR">
@@ -476,14 +484,14 @@
 											<SetVar name="source_exist" value="1" />
 										</RepeatTag>
 									</if>
-									<Text color="$tcolor" style="text"> (<var var="I18N::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="I18N::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text>
+									<Text color="$tcolor" style="text">  (<var var="I18N::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="I18N::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text>
 								</TextBox>
 							</if>
 							<!-- wife -->
 							<if condition="@SEX=='F'">
 								<TextBox bgcolor="$fbgcolor" border="1" newline="1" width="$width">
 									<Text color="$tcolor" style="text"><var var="I18N::translate('Wife')"/>  </Text>
-									<Text color="$tcolor" style="name"><GetPersonName id=""/> </Text>
+									<Text color="$tcolor" style="name"><GetPersonName id=""/></Text>
 									<if condition="$sources=='on'">
 										<!-- print level 1 sources -->
 										<RepeatTag tag="SOUR">
@@ -512,7 +520,7 @@
 											<SetVar name="source_exist" value="1" />
 										</RepeatTag>
 									</if>
-									<Text color="$tcolor" style="text"> (<var var="I18N::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="I18N::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text>
+									<Text color="$tcolor" style="text">  (<var var="I18N::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="I18N::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text>
 								</TextBox>
 							</if>
 						</Gedcom>
@@ -524,7 +532,7 @@
 								<if condition="@SEX=='M'">
 									<TextBox bgcolor="$mbgcolor" border="1" left="15" newline="1" width="$width1">
 										<Text color="$tcolor" style="text"><var var="I18N::translate('Son')"/>  </Text>
-										<Text color="$tcolor" style="name"><GetPersonName id=""/> </Text>
+										<Text color="$tcolor" style="name"><GetPersonName id=""/></Text>
 										<if condition="$sources=='on'">
 											<!-- print level 1 sources -->
 											<RepeatTag tag="SOUR">
@@ -553,14 +561,14 @@
 												<SetVar name="source_exist" value="1" />
 											</RepeatTag>
 										</if>
-										<Text color="$tcolor" style="text"> (<var var="I18N::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="I18N::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text>
+										<Text color="$tcolor" style="text">  (<var var="I18N::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="I18N::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text>
 									</TextBox>
 								</if>
 								<!-- Daughter -->
 								<if condition="@SEX=='F'">
 									<TextBox bgcolor="$fbgcolor" border="1" left="15" newline="1" width="$width1">
 										<Text color="$tcolor" style="text"><var var="I18N::translate('Daughter')"/>  </Text>
-										<Text color="$tcolor" style="name"><GetPersonName id=""/> </Text>
+										<Text color="$tcolor" style="name"><GetPersonName id=""/></Text>
 										<if condition="$sources=='on'">
 											<!-- print level 1 sources -->
 											<RepeatTag tag="SOUR">
@@ -589,14 +597,14 @@
 												<SetVar name="source_exist" value="1" />
 											</RepeatTag>
 										</if>
-										<Text color="$tcolor" style="text"> (<var var="I18N::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="I18N::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text>
+										<Text color="$tcolor" style="text">  (<var var="I18N::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="I18N::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text>
 									</TextBox>
 								</if>
 								<!-- Unknown gender for Child -->
 								<if condition="@SEX=='U'">
 									<TextBox bgcolor="$ugbgcolor" border="1" left="15" newline="1" width="$width1">
 										<Text color="$tcolor" style="text"><var var="I18N::translate('Gender')"/> <var var="I18N::translateContext('unknown gender', 'Unknown')"/>  </Text>
-										<Text color="$tcolor" style="name"><GetPersonName id=""/> </Text>
+										<Text color="$tcolor" style="name"><GetPersonName id=""/></Text>
 										<if condition="$sources=='on'">
 											<!-- print level 1 sources -->
 											<RepeatTag tag="SOUR">
@@ -625,7 +633,7 @@
 												<SetVar name="source_exist" value="1" />
 											</RepeatTag>
 										</if>
-										<Text color="$tcolor" style="text"> (<var var="I18N::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="I18N::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text>
+										<Text color="$tcolor" style="text">  (<var var="I18N::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="I18N::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text>
 									</TextBox>
 								</if>
 							</Gedcom>
diff --git a/resources/xml/reports/pedigree_report.xml b/resources/xml/reports/pedigree_report.xml
index fb04c8eb85..5b36ab8143 100644
--- a/resources/xml/reports/pedigree_report.xml
+++ b/resources/xml/reports/pedigree_report.xml
@@ -45,7 +45,7 @@
 
 		<Doc pageSize="$pageSize" leftmargin="1" rightmargin="1">
 			<Header>
-				<Cell height="20" newline="1" left="20" style="header"><var var="I18N::translate('Pedigree')" /></Cell>
+				<Cell height="20" newline="1" left="20" style="header"><var var="I18N::translate('Pedigree')" /> — <GetPersonName id="$pid" /></Cell>
 				<Cell align="rightrtl" height="10" newline="1" style="date"><Now /></Cell>
 			</Header>
 			<Body>
@@ -747,7 +747,7 @@
 
 		<Doc pageSize="$pageSize" orientation="landscape" leftmargin="1" rightmargin="1" topmargin="65">
 			<Header>
-				<Cell height="20" newline="1" left="20" style="header"><var var="I18N::translate('Pedigree chart')" /></Cell>
+				<Cell height="20" newline="1" left="20" style="header"><var var="I18N::translate('Pedigree chart')" /> — <GetPersonName id="$pid" /></Cell>
 				<Cell align="rightrtl" height="10" newline="1" style="date"><Now /></Cell>
 			</Header>
 			<Body>
diff --git a/resources/xml/reports/relative_ext_report.xml b/resources/xml/reports/relative_ext_report.xml
index b6d88e2bd3..c5a4922bb2 100644
--- a/resources/xml/reports/relative_ext_report.xml
+++ b/resources/xml/reports/relative_ext_report.xml
@@ -38,9 +38,16 @@
 	<SetVar name="widthB4" value="375" />
 	<SetVar name="leftbdp" value="$width1+$width2" />
 
+	<if condition="$relatives=='child-family'"><SetVar name="explain" value="I18N::translate('Parents and siblings')"/></if>
+	<if condition="$relatives=='spouse-family'"><SetVar name="explain" value="I18N::translate('Spouses and children')"/></if>
+	<if condition="$relatives=='direct-ancestors'"><SetVar name="explain" value="I18N::translate('Direct line ancestors')"/></if>
+	<if condition="$relatives=='ancestors'"><SetVar name="explain" value="I18N::translate('Direct line ancestors and their families')"/></if>
+	<if condition="$relatives=='descendants'"><SetVar name="explain" value="I18N::translate('Descendants')"/></if>
+	<if condition="$relatives=='all'"><SetVar name="explain" value="I18N::translate('All')"/></if>
+
 	<Doc pageSize="$pageSize" orientation="landscape">
 		<Header>
-			<Cell align="center" height="20" newline="1" style="header"><var var="I18N::translate('Related individuals')" /></Cell>
+			<Cell align="center" height="20" newline="1" style="header"><GetPersonName id="$pid" /> — <var var="$explain"/></Cell>
 			<Cell align="rightrtl" newline="1" style="pagenum"><var var="I18N::translate('Page')" /> <PageNum /> <var var="I18N::translate('of')" /> <TotalPages /></Cell>
 
 			<SetVar name="fill" value="" />
author	Greg Roach <greg@subaqua.co.uk>	2021-02-07 17:24:58 +0000
committer	Greg Roach <greg@subaqua.co.uk>	2021-02-07 21:56:58 +0000
commit	b56fa9dd6a5e9075de5337fd34748412e9e559a7 (patch)
tree	2552f12a68776282bf4c47503062ce31d9468a82 /resources
parent	c775048cc6cab830cc839789b27d653f48ee0cff (diff)
download	webtrees-b56fa9dd6a5e9075de5337fd34748412e9e559a7.tar.gz webtrees-b56fa9dd6a5e9075de5337fd34748412e9e559a7.tar.bz2 webtrees-b56fa9dd6a5e9075de5337fd34748412e9e559a7.zip