summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--includes/config_data.php2
-rw-r--r--modules/address_label_report/report.xml8
-rw-r--r--modules/address_report/report.xml8
-rw-r--r--modules/ahnentafel_report/report.xml6
-rw-r--r--modules/bdm_report/report.xml6
-rw-r--r--modules/birth_report/report.xml6
-rw-r--r--modules/cemetery_report/report.xml8
-rw-r--r--modules/change_report/report.xml10
-rw-r--r--modules/death_report/report.xml8
-rw-r--r--modules/descendancy_report/report.xml6
-rw-r--r--modules/family_group_report/report.xml4
-rw-r--r--modules/individual_ext_report/report.xml12
-rw-r--r--modules/individual_report/report.xml6
-rw-r--r--modules/marriage_report/report.xml6
-rw-r--r--modules/missing_facts_report/report.xml8
-rw-r--r--modules/pedigree_report/report_landscape.xml4
-rw-r--r--modules/pedigree_report/report_portrait.xml4
-rw-r--r--modules/relative_ext_report/report.xml8
-rw-r--r--modules/relative_report/report.xml10
-rw-r--r--modules/source_report/report.xml6
-rw-r--r--reportengine.php10
21 files changed, 75 insertions, 71 deletions
diff --git a/includes/config_data.php b/includes/config_data.php
index bee4899e96..511a0dd013 100644
--- a/includes/config_data.php
+++ b/includes/config_data.php
@@ -1203,7 +1203,7 @@ $FACTS=array(
'MARC'=>i18n::translate('Marriage Contract'),
'MARL'=>i18n::translate('Marriage Licence'),
'MARR'=>i18n::translate('Marriage'),
- 'MARR:'=>i18n::translate('Date of Marriage'),
+ 'MARR:DATE'=>i18n::translate('Date of Marriage'),
'MARR:PLAC'=>i18n::translate('Place of Marriage'),
'MARR:SOUR'=>i18n::translate('Source for Marriage'),
'MARR_CIVIL'=>i18n::translate('Civil Marriage'),
diff --git a/modules/address_label_report/report.xml b/modules/address_label_report/report.xml
index b64c0f6c56..39d7ce9a0a 100644
--- a/modules/address_label_report/report.xml
+++ b/modules/address_label_report/report.xml
@@ -4,10 +4,10 @@
<PGVRDescription>Prints address labels</PGVRDescription>
<PGVRTitle><PGVRvar var="i18n::translate('Address Labels')" /></PGVRTitle>
<PGVRInput name="address" type="text"><PGVRvar var="i18n::translate('Show addresses that contain:')" /> </PGVRInput>
- <PGVRInput name="sortby" type="select" options="NAME,ID"><PGVRvar var="i18n::translate('Sort by')" /></PGVRInput>
- <PGVRInput name="email_in" type="select" options="all,noemail,onlyemail"><PGVRvar var="i18n::translate('Include:')"/> </PGVRInput>
- <PGVRInput name="pageSize" type="select" default="A4" options="letter,A3,A4,legal"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
- <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0,dejavusans,helvetica"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
+ <PGVRInput name="sortby" type="select" options="NAME=>i18n::translate('Name')|ID=>i18n::translate('ID number')"><PGVRvar var="i18n::translate('Sort by')" /></PGVRInput>
+ <PGVRInput name="email_in" type="select" options="all=>i18n::translate('All addresses')|noemail=>i18n::translate('Addresses without emails')|onlyemail=>i18n::translate('Only addresses with emails')"><PGVRvar var="i18n::translate('Include:')"/> </PGVRInput>
+ <PGVRInput name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
+ <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
<PGVRStyle name="header" font="$fonts" size="16" style="b" />
<PGVRStyle name="pagenum" font="$fonts" size="8" style="" />
<PGVRStyle name="text" font="$fonts" size="8" style="" />
diff --git a/modules/address_report/report.xml b/modules/address_report/report.xml
index dae0b1058d..3c2ed7b353 100644
--- a/modules/address_report/report.xml
+++ b/modules/address_report/report.xml
@@ -4,10 +4,10 @@
<PGVRDescription>Prints a list of addresses</PGVRDescription>
<PGVRTitle><PGVRvar var="i18n::translate('Address List')" /></PGVRTitle>
<PGVRInput name="address" type="text"><PGVRvar var="i18n::translate('Show addresses that contain:')" /> </PGVRInput>
- <PGVRInput name="sortby" type="select" options="NAME,ID"><PGVRvar var="i18n::translate('Sort by')" /></PGVRInput>
- <PGVRInput name="email_in" type="select" options="all,noemail,onlyemail"><PGVRvar var="i18n::translate('Include:')"/> </PGVRInput>
- <PGVRInput name="pageSize" type="select" default="A4" options="letter,A3,A4,legal"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
- <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0,dejavusans,helvetica"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
+ <PGVRInput name="sortby" type="select" options="NAME=>i18n::translate('Name')|ID=>i18n::translate('ID number')"><PGVRvar var="i18n::translate('Sort by')" /></PGVRInput>
+ <PGVRInput name="email_in" type="select" options="all=>i18n::translate('All addresses')|noemail=>i18n::translate('Addresses without emails')|onlyemail=>i18n::translate('Only addresses with emails')"><PGVRvar var="i18n::translate('Include:')"/> </PGVRInput>
+ <PGVRInput name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
+ <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
<!-- Header -->
<PGVRStyle name="header" font="$fonts" size="16" style="b" />
diff --git a/modules/ahnentafel_report/report.xml b/modules/ahnentafel_report/report.xml
index 5b1f99ab89..9a7f02270c 100644
--- a/modules/ahnentafel_report/report.xml
+++ b/modules/ahnentafel_report/report.xml
@@ -4,11 +4,11 @@
<PGVRTitle><PGVRvar var="i18n::translate('Ahnentafel Report')" /></PGVRTitle>
<PGVRDescription>Prints an Ahnentafel report for the selected individual</PGVRDescription>
<PGVRInput name="pid" lookup="INDI" type="text"><PGVRvar var="i18n::translate('Enter Individual ID')" /></PGVRInput>
- <PGVRInput name="maxgen" type="select" options="3,4,5,6,7,8,9,*"><PGVRvar var="i18n::translate('Generations')" /></PGVRInput>
+ <PGVRInput name="maxgen" type="select" options="3=>3|4=>4|5=>5|6=>6|7=>7|8=>8|9=>9|*=>*"><PGVRvar var="i18n::translate('Generations')" /></PGVRInput>
<PGVRInput name="sources" type="checkbox" default="1"><PGVRvar var="i18n::translate('Show sources?')" /></PGVRInput>
<PGVRInput name="notes" type="checkbox" default="1"><PGVRvar var="i18n::translate('Show notes?')" /></PGVRInput>
- <PGVRInput name="pageSize" type="select" default="A4" options="letter,A3,A4,legal"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
- <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0,dejavusans,helvetica"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
+ <PGVRInput name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
+ <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
<!-- Header -->
<PGVRStyle name="header" font="$fonts" size="14" style="b" />
diff --git a/modules/bdm_report/report.xml b/modules/bdm_report/report.xml
index a16df6ab66..ab0afc7564 100644
--- a/modules/bdm_report/report.xml
+++ b/modules/bdm_report/report.xml
@@ -13,9 +13,9 @@
<PGVRInput name="birthdate2" lookup="DATE" type="text"><PGVRvar var="i18n::translate('Birth Date range end')" /></PGVRInput>
<PGVRInput name="deathdate1" lookup="DATE" type="text"><PGVRvar var="i18n::translate('Death Date range start')" /></PGVRInput>
<PGVRInput name="deathdate2" lookup="DATE" type="text"><PGVRvar var="i18n::translate('Death Date range end')" /></PGVRInput>
- <PGVRInput name="sortby" type="select" default="BIRT:DATE" options="ID,NAME,BIRT:DATE,DEAT:DATE"><PGVRvar var="i18n::translate('Sort by')" /></PGVRInput>
- <PGVRInput name="pageSize" type="select" default="A4" options="letter,A3,A4,legal"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
- <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0,dejavusans,helvetica"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
+ <PGVRInput name="sortby" type="select" default="BIRT:DATE" options="ID=>i18n::translate('ID number')|NAME=>i18n::translate('Name')|BIRT:DATE=>i18n::translate('Date of birth')|DEAT:DATE=>i18n::translate('Date of death')"><PGVRvar var="i18n::translate('Sort by')" /></PGVRInput>
+ <PGVRInput name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
+ <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
<!-- Header -->
<PGVRStyle name="header" font="$fonts" size="15" style="b" />
diff --git a/modules/birth_report/report.xml b/modules/birth_report/report.xml
index d00fb20110..bb77bf0704 100644
--- a/modules/birth_report/report.xml
+++ b/modules/birth_report/report.xml
@@ -7,9 +7,9 @@
<PGVRInput name="birthplace" lookup="PLAC" type="text"><PGVRvar var="i18n::translate('Birth Place contains')" /></PGVRInput>
<PGVRInput name="birthdate1" lookup="DATE" type="text"><PGVRvar var="i18n::translate('Birth Date range start')" /></PGVRInput>
<PGVRInput name="birthdate2" lookup="DATE" type="text"><PGVRvar var="i18n::translate('Birth Date range end')" /></PGVRInput>
- <PGVRInput name="sortby" type="select" default="NAME" options="none,ID,NAME,BIRT:DATE"><PGVRvar var="i18n::translate('Sort by')" /></PGVRInput>
- <PGVRInput name="pageSize" type="select" default="A4" options="letter,A3,A4,legal"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
- <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0,dejavusans,helvetica"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
+ <PGVRInput name="sortby" type="select" default="NAME" options="none=>i18n::translate('None')|ID=>i18n::translate('ID number')|NAME=>i18n::translate('Name')|BIRT:DATE=>i18n::translate('Date of birth')"><PGVRvar var="i18n::translate('Sort by')" /></PGVRInput>
+ <PGVRInput name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
+ <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
<!-- Header -->
<PGVRStyle name="header" font="$fonts" size="16" style="b"/>
diff --git a/modules/cemetery_report/report.xml b/modules/cemetery_report/report.xml
index 9ebabbf6d4..ddabea19c2 100644
--- a/modules/cemetery_report/report.xml
+++ b/modules/cemetery_report/report.xml
@@ -4,10 +4,10 @@
<PGVRTitle><PGVRvar var="i18n::translate('Cemetery Report')" /></PGVRTitle>
<PGVRDescription>Prints a list of individuals burial places matching specific cemetery criteria</PGVRDescription>
<PGVRInput name="deathplace" lookup="PLAC" type="text"><PGVRvar var="i18n::translate('Burial Place contains')" /> </PGVRInput>
- <PGVRInput name="sortby" type="select" default="NAME" options="none,ID,NAME,DEAT:DATE"><PGVRvar var="i18n::translate('Sort by')" /></PGVRInput>
- <PGVRInput name="adlist" type="select" default="none" options="none,_MARNM,HUSB"><PGVRvar var="i18n::translate('Name List')" /></PGVRInput>
- <PGVRInput name="pageSize" type="select" default="A4" options="letter,A3,A4,legal"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
- <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0,dejavusans,helvetica"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
+ <PGVRInput name="sortby" type="select" default="NAME" options="none=>i18n::translate('None')|ID=>i18n::translate('ID number')|NAME=>i18n::translate('Name')|DEAT:DATE=>i18n::translate('Date of death')"><PGVRvar var="i18n::translate('Sort by')" /></PGVRInput>
+ <PGVRInput name="adlist" type="select" default="none" options="none=>i18n::translate('None')|_MARNM=>i18n::translate('Married Name')|HUSB=>i18n::translate('Husband')"><PGVRvar var="i18n::translate('Name List')" /></PGVRInput>
+ <PGVRInput name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
+ <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
<!-- Header -->
<PGVRStyle name="header" font="$fonts" size="16" style="b" />
diff --git a/modules/change_report/report.xml b/modules/change_report/report.xml
index 8139c89528..4cd218197b 100644
--- a/modules/change_report/report.xml
+++ b/modules/change_report/report.xml
@@ -5,11 +5,11 @@
<PGVRDescription>Prints a list of individuals matching specific change criteria</PGVRDescription>
<PGVRInput name="changeRangeStart" lookup="DATE" type="text" default="NOW-30"><PGVRvar var="i18n::translate('Starting range of change dates')" /></PGVRInput>
<PGVRInput name="changeRangeEnd" lookup="DATE" type="text" default="NOW"><PGVRvar var="i18n::translate('Ending range of change dates')" /></PGVRInput>
- <PGVRInput name="sortby" type="select" options="CHAN,NAME,BIRT:DATE"><PGVRvar var="i18n::translate('Sort by')" /></PGVRInput>
- <PGVRInput name="pending" type="select" options="yes,no"><PGVRvar var="i18n::translate('Show pending changes')" /></PGVRInput>
- <PGVRInput name="pageSize" type="select" default="A4" options="letter,A3,A4,legal"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
- <PGVRInput name="pageorient" type="select" default="landscape" options="landscape,portrait"><PGVRvar var="i18n::translate('Orientation')" /></PGVRInput>
- <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0,dejavusans,helvetica"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
+ <PGVRInput name="sortby" type="select" options="CHAN=>i18n::translate('Last Change')|NAME=>i18n::translate('Name')|BIRT:DATE=>i18n::translate('Date of birth')"><PGVRvar var="i18n::translate('Sort by')" /></PGVRInput>
+ <PGVRInput name="pending" type="select" options="yes=>i18n::translate('Yes')|no=>i18n::translate('No')"><PGVRvar var="i18n::translate('Show pending changes')" /></PGVRInput>
+ <PGVRInput name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
+ <PGVRInput name="pageorient" type="select" default="landscape" options="landscape=>i18n::translate_c('page layout','Landscape')|portrait=>i18n::translate_c('page layout','Portrait')"><PGVRvar var="i18n::translate('Orientation')" /></PGVRInput>
+ <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
<!-- Header -->
<PGVRStyle name="header" font="$fonts" size="16" style="b" />
diff --git a/modules/death_report/report.xml b/modules/death_report/report.xml
index a236c973b7..1ef8796c81 100644
--- a/modules/death_report/report.xml
+++ b/modules/death_report/report.xml
@@ -7,10 +7,10 @@
<PGVRInput name="deathplace" lookup="PLAC" type="text"><PGVRvar var="i18n::translate('Death Place contains')" /></PGVRInput>
<PGVRInput name="deathdate1" lookup="DATE" type="text"><PGVRvar var="i18n::translate('Death Date range start')" /></PGVRInput>
<PGVRInput name="deathdate2" lookup="DATE" type="text"><PGVRvar var="i18n::translate('Death Date range end')" /></PGVRInput>
- <PGVRInput name="sortby" type="select" default="NAME" options="none,ID,NAME,DEAT:DATE"><PGVRvar var="i18n::translate('Sort by')" /></PGVRInput>
- <PGVRInput name="adlist" type="select" default="none" options="none,_MARNM,HUSB"><PGVRvar var="i18n::translate('Name List')" /></PGVRInput>
- <PGVRInput name="pageSize" type="select" default="A4" options="letter,A3,A4,legal"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
- <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0,dejavusans,helvetica"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
+ <PGVRInput name="sortby" type="select" default="NAME" options="none=>i18n::translate('None')|ID=>i18n::translate('ID number')|NAME=>i18n::translate('Name')|DEAT:DATE=>i18n::translate('Date of death')"><PGVRvar var="i18n::translate('Sort by')" /></PGVRInput>
+ <PGVRInput name="adlist" type="select" default="none" options="none=>i18n::translate('None')|_MARNM=>i18n::translate('Married Name')|HUSB=>i18n::translate('Husband')"><PGVRvar var="i18n::translate('Name List')" /></PGVRInput>
+ <PGVRInput name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
+ <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
<!-- Header -->
<PGVRStyle name="header" font="$fonts" size="16" style="b" />
diff --git a/modules/descendancy_report/report.xml b/modules/descendancy_report/report.xml
index 5c030a0bc3..5ccd99a2d7 100644
--- a/modules/descendancy_report/report.xml
+++ b/modules/descendancy_report/report.xml
@@ -4,10 +4,10 @@
<PGVRTitle><PGVRvar var="i18n::translate('Descendancy Report')" /></PGVRTitle>
<PGVRDescription>Prints a descendant chart in portrait mode</PGVRDescription>
<PGVRInput name="pid" lookup="INDI" type="text" default=""><PGVRvar var="i18n::translate('Enter Individual ID')" /></PGVRInput>
- <PGVRInput name="maxgen" type="select" options="3,4,5,6,7,8,9,*"><PGVRvar var="i18n::translate('Generations')" /></PGVRInput>
+ <PGVRInput name="maxgen" type="select" options="3=>3|4=>4|5=>5|6=>6|7=>7|8=>8|9=>9|*=>*"><PGVRvar var="i18n::translate('Generations')" /></PGVRInput>
<PGVRInput name="sources" type="checkbox" default="1"><PGVRvar var="i18n::translate('Show sources?')" /></PGVRInput>
- <PGVRInput name="pageSize" type="select" default="A4" options="letter,A3,A4,legal"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
- <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0,dejavusans,helvetica"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
+ <PGVRInput name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
+ <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
<!-- Header -->
<PGVRStyle name="header" font="$fonts" size="18"/>
diff --git a/modules/family_group_report/report.xml b/modules/family_group_report/report.xml
index c58edcff3c..d76280b130 100644
--- a/modules/family_group_report/report.xml
+++ b/modules/family_group_report/report.xml
@@ -9,8 +9,8 @@
<PGVRInput name="notes" type="checkbox" default="1"><PGVRvar var="i18n::translate('Show notes?')" /></PGVRInput>
<PGVRInput name="photos" type="checkbox" default="0"><PGVRvar var="i18n::translate('Show photos?')" /></PGVRInput>
<PGVRInput name="blanks" type="checkbox" default="0"><PGVRvar var="i18n::translate('Print basic events when blank?')" /></PGVRInput>
- <PGVRInput name="pageSize" type="select" default="A4" options="letter,A3,A4,legal"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
- <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0,dejavusans,helvetica"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
+ <PGVRInput name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
+ <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
<PGVRInput name="colors" type="checkbox" default="1"><PGVRvar var="i18n::translate('Use colors')"/></PGVRInput>
<PGVRInput name="showplace" type="checkbox" default="1"><PGVRvar var="i18n::translate('Print')"/> "<PGVRvar var="i18n::translate('Place')" />"?</PGVRInput>
diff --git a/modules/individual_ext_report/report.xml b/modules/individual_ext_report/report.xml
index bbc1fc9426..5c9b68a116 100644
--- a/modules/individual_ext_report/report.xml
+++ b/modules/individual_ext_report/report.xml
@@ -4,14 +4,14 @@
<PGVRTitle><PGVRvar var="i18n::translate('Close Relatives Report')" /></PGVRTitle>
<PGVRDescription>Prints an individual record report showing close relatives</PGVRDescription>
<PGVRInput name="pid" type="text" default="" lookup="INDI"><PGVRvar var="i18n::translate('Enter Individual ID')"/></PGVRInput>
- <PGVRInput name="relatives" type="select" options="child-family,spouse-family,direct-ancestors,ancestors,descendants,all"><PGVRvar var="i18n::translate('Choose relatives')"/></PGVRInput>
- <PGVRInput name="maxgen" type="select" default="4" options="*,1,2,3,4,5,6,7,8,9,10"><PGVRvar var="i18n::translate('Generations')"/></PGVRInput>
- <PGVRInput name="sortby" type="select" default="BIRT:DATE" options="none,BIRT:DATE,NAME"><PGVRvar var="i18n::translate('Sort by')"/></PGVRInput>
+ <PGVRInput name="relatives" type="select" options="child-family=>i18n::translate('Parents and siblings')|spouse-family=>i18n::translate('Spouses and children')|direct-ancestors=>i18n::translate('Direct line ancestors')|ancestors=>i18n::translate('Direct line ancestors and their families')|descendants=>i18n::translate('Descendants')|all=>i18n::translate('All')"><PGVRvar var="i18n::translate('Choose relatives')"/></PGVRInput>
+ <PGVRInput name="maxgen" type="select" default="4" options="*=>*|1=>1|2=>2|3=>3|4=>4|5=>5|6=>6|7=>7|8=>8|9=>9|10=>10"><PGVRvar var="i18n::translate('Generations')"/></PGVRInput>
+ <PGVRInput name="sortby" type="select" default="BIRT:DATE" options="none=>i18n::translate('None')|BIRT:DATE=>i18n::translate('Date of birth')|NAME=>i18n::translate('Name')"><PGVRvar var="i18n::translate('Sort by')"/></PGVRInput>
<PGVRInput name="sources" type="checkbox" default="0"><PGVRvar var="i18n::translate('Show sources?')"/></PGVRInput>
<PGVRInput name="notes" type="checkbox" default="1"><PGVRvar var="i18n::translate('Show notes?')"/></PGVRInput>
- <PGVRInput name="photos" type="select" default="highlighted" options="none,all,highlighted"><PGVRvar var="i18n::translate('Show photos?')"/></PGVRInput>
- <PGVRInput name="pageSize" type="select" default="A4" options="A3,A4,letter,legal"><PGVRvar var="i18n::translate('Page size')"/></PGVRInput>
- <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0,dejavusans,helvetica"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
+ <PGVRInput name="photos" type="select" default="highlighted" options="none=>i18n::translate('None')|all=>i18n::translate('All')|highlighted=>i18n::translate('Highlighted image')"><PGVRvar var="i18n::translate('Show photos?')"/></PGVRInput>
+ <PGVRInput name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
+ <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
<PGVRInput name="colors" type="checkbox" default="1"><PGVRvar var="i18n::translate('Use colors')"/></PGVRInput>
<!-- Header -->
diff --git a/modules/individual_report/report.xml b/modules/individual_report/report.xml
index 453e2f9f6c..eb99cf71b9 100644
--- a/modules/individual_report/report.xml
+++ b/modules/individual_report/report.xml
@@ -6,9 +6,9 @@
<PGVRInput name="pid" lookup="INDI" type="text" default=""><PGVRvar var="i18n::translate('Enter Individual ID')" /></PGVRInput>
<PGVRInput name="sources" type="checkbox" default="1"><PGVRvar var="i18n::translate('Show sources?')" /></PGVRInput>
<PGVRInput name="notes" type="checkbox" default="1"><PGVRvar var="i18n::translate('Show notes?')" /></PGVRInput>
- <PGVRInput name="photos" type="select" default="highlighted" options="none,all,highlighted"><PGVRvar var="i18n::translate('Show photos?')"/></PGVRInput>
- <PGVRInput name="pageSize" type="select" default="A4" options="letter,A3,A4,legal"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
- <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0,dejavusans,helvetica"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
+ <PGVRInput name="photos" type="select" default="highlighted" options="none=>i18n::translate('None')|all=>i18n::translate('All')|highlighted=>i18n::translate('Highlighted image')"><PGVRvar var="i18n::translate('Show photos?')"/></PGVRInput>
+ <PGVRInput name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
+ <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
<!-- Header -->
<PGVRStyle name="header" font="$fonts" size="18" />
diff --git a/modules/marriage_report/report.xml b/modules/marriage_report/report.xml
index d5b5cf2be7..be1b4e0626 100644
--- a/modules/marriage_report/report.xml
+++ b/modules/marriage_report/report.xml
@@ -7,9 +7,9 @@
<PGVRInput name="marrplace" lookup="PLAC" type="text"><PGVRvar var="i18n::translate('Marriage Place contains')" /> </PGVRInput>
<PGVRInput name="marrdate1" lookup="DATE" type="text"><PGVRvar var="i18n::translate('Marriage Date range start')" /></PGVRInput>
<PGVRInput name="marrdate2" lookup="DATE" type="text"><PGVRvar var="i18n::translate('Marriage Date range end')" /></PGVRInput>
- <PGVRInput name="sortby" type="select" options="NAME,MARR:DATE"><PGVRvar var="i18n::translate('Sort by')" /></PGVRInput>
- <PGVRInput name="pageSize" type="select" default="A4" options="letter,A3,A4,legal"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
- <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0,dejavusans,helvetica"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
+ <PGVRInput name="sortby" type="select" options="NAME=>i18n::translate('Name')|MARR:DATE=>i18n::translate('Date of Marriage')"><PGVRvar var="i18n::translate('Sort by')" /></PGVRInput>
+ <PGVRInput name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
+ <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
<!-- Header -->
<PGVRStyle name="header" font="$fonts" size="16" style="b" />
diff --git a/modules/missing_facts_report/report.xml b/modules/missing_facts_report/report.xml
index 16fc1d2cdd..42f47e35d8 100644
--- a/modules/missing_facts_report/report.xml
+++ b/modules/missing_facts_report/report.xml
@@ -3,10 +3,10 @@
<PGVRTitle><PGVRvar var="i18n::translate('Missing relatives facts')" /></PGVRTitle>
<PGVRDescription>Prints a list of individuals who has missing information</PGVRDescription>
<PGVRInput name="pid" type="text" default="" lookup="INDI"><PGVRvar var="i18n::translate('Enter Individual ID')"/></PGVRInput>
- <PGVRInput name="relatives" type="select" default="direct-ancestors" options="child-family,spouse-family,direct-ancestors,ancestors,descendants,all"><PGVRvar var="i18n::translate('Choose relatives')"/></PGVRInput>
- <PGVRInput name="maxgen" type="select" default="*" options="*,1,2,3,4,5,6,7,8,9,10"><PGVRvar var="i18n::translate('Generations')"/></PGVRInput>
- <PGVRInput name="pageSize" type="select" default="A4" options="A3,A4,letter,legal"><PGVRvar var="i18n::translate('Page size')"/></PGVRInput>
- <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0,dejavusans,helvetica"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
+ <PGVRInput name="relatives" type="select" default="direct-ancestors" options="child-family=>i18n::translate('Parents and siblings')|spouse-family=>i18n::translate('Spouses and children')|direct-ancestors=>i18n::translate('Direct line ancestors')|ancestors=>i18n::translate('Direct line ancestors and their families')|descendants=>i18n::translate('Descendants')|all=>i18n::translate('All')"><PGVRvar var="i18n::translate('Choose relatives')"/></PGVRInput>
+ <PGVRInput name="maxgen" type="select" default="*" options="*=>*|1=>1|2=>2|3=>3|4=>4|5=>5|6=>6|7=>7|8=>8|9=>9|10=>10"><PGVRvar var="i18n::translate('Generations')"/></PGVRInput>
+ <PGVRInput name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
+ <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
<PGVRInput name="fsour" type="checkbox" default="0"><PGVRvar var="i18n::translate('Sources to the events')" /></PGVRInput>
<PGVRInput name="fbirt" type="checkbox" default="1"><PGVRvar var="i18n::translate('Birth')"/></PGVRInput>
diff --git a/modules/pedigree_report/report_landscape.xml b/modules/pedigree_report/report_landscape.xml
index 64ca14f9e9..4fb06d1e95 100644
--- a/modules/pedigree_report/report_landscape.xml
+++ b/modules/pedigree_report/report_landscape.xml
@@ -4,8 +4,8 @@
<PGVRDescription>Prints a pedigree chart in landscape mode</PGVRDescription>
<PGVRTitle><PGVRvar var="i18n::translate('Pedigree Chart')" /> - <PGVRvar var="i18n::translate('Landscape')" /></PGVRTitle>
<PGVRInput name="pid" lookup="INDI" type="text" default=""><PGVRvar var="i18n::translate('Enter Individual ID')" /></PGVRInput>
- <PGVRInput name="pageSize" type="select" default="A4" options="letter,A3,A4,legal"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
- <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0,dejavusans,helvetica"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
+ <PGVRInput name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
+ <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
<PGVRStyle name="header" font="$fonts" size="18"/>
<PGVRStyle name="label1" font="$fonts" size="9" />
diff --git a/modules/pedigree_report/report_portrait.xml b/modules/pedigree_report/report_portrait.xml
index 48049b6090..21f965a2ff 100644
--- a/modules/pedigree_report/report_portrait.xml
+++ b/modules/pedigree_report/report_portrait.xml
@@ -4,8 +4,8 @@
<PGVRDescription>Prints a pedigree chart in portrait mode</PGVRDescription>
<PGVRTitle><PGVRvar var="i18n::translate('Pedigree Chart')" /> - <PGVRvar var="i18n::translate('Portrait')" /></PGVRTitle>
<PGVRInput name="pid" lookup="INDI" type="text" default=""><PGVRvar var="i18n::translate('Enter Individual ID')" /></PGVRInput>
- <PGVRInput name="pageSize" type="select" default="A4" options="letter,A3,A4,legal"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
- <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0,dejavusans,helvetica"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
+ <PGVRInput name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
+ <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
<PGVRStyle name="header" font="$fonts" size="18" />
<PGVRStyle name="label1" font="$fonts" size="9" />
diff --git a/modules/relative_ext_report/report.xml b/modules/relative_ext_report/report.xml
index bd0962c0d8..5418c3d751 100644
--- a/modules/relative_ext_report/report.xml
+++ b/modules/relative_ext_report/report.xml
@@ -4,10 +4,10 @@
<PGVRTitle><PGVRvar var="i18n::translate('Expanded Relatives Report')" /></PGVRTitle>
<PGVRDescription>Prints a list of individuals related to a specific person</PGVRDescription>
<PGVRInput name="pid" lookup="INDI" type="text"><PGVRvar var="i18n::translate('Enter Individual ID')" /></PGVRInput>
- <PGVRInput name="relatives" type="select" options="child-family,spouse-family,direct-ancestors,ancestors,descendants,all"><PGVRvar var="i18n::translate('Choose relatives')" /></PGVRInput>
- <PGVRInput name="sortby" type="select" default="BIRT:DATE" options="none,ID,NAME,BIRT:DATE,DEAT:DATE"><PGVRvar var="i18n::translate('Sort by')" /></PGVRInput>
- <PGVRInput name="pageSize" type="select" default="A4" options="letter,A3,A4,legal"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
- <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0,dejavusans,helvetica"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
+ <PGVRInput name="relatives" type="select" options="child-family=>i18n::translate('Parents and siblings')|spouse-family=>i18n::translate('Spouses and children')|direct-ancestors=>i18n::translate('Direct line ancestors')|ancestors=>i18n::translate('Direct line ancestors and their families')|descendants=>i18n::translate('Descendants')|all=>i18n::translate('All')"><PGVRvar var="i18n::translate('Choose relatives')" /></PGVRInput>
+ <PGVRInput name="sortby" type="select" default="BIRT:DATE" options="none=>i18n::translate('None')|ID=>i18n::translate('ID number')|NAME=>i18n::translate('Name')|BIRT:DATE=>i18n::translate('Date of birth')|DEAT:DATE=>i18n::translate('Date of death')"><PGVRvar var="i18n::translate('Sort by')" /></PGVRInput>
+ <PGVRInput name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
+ <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
<!-- Header -->
<PGVRStyle name="header" font="$fonts" size="14" />
diff --git a/modules/relative_report/report.xml b/modules/relative_report/report.xml
index 1b7adbb4ee..2dee0e463e 100644
--- a/modules/relative_report/report.xml
+++ b/modules/relative_report/report.xml
@@ -4,11 +4,11 @@
<PGVRTitle><PGVRvar var="i18n::translate('Relatives Report')" /></PGVRTitle>
<PGVRDescription>Prints a list of individuals related to a specific person</PGVRDescription>
<PGVRInput name="pid" lookup="INDI" type="text"><PGVRvar var="i18n::translate('Enter Individual ID')" /></PGVRInput>
- <PGVRInput name="relatives" type="select" options="child-family,spouse-family,direct-ancestors,ancestors,descendants,all"><PGVRvar var="i18n::translate('Choose relatives')" /></PGVRInput>
- <PGVRInput name="sortby" type="select" default="BIRT:DATE" options="none,ID,NAME,BIRT:DATE,DEAT:DATE"><PGVRvar var="i18n::translate('Sort by')" /></PGVRInput>
- <PGVRInput name="pageSize" type="select" default="A4" options="letter,A3,A4,legal"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
- <PGVRInput name="pageorient" type="select" default="landscape" options="landscape,portrait"><PGVRvar var="i18n::translate('Orientation')" /></PGVRInput>
- <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0,dejavusans,helvetica"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
+ <PGVRInput name="relatives" type="select" options="child-family=>i18n::translate('Parents and siblings')|spouse-family=>i18n::translate('Spouses and children')|direct-ancestors=>i18n::translate('Direct line ancestors')|ancestors=>i18n::translate('Direct line ancestors and their families')|descendants=>i18n::translate('Descendants')|all=>i18n::translate('All')"><PGVRvar var="i18n::translate('Choose relatives')" /></PGVRInput>
+ <PGVRInput name="sortby" type="select" default="BIRT:DATE" options="none=>i18n::translate('None')|ID=>i18n::translate('ID number')|NAME=>i18n::translate('Name')|BIRT:DATE=>i18n::translate('Date of birth')|DEAT:DATE=>i18n::translate('Date of death')"><PGVRvar var="i18n::translate('Sort by')" /></PGVRInput>
+ <PGVRInput name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
+ <PGVRInput name="pageorient" type="select" default="landscape" options="landscape=>i18n::translate_c('page layout','Landscape')|portrait=>i18n::translate_c('page layout','Portrait')"><PGVRvar var="i18n::translate('Orientation')" /></PGVRInput>
+ <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
<PGVRStyle name="header" font="$fonts" size="14" style="b" />
<PGVRStyle name="pagenum" font="$fonts" size="8" />
diff --git a/modules/source_report/report.xml b/modules/source_report/report.xml
index e799f0781d..28bfabbff6 100644
--- a/modules/source_report/report.xml
+++ b/modules/source_report/report.xml
@@ -4,9 +4,9 @@
<PGVRDescription>Prints a list of individuals and families with a specific source for facts</PGVRDescription>
<PGVRInput name="sid" lookup="SOUR" default="" type="text"><PGVRvar var="i18n::translate('Find Source ID')" /></PGVRInput>
- <PGVRInput name="sortby" type="select" default="BIRT:DATE" options="NAME,BIRT:DATE"><PGVRvar var="i18n::translate('Sort by')" /></PGVRInput>
- <PGVRInput name="pageSize" type="select" default="A4" options="letter,A3,A4,legal"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
- <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0,dejavusans,helvetica"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
+ <PGVRInput name="sortby" type="select" default="BIRT:DATE" options="NAME=>i18n::translate('Name')|BIRT:DATE=>i18n::translate('Date of birth')"><PGVRvar var="i18n::translate('Sort by')" /></PGVRInput>
+ <PGVRInput name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><PGVRvar var="i18n::translate('Page size')" /></PGVRInput>
+ <PGVRInput name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><PGVRvar var="i18n::translate('Font')"/></PGVRInput>
<!-- Header -->
<PGVRStyle name="header" font="$fonts" size="18" style="b" />
diff --git a/reportengine.php b/reportengine.php
index 5d831c9805..a78d1bf98c 100644
--- a/reportengine.php
+++ b/reportengine.php
@@ -281,13 +281,17 @@ elseif ($action=="setup") {
}
if ($input["type"]=="select") {
echo "<select name=\"vars[", $input["name"], "]\" id=\"", $input["name"], "_var\">\n";
- $options = preg_split("/[, ]+/", $input["options"]);
+ $options = preg_split("/[|]+/", $input["options"]);
foreach($options as $indexval => $option) {
- echo "\t<option value=\"", $option, "\"";
+ list($value, $display)=explode('=>', $option);
+ if (substr($display, 0, 6)=='i18n::') {
+ eval("\$display=$display;");
+ }
+ echo "\t<option value=\"", htmlspecialchars($value), "\"";
if ($option==$input["default"]) {
echo " selected=\"selected\"";
}
- echo '>', i18n::translate($option), '</option>';
+ echo '>', $display, '</option>';
}
echo "</select>\n";
}
generated by cgit v1.3 (git 2.53.0) at 2026-07-08 22:26:39 +0000