@@ -102,7 +102,7 @@ |
||
102 | 102 | $breadcrumbs[] = I18N::translate('Add'); |
103 | 103 | } else { |
104 | 104 | $breadcrumbs[] = I18N::translate('Edit'); |
105 | - $title .= ' — ' . I18N::translate('Edit'); |
|
105 | + $title .= ' — ' . I18N::translate('Edit'); |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | return $this->viewResponse('admin/location-edit', [ |
@@ -560,7 +560,7 @@ |
||
560 | 560 | $data = array_map(function (string $thumbnail): array { |
561 | 561 | $original = $this->findOriginalFileFromThumbnail($thumbnail); |
562 | 562 | |
563 | - $original_url = route('unused-media-thumbnail', [ |
|
563 | + $original_url = route('unused-media-thumbnail', [ |
|
564 | 564 | 'folder' => dirname($original), |
565 | 565 | 'file' => basename($original), |
566 | 566 | 'w' => 100, |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | break; |
136 | 136 | |
137 | 137 | case 'DATE': |
138 | - $attributes += [ |
|
138 | + $attributes += [ |
|
139 | 139 | 'type' => 'text', |
140 | 140 | 'value' => $input['default'], |
141 | 141 | 'dir' => 'ltr', |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | default: |
149 | 149 | switch ($input['type']) { |
150 | 150 | case 'text': |
151 | - $attributes += [ |
|
151 | + $attributes += [ |
|
152 | 152 | 'type' => 'text', |
153 | 153 | 'value' => $input['default'], |
154 | 154 | ]; |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | break; |
157 | 157 | |
158 | 158 | case 'checkbox': |
159 | - $attributes += [ |
|
159 | + $attributes += [ |
|
160 | 160 | 'type' => 'checkbox', |
161 | 161 | 'checked' => (bool) $input['default'], |
162 | 162 | ]; |
@@ -59,7 +59,7 @@ |
||
59 | 59 | ]; |
60 | 60 | |
61 | 61 | foreach ($given as $name => $count) { |
62 | - $data[] = [ $name, $count ]; |
|
62 | + $data[] = [$name, $count]; |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | $data[] = [ |
@@ -57,7 +57,7 @@ |
||
57 | 57 | $tot_l |
58 | 58 | ]; |
59 | 59 | |
60 | - $data[] = [ |
|
60 | + $data[] = [ |
|
61 | 61 | I18N::translate('Dead'), |
62 | 62 | $tot_d |
63 | 63 | ]; |
@@ -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 | /** |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | if ($note->canShow()) { |
146 | 146 | $noterec = $note->gedcom(); |
147 | 147 | $nt = preg_match("/0 @$nmatch[1]@ NOTE (.*)/", $noterec, $n1match); |
148 | - $data .= self::printNoteRecord($tree, ($nt > 0) ? $n1match[1] : '', 1, $noterec); |
|
148 | + $data .= self::printNoteRecord($tree, ($nt > 0) ? $n1match[1] : '', 1, $noterec); |
|
149 | 149 | } |
150 | 150 | } else { |
151 | 151 | $data = '<div class="fact_NOTE"><span class="label">' . I18N::translate('Note') . '</span>: <span class="field error">' . $nmatch[1] . '</span></div>'; |
@@ -362,20 +362,20 @@ discard block |
||
362 | 362 | if (preg_match_all('/\n3 (?:_HEB|ROMN) (.+)/', $placerec, $matches)) { |
363 | 363 | foreach ($matches[1] as $match) { |
364 | 364 | $wt_place = new Place($match, $tree); |
365 | - $html .= ' - ' . $wt_place->fullName(); |
|
365 | + $html .= ' - ' . $wt_place->fullName(); |
|
366 | 366 | } |
367 | 367 | } |
368 | 368 | $map_lati = ''; |
369 | 369 | $cts = preg_match('/\d LATI (.*)/', $placerec, $match); |
370 | 370 | if ($cts > 0) { |
371 | 371 | $map_lati = $match[1]; |
372 | - $html .= '<br><span class="label">' . I18N::translate('Latitude') . ': </span>' . $map_lati; |
|
372 | + $html .= '<br><span class="label">' . I18N::translate('Latitude') . ': </span>' . $map_lati; |
|
373 | 373 | } |
374 | 374 | $map_long = ''; |
375 | 375 | $cts = preg_match('/\d LONG (.*)/', $placerec, $match); |
376 | 376 | if ($cts > 0) { |
377 | 377 | $map_long = $match[1]; |
378 | - $html .= ' <span class="label">' . I18N::translate('Longitude') . ': </span>' . $map_long; |
|
378 | + $html .= ' <span class="label">' . I18N::translate('Longitude') . ': </span>' . $map_long; |
|
379 | 379 | } |
380 | 380 | if ($map_lati && $map_long) { |
381 | 381 | $map_lati = trim(strtr($map_lati, 'NSEW,�', ' - -. ')); // S5,6789 ==> -5.6789 |
@@ -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 | } |
@@ -49,7 +49,7 @@ |
||
49 | 49 | */ |
50 | 50 | public function __construct(Tree $tree) |
51 | 51 | { |
52 | - $this->tree = $tree; |
|
52 | + $this->tree = $tree; |
|
53 | 53 | $this->country_service = new CountryService(); |
54 | 54 | } |
55 | 55 |
@@ -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')) { |
@@ -169,7 +169,7 @@ |
||
169 | 169 | 'ged' => $tree->name(), |
170 | 170 | 'show_all' => 'yes', |
171 | 171 | ]; |
172 | - $show = $request->getQueryParams()['show'] ?? 'surn'; |
|
172 | + $show = $request->getQueryParams()['show'] ?? 'surn'; |
|
173 | 173 | } |
174 | 174 | } elseif ($surname) { |
175 | 175 | $alpha = $this->localization_service->initialLetter($surname); // so we can highlight the initial letter |