Completed
Pull Request — master (#1882)
by Rico
18:58 queued 10:07
created
resources/views/admin/map-import-form.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -55,11 +55,11 @@  discard block
 block discarded – undo
55 55
 			</legend>
56 56
 			<div class="col-sm-8">
57 57
 				<?= Bootstrap4::radioButtons(
58
-					'cleardatabase',
59
-					[I18N::translate('no'), I18N::translate('yes')],
60
-					'0',
61
-					true
62
-				) ?>
58
+                    'cleardatabase',
59
+                    [I18N::translate('no'), I18N::translate('yes')],
60
+                    '0',
61
+                    true
62
+                ) ?>
63 63
 			</div>
64 64
 		</div>
65 65
 	</fieldset>
@@ -72,14 +72,14 @@  discard block
 block discarded – undo
72 72
 			</legend>
73 73
 			<div class="col-sm-8">
74 74
 				<?= Bootstrap4::select(
75
-					[
76
-						'addupdate' => I18N::translate('Add new, and update existing records'),
77
-						'add'	   => I18N::translate('Only add new records'),
78
-						'update'	=> I18N::translate('Only update existing records'),
79
-					],
80
-					'0',
81
-					['id' => 'import-options', 'name' => 'import-options']
82
-				) ?>
75
+                    [
76
+                        'addupdate' => I18N::translate('Add new, and update existing records'),
77
+                        'add'	   => I18N::translate('Only add new records'),
78
+                        'update'	=> I18N::translate('Only update existing records'),
79
+                    ],
80
+                    '0',
81
+                    ['id' => 'import-options', 'name' => 'import-options']
82
+                ) ?>
83 83
 			</div>
84 84
 		</div>
85 85
 	</fieldset>
Please login to merge, or discard this patch.
resources/views/admin/locations.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -75,27 +75,27 @@  discard block
 block discarded – undo
75 75
 			<a class="btn btn-primary" href="<?= e(route('map-data', ['parent_id' => $parent_id])) ?>">
76 76
 				<?= FontAwesome::decorativeIcon('add') ?>
77 77
 				<?= /* I18N: A button label. */
78
-				I18N::translate('add place') ?>
78
+                I18N::translate('add place') ?>
79 79
 			</a>
80 80
 			<button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenuButton"
81 81
 					data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
82 82
 				<?= FontAwesome::decorativeIcon('download') ?>
83 83
 				<?= /* I18N: A button label. */
84
-				I18N::translate('export file') ?>
84
+                I18N::translate('export file') ?>
85 85
 			</button>
86 86
 			<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
87 87
 				<a class="dropdown-item" href="<?= e(route('locations-export', ['parent_id' => $parent_id, 'format' => 'csv'])) ?>">
88 88
                     csv
89 89
 				</a>
90 90
 				<a class="dropdown-item" href="<?= e(route('locations-export', ['parent_id' => $parent_id, 'format' => 'geojson']
91
-				)) ?>">
91
+                )) ?>">
92 92
                     geoJSON
93 93
 				</a>
94 94
 			</div>
95 95
 			<a class="btn btn-primary" href="<?= e(route('locations-import', ['parent_id' => $parent_id])) ?>">
96 96
                 <?= FontAwesome::decorativeIcon('upload') ?>
97 97
 				<?= /* I18N: A button label. */
98
-				I18N::translate('import file') ?>
98
+                I18N::translate('import file') ?>
99 99
 			</a>
100 100
 		</td>
101 101
 	</tr>
@@ -111,16 +111,16 @@  discard block
 block discarded – undo
111 111
 		</label>
112 112
 		<div class="col-sm-6">
113 113
 			<?= Bootstrap4::select(
114
-				Tree::getNameList(),
115
-				'',
116
-				['id' => 'ged', 'name' => 'ged']
117
-			) ?>
114
+                Tree::getNameList(),
115
+                '',
116
+                ['id' => 'ged', 'name' => 'ged']
117
+            ) ?>
118 118
 		</div>
119 119
 		<div class="col-sm-2">
120 120
 			<button type="submit" class="btn btn-primary">
121 121
                 <?= view('icons/upload') ?>
122 122
 				<?= /* I18N: A button label. */
123
-				I18N::translate('import') ?>
123
+                I18N::translate('import') ?>
124 124
 			</button>
125 125
 		</div>
126 126
 	</div>
Please login to merge, or discard this patch.
resources/views/edit-account-page.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 		</label>
75 75
 		<div class="col-sm-9 wt-page-options-value">
76 76
 			<?= FunctionsEdit::formControlIndividual($tree, $default_individual, ['id' => 'root-id',
77
- 'name' => 'root_id', 'aria-describedby' => 'root-id-description']) ?>
77
+    'name' => 'root_id', 'aria-describedby' => 'root-id-description']) ?>
78 78
 			<p class="small text-muted" id="root-id-description">
79 79
 				<?= I18N::translate('This individual will be selected by default when viewing charts and reports.') ?>
80 80
 			</p>
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 				<?= Bootstrap4::select($themes, $user->getPreference('theme'), ['id' => 'theme', 'name' => 'theme', 'aria-describedby' => 'theme-description']) ?>
150 150
 				<p class="small text-muted" id="theme-description">
151 151
 					<?= /* I18N: Help text for the "Default theme" site configuration setting */
152
-					I18N::translate('You can change the appearance of webtrees using “themes”. Each theme has a different style, layout, color scheme, etc.') ?>
152
+                    I18N::translate('You can change the appearance of webtrees using “themes”. Each theme has a different style, layout, color scheme, etc.') ?>
153 153
 				</p>
154 154
 			</div>
155 155
 		</div>
Please login to merge, or discard this patch.
app/Config.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -241,7 +241,7 @@
 block discarded – undo
241 241
             ],
242 242
             'CEME'     => [
243 243
                 // CEME is NOT a valid 5.5.1 tag
244
-               //'BURI',
244
+                //'BURI',
245 245
             ],
246 246
             'RELA'     => [
247 247
                 'ASSO',
Please login to merge, or discard this patch.
app/Functions/FunctionsPrint.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -345,10 +345,10 @@
 block discarded – undo
345 345
         }
346 346
         // print gedcom ages
347 347
         foreach ([
348
-             I18N::translate('Age')     => $fact_age,
349
-             I18N::translate('Husband') => $husb_age,
350
-             I18N::translate('Wife')    => $wife_age,
351
-         ] as $label => $age) {
348
+                I18N::translate('Age')     => $fact_age,
349
+                I18N::translate('Husband') => $husb_age,
350
+                I18N::translate('Wife')    => $wife_age,
351
+            ] as $label => $age) {
352 352
             if ($age != '') {
353 353
                 $html .= ' <span class="label">' . $label . ':</span> <span class="age">' . FunctionsDate::getAgeAtEvent($age) . '</span>';
354 354
             }
Please login to merge, or discard this patch.
app/Http/Controllers/HomePageController.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -840,9 +840,9 @@
 block discarded – undo
840 840
         }
841 841
 
842 842
         foreach ([
843
-             'main' => $main_blocks,
844
-             'side' => $side_blocks,
845
-         ] as $location => $updated_blocks) {
843
+                'main' => $main_blocks,
844
+                'side' => $side_blocks,
845
+            ] as $location => $updated_blocks) {
846 846
             foreach ($updated_blocks as $block_order => $block_id) {
847 847
                 if (is_numeric($block_id)) {
848 848
                     // Updated block
Please login to merge, or discard this patch.
resources/views/admin/clean-data.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -13,18 +13,18 @@
 block discarded – undo
13 13
 	<?= csrf_field() ?>
14 14
 	<ul class="fa-ul">
15 15
 		<?php
16
-		foreach ($entries as $entry) {
17
-			if (in_array($entry, $protected)) {
18
-				echo '<li><span class="fa-li">' . view('icons/ban') . '</span>', e($entry), '</li>';
19
-			} else {
20
-				echo '<li><span class="fa-li">' . view('icons/delete') . '</span>';
21
-				echo '<label>';
22
-				echo '<input type="checkbox" name="to_delete[]" value="', e($entry), '"> ';
23
-				echo e($entry);
24
-				echo '</label></li>';
25
-			}
26
-		}
27
-		?>
16
+        foreach ($entries as $entry) {
17
+            if (in_array($entry, $protected)) {
18
+                echo '<li><span class="fa-li">' . view('icons/ban') . '</span>', e($entry), '</li>';
19
+            } else {
20
+                echo '<li><span class="fa-li">' . view('icons/delete') . '</span>';
21
+                echo '<label>';
22
+                echo '<input type="checkbox" name="to_delete[]" value="', e($entry), '"> ';
23
+                echo e($entry);
24
+                echo '</label></li>';
25
+            }
26
+        }
27
+        ?>
28 28
 	</ul>
29 29
 
30 30
 	<button class="btn btn-danger" type="submit">
Please login to merge, or discard this patch.
resources/views/modules/faq/config.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
 
8 8
 <p>
9 9
 	<?= /* I18N: FAQ = “Frequently Asked Question” */
10
-	I18N::translate('FAQs are lists of questions and answers, which allow you to explain the site’s rules, policies, and procedures to your visitors. Questions are typically concerned with privacy, copyright, user-accounts, unsuitable content, requirement for source-citations, etc.') ?>
10
+    I18N::translate('FAQs are lists of questions and answers, which allow you to explain the site’s rules, policies, and procedures to your visitors. Questions are typically concerned with privacy, copyright, user-accounts, unsuitable content, requirement for source-citations, etc.') ?>
11 11
 	<?= I18N::translate('You may use HTML to format the answer and to add links to other websites.') ?>
12 12
 </p>
13 13
 
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 	<a href="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminEdit', 'ged' => $tree->getName()])) ?>" class="btn btn-link">
29 29
         <?= view('icons/add') ?>
30 30
 		<?= /* I18N: FAQ = “Frequently Asked Question” */
31
-		I18N::translate('Add an FAQ') ?>
31
+        I18N::translate('Add an FAQ') ?>
32 32
 	</a>
33 33
 </p>
34 34
 
Please login to merge, or discard this patch.
resources/views/admin/site-preferences.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -14,17 +14,17 @@  discard block
 block discarded – undo
14 14
 	<div class="row form-group">
15 15
 		<label for="INDEX_DIRECTORY" class="col-sm-3 col-form-label">
16 16
 			<?= /* I18N: A configuration setting */
17
-			I18N::translate('Data folder') ?>
17
+            I18N::translate('Data folder') ?>
18 18
 		</label>
19 19
 		<div class="col-sm-9">
20 20
 			<input type="text" class="form-control" dir="ltr" id="INDEX_DIRECTORY" name="INDEX_DIRECTORY" value="<?= e(Site::getPreference('INDEX_DIRECTORY')) ?>" maxlength="255" placeholder="data/" required>
21 21
 			<p class="small text-muted">
22 22
 				<?= /* I18N: Help text for the "Data folder" site configuration setting */
23
-				I18N::translate('This folder will be used by webtrees to store media files, GEDCOM files, temporary files, etc. These files may contain private data, and should not be made available over the internet.') ?>
23
+                I18N::translate('This folder will be used by webtrees to store media files, GEDCOM files, temporary files, etc. These files may contain private data, and should not be made available over the internet.') ?>
24 24
 			</p>
25 25
 			<p class="small text-muted">
26 26
 				<?= /* I18N: “Apache” is a software program. */
27
-				I18N::translate('To protect this private data, webtrees uses an Apache configuration file (.htaccess) which blocks all access to this folder. If your web-server does not support .htaccess files, and you cannot restrict access to this folder, then you can select another folder, away from your web documents.') ?>
27
+                I18N::translate('To protect this private data, webtrees uses an Apache configuration file (.htaccess) which blocks all access to this folder. If your web-server does not support .htaccess files, and you cannot restrict access to this folder, then you can select another folder, away from your web documents.') ?>
28 28
 			</p>
29 29
 			<p class="small text-muted">
30 30
 				<?= I18N::translate('If you select a different folder, you must also move all files (except config.ini.php, index.php, and .htaccess) from the existing folder to the new folder.') ?>
@@ -39,13 +39,13 @@  discard block
 block discarded – undo
39 39
 	<div class="row form-group">
40 40
 		<label for="MEMORY_LIMIT" class="col-sm-3 col-form-label">
41 41
 			<?= /* I18N: A configuration setting */
42
-			I18N::translate('Memory limit') ?>
42
+            I18N::translate('Memory limit') ?>
43 43
 		</label>
44 44
 		<div class="col-sm-9">
45 45
 			<input type="text" class="form-control" id="MEMORY_LIMIT" name="MEMORY_LIMIT" value="<?= e(Site::getPreference('MEMORY_LIMIT')) ?>" pattern="[0-9]+[KMG]" placeholder="<?= get_cfg_var('memory_limit') ?>" maxlength="255">
46 46
 			<p class="small text-muted">
47 47
 				<?= /* I18N: %s is an amount of memory, such as 32MB */
48
-				I18N::translate('By default, your server allows scripts to use %s of memory.', get_cfg_var('memory_limit')) ?>
48
+                I18N::translate('By default, your server allows scripts to use %s of memory.', get_cfg_var('memory_limit')) ?>
49 49
 				<?= I18N::translate('You can request a higher or lower limit, although the server may ignore this request.') ?>
50 50
 				<?= I18N::translate('Leave this blank to use the default value.') ?>
51 51
 			</p>
@@ -56,16 +56,16 @@  discard block
 block discarded – undo
56 56
 	<div class="row form-group">
57 57
 		<label for="MAX_EXECUTION_TIME" class="col-sm-3 col-form-label">
58 58
 			<?= /* I18N: A configuration setting */
59
-			I18N::translate('PHP time limit') ?>
59
+            I18N::translate('PHP time limit') ?>
60 60
 		</label>
61 61
 		<div class="col-sm-9">
62 62
 			<input type="text" class="form-control" id="MAX_EXECUTION_TIME" name="MAX_EXECUTION_TIME" value="<?= e(Site::getPreference('MAX_EXECUTION_TIME')) ?>" pattern="[0-9]*" placeholder="<?= get_cfg_var('max_execution_time') ?>" maxlength="255">
63 63
 			<p class="small text-muted">
64 64
 				<?= I18N::plural(
65
-					'By default, your server allows scripts to run for %s second.',
66
-					'By default, your server allows scripts to run for %s seconds.',
67
-					get_cfg_var('max_execution_time'), I18N::number((float) get_cfg_var('max_execution_time')));
68
-				?>
65
+                    'By default, your server allows scripts to run for %s second.',
66
+                    'By default, your server allows scripts to run for %s seconds.',
67
+                    get_cfg_var('max_execution_time'), I18N::number((float) get_cfg_var('max_execution_time')));
68
+                ?>
69 69
 				<?= I18N::translate('You can request a higher or lower limit, although the server may ignore this request.') ?>
70 70
 				<?= I18N::translate('Leave this blank to use the default value.') ?>
71 71
 			</p>
@@ -89,13 +89,13 @@  discard block
 block discarded – undo
89 89
 	<div class="row form-group">
90 90
 		<label for="THEME_DIR" class="col-sm-3 col-form-label">
91 91
 			<?= /* I18N: A configuration setting */
92
-			I18N::translate('Default theme') ?>
92
+            I18N::translate('Default theme') ?>
93 93
 		</label>
94 94
 		<div class="col-sm-9">
95 95
 			<?= Bootstrap4::select($all_themes, Site::getPreference('THEME_DIR'), ['id' => 'THEME_DIR', 'name' => 'THEME_DIR']) ?>
96 96
 			<p class="small text-muted">
97 97
 				<?= /* I18N: Help text for the "Default theme" site configuration setting */
98
-				I18N::translate('You can change the appearance of webtrees using “themes”. Each theme has a different style, layout, color scheme, etc.') ?>
98
+                I18N::translate('You can change the appearance of webtrees using “themes”. Each theme has a different style, layout, color scheme, etc.') ?>
99 99
 			</p>
100 100
 			<p class="small text-muted">
101 101
 				<?= I18N::translate('Themes can be selected at three levels: user, family tree, and website. User preferences take priority over family tree preferences, which in turn take priority over the website preferences. Selecting “default theme” at one level will use the theme at the next level.') ?>
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 		<div class="row">
109 109
 			<legend class="col-form-label col-sm-3">
110 110
 				<?= /* I18N: A configuration setting */
111
-				I18N::translate('Allow users to select their own theme') ?>
111
+                I18N::translate('Allow users to select their own theme') ?>
112 112
 			</legend>
113 113
 			<div class="col-sm-9">
114 114
 				<?= Bootstrap4::radioButtons('ALLOW_USER_THEMES', FunctionsEdit::optionsNoYes(), (string) (int) Site::getPreference('ALLOW_USER_THEMES'), true) ?>
@@ -121,13 +121,13 @@  discard block
 block discarded – undo
121 121
 		<div class="row">
122 122
 			<legend class="col-form-label col-sm-3">
123 123
 				<?= /* I18N: A configuration setting */
124
-				I18N::translate('Show list of family trees') ?>
124
+                I18N::translate('Show list of family trees') ?>
125 125
 			</legend>
126 126
 			<div class="col-sm-9">
127 127
 				<?= Bootstrap4::radioButtons('ALLOW_CHANGE_GEDCOM', FunctionsEdit::optionsNoYes(), (string) (int) Site::getPreference('ALLOW_CHANGE_GEDCOM'), true) ?>
128 128
 				<p class="small text-muted">
129 129
 					<?= /* I18N: Help text for the “Show list of family trees” site configuration setting */
130
-					I18N::translate('For websites with more than one family tree, this option will show the list of family trees in the main menu, the search pages, etc.') ?>
130
+                    I18N::translate('For websites with more than one family tree, this option will show the list of family trees in the main menu, the search pages, etc.') ?>
131 131
 				</p>
132 132
 			</div>
133 133
 		</div>
Please login to merge, or discard this patch.