@@ -39,45 +39,45 @@ |
||
39 | 39 | <!-- Parents --> |
40 | 40 | <?php foreach ($parent_families as $family): ?> |
41 | 41 | <?= view('modules/relatives/family', [ |
42 | - 'individual' => $individual, |
|
43 | - 'family' => $family, |
|
44 | - 'type' => 'FAMC', |
|
45 | - 'label' => $individual->getChildFamilyLabel($family), |
|
46 | - 'fam_access_level' => $fam_access_level, |
|
47 | - ]) ?> |
|
42 | + 'individual' => $individual, |
|
43 | + 'family' => $family, |
|
44 | + 'type' => 'FAMC', |
|
45 | + 'label' => $individual->getChildFamilyLabel($family), |
|
46 | + 'fam_access_level' => $fam_access_level, |
|
47 | + ]) ?> |
|
48 | 48 | <?php endforeach ?> |
49 | 49 | |
50 | 50 | <!-- step-parents --> |
51 | 51 | <?php foreach ($step_parent_families as $family): ?> |
52 | 52 | <?= view('modules/relatives/family', [ |
53 | - 'individual' => $individual, |
|
54 | - 'family' => $family, |
|
55 | - 'type' => 'FAMC', |
|
56 | - 'label' => $individual->getStepFamilyLabel($family), |
|
57 | - 'fam_access_level' => $fam_access_level, |
|
58 | - ]) ?> |
|
53 | + 'individual' => $individual, |
|
54 | + 'family' => $family, |
|
55 | + 'type' => 'FAMC', |
|
56 | + 'label' => $individual->getStepFamilyLabel($family), |
|
57 | + 'fam_access_level' => $fam_access_level, |
|
58 | + ]) ?> |
|
59 | 59 | <?php endforeach ?> |
60 | 60 | |
61 | 61 | <!-- spouses --> |
62 | 62 | <?php foreach ($spouse_families as $family): ?> |
63 | 63 | <?= view('modules/relatives/family', [ |
64 | - 'individual' => $individual, |
|
65 | - 'family' => $family, |
|
66 | - 'type' => 'FAMS', |
|
67 | - 'label' => $individual->getSpouseFamilyLabel($family), |
|
68 | - 'fam_access_level' => $fam_access_level, |
|
69 | - ]) ?> |
|
64 | + 'individual' => $individual, |
|
65 | + 'family' => $family, |
|
66 | + 'type' => 'FAMS', |
|
67 | + 'label' => $individual->getSpouseFamilyLabel($family), |
|
68 | + 'fam_access_level' => $fam_access_level, |
|
69 | + ]) ?> |
|
70 | 70 | <?php endforeach ?> |
71 | 71 | |
72 | 72 | <!-- step-children --> |
73 | 73 | <?php foreach ($step_child_familiess as $family): ?> |
74 | 74 | <?= view('modules/relatives/family', [ |
75 | - 'individual' => $individual, |
|
76 | - 'family' => $family, |
|
77 | - 'type' => 'FAMS', |
|
78 | - 'label' => $family->getFullName(), |
|
79 | - 'fam_access_level' => $fam_access_level, |
|
80 | - ]) ?> |
|
75 | + 'individual' => $individual, |
|
76 | + 'family' => $family, |
|
77 | + 'type' => 'FAMS', |
|
78 | + 'label' => $family->getFullName(), |
|
79 | + 'fam_access_level' => $fam_access_level, |
|
80 | + ]) ?> |
|
81 | 81 | <?php endforeach ?> |
82 | 82 | |
83 | 83 | <?php if ($can_edit): ?> |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | </legend> |
9 | 9 | <div class="col-sm-9"> |
10 | 10 | <?= Bootstrap4::checkbox(/* I18N: label for yes/no option */ |
11 | - I18N::translate('Show date of last update'), false, ['name' => 'show_last_update', 'checked' => (bool) $show_last_update]) ?> |
|
11 | + I18N::translate('Show date of last update'), false, ['name' => 'show_last_update', 'checked' => (bool) $show_last_update]) ?> |
|
12 | 12 | </div> |
13 | 13 | </div> |
14 | 14 | </fieldset> |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | <?= Bootstrap4::checkbox(I18N::translate('Most common surnames'), false, ['name' => 'show_common_surnames', 'checked' => (bool) $show_common_surnames]) ?> |
51 | 51 | <label for="number_of_surnames"> |
52 | 52 | <?= /* I18N: ... to show in a list */ |
53 | - I18N::translate('Number of surnames') ?> |
|
53 | + I18N::translate('Number of surnames') ?> |
|
54 | 54 | <input |
55 | 55 | class="form-control" |
56 | 56 | id="number_of_surnames" |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | <div class="row form-group"> |
35 | 35 | <label for="xref" class="col-sm-3 col-form-label"> |
36 | 36 | <?= /* I18N: Label for a configuration option */ |
37 | - I18N::translate('Show this block for which languages') ?> |
|
37 | + I18N::translate('Show this block for which languages') ?> |
|
38 | 38 | </label> |
39 | 39 | |
40 | 40 | <div class="col-sm-9"> |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | <?= Bootstrap4::select(['' => I18N::translate('All')] + $tree_names, $tree->getName(), ['id' => 'gedcom_id', 'name' => 'gedcom_id']) ?> |
62 | 62 | <p class="small text-muted"> |
63 | 63 | <?= /* I18N: FAQ = “Frequently Asked Question” */ |
64 | - I18N::translate('An FAQ can be displayed on just one of the family trees, or on all the family trees.') ?> |
|
64 | + I18N::translate('An FAQ can be displayed on just one of the family trees, or on all the family trees.') ?> |
|
65 | 65 | </p> |
66 | 66 | </div> |
67 | 67 | </div> |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | <div class="row form-group"> |
16 | 16 | <label class="col-sm-3 col-form-label" for="relationship-ancestors-<?= $tree->getTreeId() ?>"> |
17 | 17 | <?= /* I18N: Configuration option */ |
18 | - I18N::translate('Relationships') ?> |
|
18 | + I18N::translate('Relationships') ?> |
|
19 | 19 | </label> |
20 | 20 | <div class="col-sm-9"> |
21 | 21 | <?= Bootstrap4::select($ancestors_options, $tree->getPreference('RELATIONSHIP_ANCESTORS', $default_ancestors), ['id' => 'relationship-ancestors-' . $tree->getTreeId(), 'name' => 'relationship-ancestors-' . $tree->getTreeId()]) ?> |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | <div class="row"> |
27 | 27 | <legend class="col-form-label col-sm-3"> |
28 | 28 | <?= /* I18N: Configuration option */ |
29 | - I18N::translate('How much recursion to use when searching for relationships') ?> |
|
29 | + I18N::translate('How much recursion to use when searching for relationships') ?> |
|
30 | 30 | </legend> |
31 | 31 | <div class="col-sm-9"> |
32 | 32 | <?= Bootstrap4::radioButtons('relationship-recursion-' . $tree->getTreeId(), $recursion_options, $tree->getPreference('RELATIONSHIP_RECURSION', $default_recursion), true) ?> |
@@ -42,24 +42,24 @@ discard block |
||
42 | 42 | </th> |
43 | 43 | <td class="wt-page-options-value" colspan="3"> |
44 | 44 | <?php |
45 | - for ($n = 1, $months_in_year = $cal_date->monthsInYear(); $n <= $months_in_year; ++$n) { |
|
46 | - $month_name = $cal_date->monthNameNominativeCase($n, $cal_date->isLeapYear()); |
|
47 | - $m = array_search($n, $cal_date::$MONTH_ABBREV); |
|
48 | - if ($n === 6 && $cal_date instanceof JewishDate && !$cal_date->isLeapYear()) { |
|
49 | - // No month 6 in Jewish non-leap years. |
|
50 | - continue; |
|
51 | - } |
|
52 | - if ($n === 7 && $cal_date instanceof JewishDate && !$cal_date->isLeapYear()) { |
|
53 | - // Month 7 is ADR in Jewish non-leap years. |
|
54 | - $m = 'ADR'; |
|
55 | - } |
|
56 | - if ($n === $cal_date->m) { |
|
57 | - $month_name = '<span class="error">' . $month_name . '</span>'; |
|
58 | - } |
|
59 | - echo '<a href="' . e(route('calendar', ['cal' => $cal, 'day' => $cal_date->d, 'month' => $m, 'year' => $cal_date->y, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'month', 'ged' => $tree->getName()])) . '" rel="nofollow">', $month_name, '</a>'; |
|
60 | - echo ' | '; |
|
61 | - } |
|
62 | - ?> |
|
45 | + for ($n = 1, $months_in_year = $cal_date->monthsInYear(); $n <= $months_in_year; ++$n) { |
|
46 | + $month_name = $cal_date->monthNameNominativeCase($n, $cal_date->isLeapYear()); |
|
47 | + $m = array_search($n, $cal_date::$MONTH_ABBREV); |
|
48 | + if ($n === 6 && $cal_date instanceof JewishDate && !$cal_date->isLeapYear()) { |
|
49 | + // No month 6 in Jewish non-leap years. |
|
50 | + continue; |
|
51 | + } |
|
52 | + if ($n === 7 && $cal_date instanceof JewishDate && !$cal_date->isLeapYear()) { |
|
53 | + // Month 7 is ADR in Jewish non-leap years. |
|
54 | + $m = 'ADR'; |
|
55 | + } |
|
56 | + if ($n === $cal_date->m) { |
|
57 | + $month_name = '<span class="error">' . $month_name . '</span>'; |
|
58 | + } |
|
59 | + echo '<a href="' . e(route('calendar', ['cal' => $cal, 'day' => $cal_date->d, 'month' => $m, 'year' => $cal_date->y, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'month', 'ged' => $tree->getName()])) . '" rel="nofollow">', $month_name, '</a>'; |
|
60 | + echo ' | '; |
|
61 | + } |
|
62 | + ?> |
|
63 | 63 | <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => min($cal_date->d, $today->daysInMonth()), 'month' => $today_month, 'year' => $today->y, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'month', 'ged' => $tree->getName()])) ?>" rel="nofollow"> |
64 | 64 | <b><?= $today->format('%F %Y') ?></b> |
65 | 65 | </a> |
@@ -169,16 +169,16 @@ discard block |
||
169 | 169 | </td> |
170 | 170 | <td class="topbottombar width50"> |
171 | 171 | <?php |
172 | - $n = 0; |
|
173 | - foreach (Date::calendarNames() as $newcal => $cal_name) { |
|
174 | - $tmp = $cal_date->convertToCalendar($newcal); |
|
175 | - if ($tmp->inValidRange()) { |
|
176 | - if ($n++) { |
|
177 | - echo ' | '; |
|
178 | - } |
|
179 | - echo '<a ' . (get_class($tmp) === get_class($cal_date) ? 'class="error"' : '') . 'href="' . e(route('calendar', ['cal' => $tmp->format('%@'), 'day' => $tmp->d, 'month' => $tmp->format('%O'), 'year' => $tmp->y, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => $view, 'ged' => $tree->getName()])) . '" rel="nofollow">', $cal_name, '</a>'; |
|
180 | - } |
|
181 | - } ?> |
|
172 | + $n = 0; |
|
173 | + foreach (Date::calendarNames() as $newcal => $cal_name) { |
|
174 | + $tmp = $cal_date->convertToCalendar($newcal); |
|
175 | + if ($tmp->inValidRange()) { |
|
176 | + if ($n++) { |
|
177 | + echo ' | '; |
|
178 | + } |
|
179 | + echo '<a ' . (get_class($tmp) === get_class($cal_date) ? 'class="error"' : '') . 'href="' . e(route('calendar', ['cal' => $tmp->format('%@'), 'day' => $tmp->d, 'month' => $tmp->format('%O'), 'year' => $tmp->y, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => $view, 'ged' => $tree->getName()])) . '" rel="nofollow">', $cal_name, '</a>'; |
|
180 | + } |
|
181 | + } ?> |
|
182 | 182 | </td> |
183 | 183 | </tr> |
184 | 184 | </table> |
@@ -21,10 +21,10 @@ discard block |
||
21 | 21 | <p><?= I18N::translate('No results found.') ?></p> |
22 | 22 | <?php else: ?> |
23 | 23 | <?= view('lists/individuals-table', [ |
24 | - 'individuals' => $indilist, |
|
25 | - 'sosa' => false, |
|
26 | - 'tree' => $tree, |
|
27 | - ]) ?> |
|
24 | + 'individuals' => $indilist, |
|
25 | + 'sosa' => false, |
|
26 | + 'tree' => $tree, |
|
27 | + ]) ?> |
|
28 | 28 | <?php endif ?> |
29 | 29 | </div> |
30 | 30 | |
@@ -33,8 +33,8 @@ discard block |
||
33 | 33 | <p><?= I18N::translate('No results found.') ?></p> |
34 | 34 | <?php else: ?> |
35 | 35 | <?= view('lists/families-table', [ |
36 | - 'families' => $famlist, |
|
37 | - ]) ?> |
|
36 | + 'families' => $famlist, |
|
37 | + ]) ?> |
|
38 | 38 | <?php endif ?> |
39 | 39 | </div> |
40 | 40 | </div> |
@@ -25,7 +25,7 @@ |
||
25 | 25 | <div class="col-sm-3 wt-page-options-label"></div> |
26 | 26 | <div class="col-sm-9 wt-page-options-value"> |
27 | 27 | <input class="btn btn-primary" type="submit" value="<?= /* I18N: A button label. */ |
28 | - I18N::translate('view') ?>"> |
|
28 | + I18N::translate('view') ?>"> |
|
29 | 29 | </div> |
30 | 30 | </div> |
31 | 31 | </form> |
@@ -25,12 +25,12 @@ |
||
25 | 25 | <button class="btn btn-primary" type="submit"> |
26 | 26 | <?= FontAwesome::decorativeIcon('save') ?> |
27 | 27 | <?= /* I18N: A button label. */ |
28 | - I18N::translate('save') ?> |
|
28 | + I18N::translate('save') ?> |
|
29 | 29 | </button> |
30 | 30 | <a class="btn btn-secondary" href="<?= e($individual->url()) ?>"> |
31 | 31 | <?= FontAwesome::decorativeIcon('cancel') ?> |
32 | 32 | <?= /* I18N: A button label. */ |
33 | - I18N::translate('cancel') ?> |
|
33 | + I18N::translate('cancel') ?> |
|
34 | 34 | </a> |
35 | 35 | </div> |
36 | 36 | </div> |
@@ -73,12 +73,12 @@ |
||
73 | 73 | <button class="btn btn-primary" type="submit"> |
74 | 74 | <?= FontAwesome::decorativeIcon('save') ?> |
75 | 75 | <?= /* I18N: A button label. */ |
76 | - I18N::translate('save') ?> |
|
76 | + I18N::translate('save') ?> |
|
77 | 77 | </button> |
78 | 78 | <a class="btn btn-secondary" href="<?= e($family->url()) ?>"> |
79 | 79 | <?= FontAwesome::decorativeIcon('cancel') ?> |
80 | 80 | <?= /* I18N: A button label. */ |
81 | - I18N::translate('cancel') ?> |
|
81 | + I18N::translate('cancel') ?> |
|
82 | 82 | </a> |
83 | 83 | </div> |
84 | 84 | </div> |