@@ -102,9 +102,9 @@ |
||
102 | 102 | ->groupBy(['century', 'sex']); |
103 | 103 | |
104 | 104 | return $male->unionAll($female) |
105 | - ->orderBy('century') |
|
106 | - ->get() |
|
107 | - ->all(); |
|
105 | + ->orderBy('century') |
|
106 | + ->get() |
|
107 | + ->all(); |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | /** |
@@ -233,7 +233,8 @@ discard block |
||
233 | 233 | <li class="wt-initials-list-item d-flex"> |
234 | 234 | <?php if ($count > 0) : ?> |
235 | 235 | <a href="<?= e(route('module', ['module' => $module, 'action' => $action, 'alpha' => $letter, 'ged' => $tree->name()])) ?>" class="wt-initial px-1<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a> |
236 | - <?php else : ?> |
|
236 | + <?php else { |
|
237 | + : ?> |
|
237 | 238 | <span class="wt-initial px-1 text-muted"><?= $this->surnameInitial((string) $letter) ?></span> |
238 | 239 | |
239 | 240 | <?php endif ?> |
@@ -287,6 +288,7 @@ discard block |
||
287 | 288 | |
288 | 289 | if ($show === 'indi' || $show === 'surn') { |
289 | 290 | $surns = $this->individual_list_service->surnames($surname, $alpha, $show_marnm === 'yes', $families, WT_LOCALE, I18N::collation()); |
291 | +} |
|
290 | 292 | if ($show === 'surn') { |
291 | 293 | // Show the surname list |
292 | 294 | switch ($tree->getPreference('SURNAME_LIST_STYLE')) { |
@@ -322,10 +322,10 @@ |
||
322 | 322 | } |
323 | 323 | // print gedcom ages |
324 | 324 | foreach ([ |
325 | - I18N::translate('Age') => $fact_age, |
|
326 | - I18N::translate('Husband') => $husb_age, |
|
327 | - I18N::translate('Wife') => $wife_age, |
|
328 | - ] as $label => $age) { |
|
325 | + I18N::translate('Age') => $fact_age, |
|
326 | + I18N::translate('Husband') => $husb_age, |
|
327 | + I18N::translate('Wife') => $wife_age, |
|
328 | + ] as $label => $age) { |
|
329 | 329 | if ($age !== '') { |
330 | 330 | $html .= ' <span class="label">' . $label . ':</span> <span class="age">' . FunctionsDate::getAgeAtEvent($age) . '</span>'; |
331 | 331 | } |
@@ -1,4 +1,4 @@ |
||
1 | 1 | <?php return array ( |
2 | - '%H:%i:%s' => '%g:%i:%s %a', |
|
3 | - '%j %F %Y' => '%F %j, %Y', |
|
2 | + '%H:%i:%s' => '%g:%i:%s %a', |
|
3 | + '%j %F %Y' => '%F %j, %Y', |
|
4 | 4 | ); |
@@ -13,7 +13,8 @@ |
||
13 | 13 | use Fisharebest\Webtrees\Services\ServerCheckService; |
14 | 14 | use Illuminate\Database\Capsule\Manager as DB; |
15 | 15 | |
16 | -return new class extends AbstractModule implements ModuleCustomInterface { |
|
16 | +return new class extends AbstractModule implements ModuleCustomInterface |
|
17 | +{ |
|
17 | 18 | use ModuleCustomTrait; |
18 | 19 | |
19 | 20 | /** @var ServerCheckService */ |
@@ -15,7 +15,8 @@ |
||
15 | 15 | use Fisharebest\Webtrees\Module\ModuleCustomTrait; |
16 | 16 | use Fisharebest\Webtrees\Tree; |
17 | 17 | |
18 | -return new class extends AbstractModule implements ModuleCustomInterface { |
|
18 | +return new class extends AbstractModule implements ModuleCustomInterface |
|
19 | +{ |
|
19 | 20 | use ModuleCustomTrait; |
20 | 21 | |
21 | 22 | /** |
@@ -13,7 +13,8 @@ |
||
13 | 13 | use Fisharebest\Webtrees\Module\ModuleCustomTrait; |
14 | 14 | use Fisharebest\Webtrees\View; |
15 | 15 | |
16 | -return new class extends MinimalTheme implements ModuleCustomInterface { |
|
16 | +return new class extends MinimalTheme implements ModuleCustomInterface |
|
17 | +{ |
|
17 | 18 | use ModuleCustomTrait; |
18 | 19 | |
19 | 20 | /** |