@@ -65,7 +65,7 @@ |
||
65 | 65 | return new Menu( |
66 | 66 | $this->getTitle(), |
67 | 67 | route('report-setup', ['ged' => $tree->getName(), |
68 | - 'report' => $this->getName(), |
|
68 | + 'report' => $this->getName(), |
|
69 | 69 | ]), |
70 | 70 | 'menu-report-' . $this->getName(), |
71 | 71 | ['rel' => 'nofollow'] |
@@ -706,7 +706,7 @@ discard block |
||
706 | 706 | <?= view('components/radios-no-yes',['name' => 'EXPAND_NOTES', 'value' => $tree->getPreference('EXPAND_NOTES')]) ?> |
707 | 707 | <p class="small text-muted"> |
708 | 708 | <?= /* I18N: Help text for the “Automatically expand notes” configuration setting */ |
709 | - I18N::translate('This option controls whether or not to automatically display content of a <i>Note</i> record on the Individual page.') ?> |
|
709 | + I18N::translate('This option controls whether or not to automatically display content of a <i>Note</i> record on the Individual page.') ?> |
|
710 | 710 | </p> |
711 | 711 | </div> |
712 | 712 | </div> |
@@ -722,7 +722,7 @@ discard block |
||
722 | 722 | <?= view('components/radios-no-yes',['name' => 'EXPAND_SOURCES', 'value' => $tree->getPreference('EXPAND_SOURCES')]) ?> |
723 | 723 | <p class="small text-muted"> |
724 | 724 | <?= /* I18N: Help text for the “Automatically expand sources” configuration setting */ |
725 | - I18N::translate('This option controls whether or not to automatically display content of a <i>Source</i> record on the Individual page.') ?> |
|
725 | + I18N::translate('This option controls whether or not to automatically display content of a <i>Source</i> record on the Individual page.') ?> |
|
726 | 726 | </p> |
727 | 727 | </div> |
728 | 728 | </div> |
@@ -745,13 +745,13 @@ discard block |
||
745 | 745 | </legend> |
746 | 746 | <div class="col-sm-9"> |
747 | 747 | <?= /* I18N: The placeholders are edit controls. Show the [first/last] [1/2/3/4/5] parts of a place name */ I18N::translate( |
748 | - 'Show the %1$s %2$s parts of a place name.', |
|
749 | - Bootstrap4::select([ |
|
750 | - '0' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'first'), |
|
751 | - '1' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'last'), |
|
752 | - ], $tree->getPreference('SHOW_PEDIGREE_PLACES_SUFFIX', ['name' => 'SHOW_PEDIGREE_PLACES_SUFFIX'])), |
|
753 | - Bootstrap4::select(FunctionsEdit::numericOptions(range(1, 9)), $tree->getPreference('SHOW_PEDIGREE_PLACES'), ['name' => 'SHOW_PEDIGREE_PLACES']) |
|
754 | - ) ?> |
|
748 | + 'Show the %1$s %2$s parts of a place name.', |
|
749 | + Bootstrap4::select([ |
|
750 | + '0' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'first'), |
|
751 | + '1' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'last'), |
|
752 | + ], $tree->getPreference('SHOW_PEDIGREE_PLACES_SUFFIX', ['name' => 'SHOW_PEDIGREE_PLACES_SUFFIX'])), |
|
753 | + Bootstrap4::select(FunctionsEdit::numericOptions(range(1, 9)), $tree->getPreference('SHOW_PEDIGREE_PLACES'), ['name' => 'SHOW_PEDIGREE_PLACES']) |
|
754 | + ) ?> |
|
755 | 755 | <p class="small text-muted"> |
756 | 756 | <?= /* I18N: Help text for the “Abbreviate place names” configuration setting */ I18N::translate('Place names are frequently too long to fit on charts, lists, etc. They can be abbreviated by showing just the first few parts of the name, such as <i>village, county</i>, or the last few part of it, such as <i>region, country</i>.') ?> |
757 | 757 | </p> |
@@ -26,7 +26,7 @@ |
||
26 | 26 | <button type="submit" class="btn btn-primary"> |
27 | 27 | <?= view('icons/save') ?> |
28 | 28 | <?= /* I18N: A button label. */ |
29 | - I18N::translate('continue') ?> |
|
29 | + I18N::translate('continue') ?> |
|
30 | 30 | </button> |
31 | 31 | |
32 | 32 | <?= I18N::translate('Caution! This may take a long time. Be patient.') ?> |
@@ -25,12 +25,12 @@ discard block |
||
25 | 25 | </label> |
26 | 26 | <div class="col-sm-9 wt-page-options-value"> |
27 | 27 | <?= |
28 | - Bootstrap4::select( |
|
29 | - FunctionsEdit::numericOptions(range(2, $maxgenerations)), |
|
30 | - $generations, |
|
31 | - ['id' => 'generations', 'name' => 'generations'] |
|
32 | - ) |
|
33 | - ?> |
|
28 | + Bootstrap4::select( |
|
29 | + FunctionsEdit::numericOptions(range(2, $maxgenerations)), |
|
30 | + $generations, |
|
31 | + ['id' => 'generations', 'name' => 'generations'] |
|
32 | + ) |
|
33 | + ?> |
|
34 | 34 | </div> |
35 | 35 | </div> |
36 | 36 | |
@@ -38,8 +38,8 @@ discard block |
||
38 | 38 | <div class="col-sm-3 wt-page-options-label"></div> |
39 | 39 | <div class="col-sm-9 wt-page-options-value"> |
40 | 40 | <input class="btn btn-primary" type="submit" value="<?= /* I18N: A button label. */ |
41 | - I18N::translate('view') |
|
42 | - ?>"> |
|
41 | + I18N::translate('view') |
|
42 | + ?>"> |
|
43 | 43 | </div> |
44 | 44 | </div> |
45 | 45 | </form> |
@@ -55,11 +55,11 @@ discard block |
||
55 | 55 | </legend> |
56 | 56 | <div class="col-sm-8"> |
57 | 57 | <?= Bootstrap4::radioButtons( |
58 | - 'cleardatabase', |
|
59 | - [I18N::translate('no'), I18N::translate('yes')], |
|
60 | - '0', |
|
61 | - true |
|
62 | - ) ?> |
|
58 | + 'cleardatabase', |
|
59 | + [I18N::translate('no'), I18N::translate('yes')], |
|
60 | + '0', |
|
61 | + true |
|
62 | + ) ?> |
|
63 | 63 | </div> |
64 | 64 | </div> |
65 | 65 | </fieldset> |
@@ -72,14 +72,14 @@ discard block |
||
72 | 72 | </legend> |
73 | 73 | <div class="col-sm-8"> |
74 | 74 | <?= Bootstrap4::select( |
75 | - [ |
|
76 | - 'addupdate' => I18N::translate('Add new, and update existing records'), |
|
77 | - 'add' => I18N::translate('Only add new records'), |
|
78 | - 'update' => I18N::translate('Only update existing records'), |
|
79 | - ], |
|
80 | - '0', |
|
81 | - ['id' => 'import-options', 'name' => 'import-options'] |
|
82 | - ) ?> |
|
75 | + [ |
|
76 | + 'addupdate' => I18N::translate('Add new, and update existing records'), |
|
77 | + 'add' => I18N::translate('Only add new records'), |
|
78 | + 'update' => I18N::translate('Only update existing records'), |
|
79 | + ], |
|
80 | + '0', |
|
81 | + ['id' => 'import-options', 'name' => 'import-options'] |
|
82 | + ) ?> |
|
83 | 83 | </div> |
84 | 84 | </div> |
85 | 85 | </fieldset> |
@@ -75,27 +75,27 @@ discard block |
||
75 | 75 | <a class="btn btn-primary" href="<?= e(route('map-data', ['parent_id' => $parent_id])) ?>"> |
76 | 76 | <?= FontAwesome::decorativeIcon('add') ?> |
77 | 77 | <?= /* I18N: A button label. */ |
78 | - I18N::translate('add place') ?> |
|
78 | + I18N::translate('add place') ?> |
|
79 | 79 | </a> |
80 | 80 | <button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenuButton" |
81 | 81 | data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> |
82 | 82 | <?= FontAwesome::decorativeIcon('download') ?> |
83 | 83 | <?= /* I18N: A button label. */ |
84 | - I18N::translate('export file') ?> |
|
84 | + I18N::translate('export file') ?> |
|
85 | 85 | </button> |
86 | 86 | <div class="dropdown-menu" aria-labelledby="dropdownMenuButton"> |
87 | 87 | <a class="dropdown-item" href="<?= e(route('locations-export', ['parent_id' => $parent_id, 'format' => 'csv'])) ?>"> |
88 | 88 | csv |
89 | 89 | </a> |
90 | 90 | <a class="dropdown-item" href="<?= e(route('locations-export', ['parent_id' => $parent_id, 'format' => 'geojson'] |
91 | - )) ?>"> |
|
91 | + )) ?>"> |
|
92 | 92 | geoJSON |
93 | 93 | </a> |
94 | 94 | </div> |
95 | 95 | <a class="btn btn-primary" href="<?= e(route('locations-import', ['parent_id' => $parent_id])) ?>"> |
96 | 96 | <?= FontAwesome::decorativeIcon('upload') ?> |
97 | 97 | <?= /* I18N: A button label. */ |
98 | - I18N::translate('import file') ?> |
|
98 | + I18N::translate('import file') ?> |
|
99 | 99 | </a> |
100 | 100 | </td> |
101 | 101 | </tr> |
@@ -111,16 +111,16 @@ discard block |
||
111 | 111 | </label> |
112 | 112 | <div class="col-sm-6"> |
113 | 113 | <?= Bootstrap4::select( |
114 | - Tree::getNameList(), |
|
115 | - '', |
|
116 | - ['id' => 'ged', 'name' => 'ged'] |
|
117 | - ) ?> |
|
114 | + Tree::getNameList(), |
|
115 | + '', |
|
116 | + ['id' => 'ged', 'name' => 'ged'] |
|
117 | + ) ?> |
|
118 | 118 | </div> |
119 | 119 | <div class="col-sm-2"> |
120 | 120 | <button type="submit" class="btn btn-primary"> |
121 | 121 | <?= view('icons/upload') ?> |
122 | 122 | <?= /* I18N: A button label. */ |
123 | - I18N::translate('import') ?> |
|
123 | + I18N::translate('import') ?> |
|
124 | 124 | </button> |
125 | 125 | </div> |
126 | 126 | </div> |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | </label> |
75 | 75 | <div class="col-sm-9 wt-page-options-value"> |
76 | 76 | <?= FunctionsEdit::formControlIndividual($tree, $default_individual, ['id' => 'root-id', |
77 | - 'name' => 'root_id', 'aria-describedby' => 'root-id-description']) ?> |
|
77 | + 'name' => 'root_id', 'aria-describedby' => 'root-id-description']) ?> |
|
78 | 78 | <p class="small text-muted" id="root-id-description"> |
79 | 79 | <?= I18N::translate('This individual will be selected by default when viewing charts and reports.') ?> |
80 | 80 | </p> |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | <?= Bootstrap4::select($themes, $user->getPreference('theme'), ['id' => 'theme', 'name' => 'theme', 'aria-describedby' => 'theme-description']) ?> |
150 | 150 | <p class="small text-muted" id="theme-description"> |
151 | 151 | <?= /* I18N: Help text for the "Default theme" site configuration setting */ |
152 | - I18N::translate('You can change the appearance of webtrees using “themes”. Each theme has a different style, layout, color scheme, etc.') ?> |
|
152 | + I18N::translate('You can change the appearance of webtrees using “themes”. Each theme has a different style, layout, color scheme, etc.') ?> |
|
153 | 153 | </p> |
154 | 154 | </div> |
155 | 155 | </div> |
@@ -241,7 +241,7 @@ |
||
241 | 241 | ], |
242 | 242 | 'CEME' => [ |
243 | 243 | // CEME is NOT a valid 5.5.1 tag |
244 | - //'BURI', |
|
244 | + //'BURI', |
|
245 | 245 | ], |
246 | 246 | 'RELA' => [ |
247 | 247 | 'ASSO', |
@@ -302,13 +302,13 @@ discard block |
||
302 | 302 | { |
303 | 303 | $found_facts = []; |
304 | 304 | foreach ([ |
305 | - new GregorianDate($jd), |
|
306 | - new JulianDate($jd), |
|
307 | - new FrenchDate($jd), |
|
308 | - new JewishDate($jd), |
|
309 | - new HijriDate($jd), |
|
310 | - new JalaliDate($jd), |
|
311 | - ] as $anniv) { |
|
305 | + new GregorianDate($jd), |
|
306 | + new JulianDate($jd), |
|
307 | + new FrenchDate($jd), |
|
308 | + new JewishDate($jd), |
|
309 | + new HijriDate($jd), |
|
310 | + new JalaliDate($jd), |
|
311 | + ] as $anniv) { |
|
312 | 312 | // Build a SQL where clause to match anniversaries in the appropriate calendar. |
313 | 313 | $ind_sql = |
314 | 314 | "SELECT DISTINCT i_id AS xref, i_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact" . |
@@ -462,9 +462,9 @@ discard block |
||
462 | 462 | |
463 | 463 | // Now fetch these anniversaries |
464 | 464 | foreach ([ |
465 | - 'INDI' => $ind_sql . $where . $order_by, |
|
466 | - 'FAM' => $fam_sql . $where . $order_by, |
|
467 | - ] as $type => $sql) { |
|
465 | + 'INDI' => $ind_sql . $where . $order_by, |
|
466 | + 'FAM' => $fam_sql . $where . $order_by, |
|
467 | + ] as $type => $sql) { |
|
468 | 468 | $rows = Database::prepare($sql)->execute($args)->fetchAll(); |
469 | 469 | foreach ($rows as $row) { |
470 | 470 | if ($type === 'INDI') { |
@@ -522,9 +522,9 @@ discard block |
||
522 | 522 | $ind_sql = "SELECT d_gid AS xref, i_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact, d_type FROM `##dates`, `##individuals` {$where} AND d_gid=i_id AND d_file=i_file ORDER BY d_julianday1"; |
523 | 523 | $fam_sql = "SELECT d_gid AS xref, f_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact, d_type FROM `##dates`, `##families` {$where} AND d_gid=f_id AND d_file=f_file ORDER BY d_julianday1"; |
524 | 524 | foreach ([ |
525 | - 'INDI' => $ind_sql, |
|
526 | - 'FAM' => $fam_sql, |
|
527 | - ] as $type => $sql) { |
|
525 | + 'INDI' => $ind_sql, |
|
526 | + 'FAM' => $fam_sql, |
|
527 | + ] as $type => $sql) { |
|
528 | 528 | $rows = Database::prepare($sql)->fetchAll(); |
529 | 529 | foreach ($rows as $row) { |
530 | 530 | if ($type === 'INDI') { |