@@ -1016,7 +1016,7 @@ discard block |
||
1016 | 1016 | I18N::translate('Females') . ' - ' . $per_f . '|' . |
1017 | 1017 | I18N::translate('Males') . ' - ' . $per_m; |
1018 | 1018 | $chart_title = I18N::translate('Males') . ' - ' . $per_m . I18N::$list_separator . |
1019 | - I18N::translate('Females') . ' - ' . $per_f; |
|
1019 | + I18N::translate('Females') . ' - ' . $per_f; |
|
1020 | 1020 | |
1021 | 1021 | return "<img src=\"https://chart.googleapis.com/chart?cht=p3&chd=e:{$chd}&chs={$size}&chco={$color_female},{$color_male}&chf=bg,s,ffffff00&chl={$chl}\" width=\"{$sizes[0]}\" height=\"{$sizes[1]}\" alt=\"" . $chart_title . '" title="' . $chart_title . '" />'; |
1022 | 1022 | } |
@@ -1132,7 +1132,7 @@ discard block |
||
1132 | 1132 | I18N::translate('Living') . ' - ' . $per_l . '|' . |
1133 | 1133 | I18N::translate('Dead') . ' - ' . $per_d . '|'; |
1134 | 1134 | $chart_title = I18N::translate('Living') . ' - ' . $per_l . I18N::$list_separator . |
1135 | - I18N::translate('Dead') . ' - ' . $per_d; |
|
1135 | + I18N::translate('Dead') . ' - ' . $per_d; |
|
1136 | 1136 | |
1137 | 1137 | return "<img src=\"https://chart.googleapis.com/chart?cht=p3&chd=e:{$chd}&chs={$size}&chco={$color_living},{$color_dead}&chf=bg,s,ffffff00&chl={$chl}\" width=\"{$sizes[0]}\" height=\"{$sizes[1]}\" alt=\"" . $chart_title . '" title="' . $chart_title . '" />'; |
1138 | 1138 | } |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | // Ambiguous dates - don't override calendar escape |
163 | 163 | if ($cal == '') { |
164 | 164 | if (preg_match('/^(JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC)$/', $m)) { |
165 | - $cal = GregorianDate::ESCAPE; |
|
165 | + $cal = GregorianDate::ESCAPE; |
|
166 | 166 | } else { |
167 | 167 | if (preg_match('/^[345]\d\d\d$/', $y)) { |
168 | 168 | // Year 3000-5999 |
@@ -460,7 +460,7 @@ discard block |
||
460 | 460 | public function addYears(int $years, string $qualifier = ''): Date |
461 | 461 | { |
462 | 462 | $tmp = clone $this; |
463 | - $tmp->date1->year += $years; |
|
463 | + $tmp->date1->year += $years; |
|
464 | 464 | $tmp->date1->month = 0; |
465 | 465 | $tmp->date1->day = 0; |
466 | 466 | $tmp->date1->setJdFromYmd(); |
@@ -434,7 +434,7 @@ |
||
434 | 434 | $histo = []; |
435 | 435 | require Site::getPreference('INDEX_DIRECTORY') . 'histo.' . WT_LOCALE . '.php'; |
436 | 436 | foreach ($histo as $hist) { |
437 | - $fact = new Fact($hist, $person, 'histo'); |
|
437 | + $fact = new Fact($hist, $person, 'histo'); |
|
438 | 438 | |
439 | 439 | if (self::includeFact($fact, $min_date, $max_date)) { |
440 | 440 | $facts[] = $fact; |
@@ -1579,7 +1579,7 @@ |
||
1579 | 1579 | public function menuSearchPhonetic(): Menu |
1580 | 1580 | { |
1581 | 1581 | /* I18N: search using “sounds like”, rather than exact spelling */ |
1582 | - return new Menu(I18N::translate('Phonetic search'), route('search-phonetic', ['ged' => $this->tree->name(), 'action' => 'soundex',]), 'menu-search-soundex', ['rel' => 'nofollow']); |
|
1582 | + return new Menu(I18N::translate('Phonetic search'), route('search-phonetic', ['ged' => $this->tree->name(), 'action' => 'soundex', ]), 'menu-search-soundex', ['rel' => 'nofollow']); |
|
1583 | 1583 | } |
1584 | 1584 | |
1585 | 1585 | /** |
@@ -378,8 +378,8 @@ |
||
378 | 378 | $edit_links = FontAwesome::linkIcon('edit', I18N::translate('Edit the gender'), [ |
379 | 379 | 'class' => 'btn btn-link', |
380 | 380 | 'href' => route('edit-fact', ['xref' => $individual->xref(), |
381 | - 'fact_id' => $fact->id(), |
|
382 | - 'ged' => $individual->tree()->name(), |
|
381 | + 'fact_id' => $fact->id(), |
|
382 | + 'ged' => $individual->tree()->name(), |
|
383 | 383 | ]), |
384 | 384 | ]); |
385 | 385 | } else { |
@@ -216,7 +216,8 @@ discard block |
||
216 | 216 | <li class="wt-initials-list-item d-flex"> |
217 | 217 | <?php if ($count > 0) : ?> |
218 | 218 | <a href="<?= e(route($route, ['alpha' => $letter, 'ged' => $tree->name()])) ?>" class="wt-initial<?= $letter === $alpha ? ' active' : ''?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a> |
219 | - <?php else : ?> |
|
219 | + <?php else { |
|
220 | + : ?> |
|
220 | 221 | <span class="wt-initial text-muted"><?= $this->surnameInitial((string) $letter) ?></span> |
221 | 222 | |
222 | 223 | <?php endif ?> |
@@ -270,6 +271,7 @@ discard block |
||
270 | 271 | |
271 | 272 | if ($show === 'indi' || $show === 'surn') { |
272 | 273 | $surns = $this->surnames($tree, $surname, $alpha, $show_marnm === 'yes', $families); |
274 | +} |
|
273 | 275 | if ($show === 'surn') { |
274 | 276 | // Show the surname list |
275 | 277 | switch ($tree->getPreference('SURNAME_LIST_STYLE')) { |
@@ -190,8 +190,8 @@ discard block |
||
190 | 190 | foreach ($person->getChildFamilies() as $cfamily) { |
191 | 191 | foreach ($cfamily->getSpouses() as $parent) { |
192 | 192 | echo FontAwesome::linkIcon('arrow-up', I18N::translate('Start at parents'), ['href' => route('descendants', ['ged' => $parent->tree()->name(), |
193 | - 'xref' => $parent->xref(), |
|
194 | - 'generations' => $generations, |
|
193 | + 'xref' => $parent->xref(), |
|
194 | + 'generations' => $generations, |
|
195 | 195 | ]), |
196 | 196 | ]); |
197 | 197 | // only show the arrow for one of the parents |
@@ -273,8 +273,8 @@ discard block |
||
273 | 273 | foreach ($spouse->getChildFamilies() as $cfamily) { |
274 | 274 | foreach ($cfamily->getSpouses() as $parent) { |
275 | 275 | echo FontAwesome::linkIcon('arrow-up', I18N::translate('Start at parents'), ['href' => route('descendants', ['ged' => $parent->tree()->name(), |
276 | - 'xref' => $parent->xref(), |
|
277 | - 'generations' => $generations, |
|
276 | + 'xref' => $parent->xref(), |
|
277 | + 'generations' => $generations, |
|
278 | 278 | ]), |
279 | 279 | ]); |
280 | 280 | // only show the arrow for one of the parents |
@@ -320,7 +320,7 @@ discard block |
||
320 | 320 | return $new_path; |
321 | 321 | } |
322 | 322 | |
323 | - $paths[] = $new_path; |
|
323 | + $paths[] = $new_path; |
|
324 | 324 | $visited[$spouse->xref()] = true; |
325 | 325 | } |
326 | 326 | } |
@@ -334,7 +334,7 @@ discard block |
||
334 | 334 | return $new_path; |
335 | 335 | } |
336 | 336 | |
337 | - $paths[] = $new_path; |
|
337 | + $paths[] = $new_path; |
|
338 | 338 | $visited[$child->xref()] = true; |
339 | 339 | } |
340 | 340 | } |
@@ -353,7 +353,7 @@ discard block |
||
353 | 353 | return $new_path; |
354 | 354 | } |
355 | 355 | |
356 | - $paths[] = $new_path; |
|
356 | + $paths[] = $new_path; |
|
357 | 357 | $visited[$spouse->xref()] = true; |
358 | 358 | } |
359 | 359 | } |
@@ -367,7 +367,7 @@ discard block |
||
367 | 367 | return $new_path; |
368 | 368 | } |
369 | 369 | |
370 | - $paths[] = $new_path; |
|
370 | + $paths[] = $new_path; |
|
371 | 371 | $visited[$child->xref()] = true; |
372 | 372 | } |
373 | 373 | } |
@@ -73,7 +73,7 @@ |
||
73 | 73 | return new Menu( |
74 | 74 | $this->getTitle(), |
75 | 75 | route('descendants', ['ged' => $individual->tree()->name(), |
76 | - 'xref' => $individual->xref(), |
|
76 | + 'xref' => $individual->xref(), |
|
77 | 77 | ]), |
78 | 78 | 'menu-chart-descendants', |
79 | 79 | ['rel' => 'nofollow'] |