Completed
Pull Request — master (#1904)
by Rico
09:54
created
app/MediaFile.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -224,10 +224,10 @@
 block discarded – undo
224 224
             $src    = $this->imageUrl($width, $height, $fit);
225 225
             $srcset = [];
226 226
             foreach ([
227
-                         2,
228
-                         3,
229
-                         4,
230
-                     ] as $x) {
227
+                            2,
228
+                            3,
229
+                            4,
230
+                        ] as $x) {
231 231
                 $srcset[] = $this->imageUrl($width * $x, $height * $x, $fit) . ' ' . $x . 'x';
232 232
             }
233 233
         }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-declare(strict_types = 1);
2
+declare(strict_types=1);
3 3
 /**
4 4
  * webtrees: online genealogy
5 5
  * Copyright (C) 2018 webtrees development team
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
343 343
     public function fileSizeKB(): string
344 344
     {
345 345
         $size = $this->fileSizeBytes();
346
-        $size = (int)(($size + 1023) / 1024);
346
+        $size = (int) (($size + 1023) / 1024);
347 347
 
348 348
         /* I18N: size of file in KB */
349 349
         return I18N::translate('%s KB', I18N::number($size));
Please login to merge, or discard this patch.
resources/views/admin/users-edit.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -181,7 +181,7 @@
 block discarded – undo
181 181
 			<?= Bootstrap4::select($contact_methods, $user->getPreference('contactmethod'), ['id' => 'contact_method', 'name' => 'contact_method']) ?>
182 182
 			<p class="small text-muted">
183 183
 				<?= /* I18N: Help text for the “Preferred contact method” configuration setting */
184
-				I18N::translate('Site members can send each other messages. You can choose to how these messages are sent to you, or choose not receive them at all.') ?>
184
+                I18N::translate('Site members can send each other messages. You can choose to how these messages are sent to you, or choose not receive them at all.') ?>
185 185
 			</p>
186 186
 		</div>
187 187
 	</div>
Please login to merge, or discard this patch.
resources/views/admin/trees-places.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 	</dl>
29 29
 
30 30
 	<button class="btn btn-primary" type="submit" value="preview"><?= /* I18N: A button label. */
31
-		I18N::translate('preview') ?></button>
31
+        I18N::translate('preview') ?></button>
32 32
 </form>
33 33
 
34 34
 <?php if ($search && $replace): ?>
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 		<form method="post" action="<?= e(route('admin-trees-places', ['ged' => $tree->getName(), 'search' => $search, 'replace' => $replace])) ?>">
53 53
 			<?= csrf_field() ?>
54 54
 			<button class="btn btn-primary" type="submit" value="update" name="confirm"><?= /* I18N: A button label. */
55
-				I18N::translate('update') ?></button>
55
+                I18N::translate('update') ?></button>
56 56
 		</form>
57 57
 	<?php endif ?>
58 58
 <?php endif ?>
Please login to merge, or discard this patch.
resources/views/admin/control-panel.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 
21 21
 		<p class="card-text">
22 22
 			<?= /* I18N: %s is a URL/link to the project website */
23
-			I18N::translate('Support and documentation can be found at %s.', '<a href="https://webtrees.net/">webtrees.net</a>') ?>
23
+            I18N::translate('Support and documentation can be found at %s.', '<a href="https://webtrees.net/">webtrees.net</a>') ?>
24 24
 		</p>
25 25
 		<p class="card-text ">
26 26
 			<?php if ($latest_version === ''): ?>
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 				<?= I18N::translate('A new version of webtrees is available.') ?>
30 30
 				<a href="<?= e(route('upgrade')) ?>" class="error">
31 31
 					<?= /* I18N: %s is a version number */
32
-					I18N::translate('Upgrade to webtrees %s.', e($latest_version)) ?>
32
+                    I18N::translate('Upgrade to webtrees %s.', e($latest_version)) ?>
33 33
 				</a>
34 34
 			<?php else: ?>
35 35
 				<?= I18N::translate('This is the latest version of webtrees. No upgrade is available.') ?>
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -30,7 +30,8 @@  discard block
 block discarded – undo
30 30
 					<?= /* I18N: %s is a version number */
31 31
 					I18N::translate('Upgrade to webtrees %s.', e($latest_version)) ?>
32 32
 				</a>
33
-			<?php else: ?>
33
+			<?php else {
34
+    : ?>
34 35
 				<?= I18N::translate('This is the latest version of webtrees. No upgrade is available.') ?>
35 36
 			<?php endif ?>
36 37
 		</p>
@@ -134,7 +135,9 @@  discard block
 block discarded – undo
134 135
                     'repositories' => $repositories,
135 136
                     'media'        => $media,
136 137
                     'notes'        => $notes,
137
-                ]); ?>
138
+                ]);
139
+}
140
+?>
138 141
 			</tbody>
139 142
 			<tfoot>
140 143
 				<tr>
Please login to merge, or discard this patch.
resources/views/admin/trees-privacy.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -106,12 +106,12 @@
 block discarded – undo
106 106
 			</legend>
107 107
 			<div class="col-sm-8">
108 108
 				<?php
109
-				echo
110
-					/* I18N: Extend privacy to dead individuals who were… */ I18N::translate(
111
-					'born in the last %1$s years or died in the last %2$s years',
112
-					'<input type="text" name="KEEP_ALIVE_YEARS_BIRTH" value="' . $tree->getPreference('KEEP_ALIVE_YEARS_BIRTH') . '" size="5" maxlength="3">',
113
-					'<input type="text" name="KEEP_ALIVE_YEARS_DEATH" value="' . $tree->getPreference('KEEP_ALIVE_YEARS_DEATH') . '" size="5" maxlength="3">'
114
-				) ?>
109
+                echo
110
+                    /* I18N: Extend privacy to dead individuals who were… */ I18N::translate(
111
+                    'born in the last %1$s years or died in the last %2$s years',
112
+                    '<input type="text" name="KEEP_ALIVE_YEARS_BIRTH" value="' . $tree->getPreference('KEEP_ALIVE_YEARS_BIRTH') . '" size="5" maxlength="3">',
113
+                    '<input type="text" name="KEEP_ALIVE_YEARS_DEATH" value="' . $tree->getPreference('KEEP_ALIVE_YEARS_DEATH') . '" size="5" maxlength="3">'
114
+                ) ?>
115 115
 				<p class="small text-muted">
116 116
 					<?= /* I18N: Help text for the “Extend privacy to dead individuals” configuration setting */ I18N::translate('In some countries, privacy laws apply not only to living individuals, but also to those who have died recently. This option will allow you to extend the privacy rules for living individuals to those who were born or died within a specified number of years. Leave these values empty to disable this feature.') ?>
117 117
 				</p>
Please login to merge, or discard this patch.
resources/views/admin/control-panel-manager.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
 	<div class="card-body">
17 17
 		<p>
18 18
 			<?= /* I18N: %s is a URL/link to the project website */
19
-			I18N::translate('Support and documentation can be found at %s.', '<a href="https://webtrees.net/">webtrees.net</a>') ?>
19
+            I18N::translate('Support and documentation can be found at %s.', '<a href="https://webtrees.net/">webtrees.net</a>') ?>
20 20
 		</p>
21 21
 	</div>
22 22
 </div>
Please login to merge, or discard this patch.
resources/views/admin/trees-merge.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -31,10 +31,10 @@
 block discarded – undo
31 31
 	<?= csrf_field() ?>
32 32
 	<p class="form-inline">
33 33
 		<?= I18N::translate(/* I18N: Copy all the records from [family tree 1] into [family tree 2] */
34
-			'Copy all the records from %1$s into %2$s.',
35
-			Bootstrap4::select($tree_list, $tree1 ? $tree1->getName() : '', ['name' => 'tree1_name']),
36
-			Bootstrap4::select($tree_list, $tree2 ? $tree2->getName() : '', ['name' => 'tree2_name'])
37
-		) ?>
34
+            'Copy all the records from %1$s into %2$s.',
35
+            Bootstrap4::select($tree_list, $tree1 ? $tree1->getName() : '', ['name' => 'tree1_name']),
36
+            Bootstrap4::select($tree_list, $tree2 ? $tree2->getName() : '', ['name' => 'tree2_name'])
37
+        ) ?>
38 38
 	</p>
39 39
 
40 40
 	<button type="submit" class="btn btn-primary">
Please login to merge, or discard this patch.
resources/views/search-advanced-page.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@
 block discarded – undo
65 65
 		<div class="row form-group my-3">
66 66
 			<div class="form-row mx-auto">
67 67
 				<input type="submit" class="btn btn-primary" value="<?= /* I18N: A button label. */
68
-				I18N::translate('search') ?>">
68
+                I18N::translate('search') ?>">
69 69
 			</div>
70 70
 		</div>
71 71
 	</form>
Please login to merge, or discard this patch.
resources/views/descendants-page.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
 		<div class="col-form-label col-sm-3 wt-page-options-label"></div>
44 44
 		<div class="col-sm-9 wt-page-options-value">
45 45
 			<input class="btn btn-primary" type="submit" value="<?= /* I18N: A button label. */
46
-			I18N::translate('view') ?>">
46
+            I18N::translate('view') ?>">
47 47
 		</div>
48 48
 	</div>
49 49
 </form>
Please login to merge, or discard this patch.