Skip to content

Commit e32ed03

Browse files
snipesnipe
authored
Merge pull request #16061 from snipe/moved_keywords_on_admin_settings
2 parents e03ed75 + a7543b4 commit e32ed03

File tree

2 files changed

+22
-15
lines changed

2 files changed

+22
-15
lines changed

‎resources/lang/en-US/admin/settings/general.php‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
'footer_text' => 'Additional Footer Text ',
7171
'footer_text_help' => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
7272
'general_settings' => 'General Settings',
73-
'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
7473
'general_settings_help' => 'Default EULA and more',
7574
'generate_backup' => 'Generate Backup',
7675
'google_workspaces' => 'Google Workspaces',
@@ -154,7 +153,6 @@
154153
'php' => 'PHP Version',
155154
'php_info' => 'PHP info',
156155
'php_overview' => 'PHP',
157-
'php_overview_keywords' => 'phpinfo, system, info',
158156
'php_overview_help' => 'PHP System info',
159157
'php_gd_info' => 'You must install php-gd to display QR codes, see install instructions.',
160158
'php_gd_warning' => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -231,7 +229,6 @@
231229
'update' => 'Update Settings',
232230
'value' => 'Value',
233231
'brand' => 'Branding',
234-
'brand_keywords' => 'footer, logo, print, theme, skin, header, colors, color, css',
235232
'brand_help' => 'Logo, Site Name',
236233
'web_brand' => 'Web Branding Type',
237234
'about_settings_title' => 'About Settings',
@@ -319,21 +316,17 @@
319316
'filter_by_keyword' => 'Filter by setting keyword',
320317
'security' => 'Security',
321318
'security_title' => 'Update Security Settings',
322-
'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
323319
'security_help' => 'Two-factor, Password Restrictions',
324-
'groups_keywords' => 'permissions, permission groups, authorization',
325320
'groups_help' => 'Account permission groups',
326321
'localization' => 'Localization',
327322
'localization_title' => 'Update Localization Settings',
328-
'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
329323
'localization_help' => 'Language, date display',
330324
'notifications' => 'Notifications',
331325
'notifications_help' => 'Email Alerts & Audit Settings',
332326
'asset_tags_help' => 'Incrementing and prefixes',
333327
'labels' => 'Labels',
334328
'labels_title' => 'Update Label Settings',
335-
'labels_help' => 'Label sizes &amp; settings',
336-
'purge_keywords' => 'permanently delete',
329+
'labels_help' => 'Barcodes &amp; label settings',
337330
'purge_help' => 'Purge Deleted Records',
338331
'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
339332
'ldap_ad' => 'LDAP/AD',
@@ -391,4 +384,17 @@
391384
'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
392385
'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
393386

387+
388+
/* Keywords for settings overview help */
389+
'keywords' => [
390+
'brand' => 'footer, logo, print, theme, skin, header, colors, color, css',
391+
'general_settings' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
392+
'groups' => 'permissions, permission groups, authorization',
393+
'labels' => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
394+
'localization' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
395+
'php_overview' => 'phpinfo, system, info',
396+
'purge' => 'permanently delete',
397+
'security' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
398+
],
399+
394400
];

‎resources/views/settings/index.blade.php‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<x-icon type="branding" class="fa-4x"/>
6565
<br><br>
6666
<span class="name">{{ trans('admin/settings/general.brand') }}</span>
67-
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.brand_keywords') }}</span>
67+
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.keywords.brand') }}</span>
6868
</a>
6969
</h5>
7070
<p class="help-block">{{ trans('admin/settings/general.brand_help') }}</p>
@@ -81,7 +81,7 @@
8181
<x-icon type="general-settings" class="fa-4x"/>
8282
<br><br>
8383
<span class="name"> {{ trans('admin/settings/general.general_settings') }}</span>
84-
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.general_settings_keywords') }}</span>
84+
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.keywords.general_settings') }}</span>
8585
</a>
8686
</h5>
8787
<p class="help-block">{{ trans('admin/settings/general.general_settings_help') }}</p>
@@ -98,7 +98,7 @@
9898
<x-icon type="locked" class="fa-4x"/>
9999
<br><br>
100100
<span class="name">{{ trans('admin/settings/general.security') }}</span>
101-
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.security_keywords') }}</span>
101+
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.keywords.security') }}</span>
102102
</a>
103103
</h5>
104104
<p class="help-block">{{ trans('admin/settings/general.security_help') }}</p>
@@ -114,7 +114,7 @@
114114
<x-icon type="groups" class="fa-4x"/>
115115
<br><br>
116116
<span class="name">{{ trans('general.groups') }}</span>
117-
<span class="keywords" aria-hidden="true" style="display:none"> {{ trans('admin/settings/general.groups_keywords') }}</span>
117+
<span class="keywords" aria-hidden="true" style="display:none"> {{ trans('admin/settings/general.keywords.groups') }}</span>
118118
</a>
119119
</h5>
120120
<p class="help-block">{{ trans('admin/settings/general.groups_help') }}</p>
@@ -131,7 +131,7 @@
131131
<x-icon type="globe-us" class="fa-4x"/>
132132
<br><br>
133133
<span class="name">{{ trans('admin/settings/general.localization') }}</span>
134-
<span class="keywords" aria-hidden="true" style="display:none"> {{ trans('admin/settings/general.localization_keywords') }}</span>
134+
<span class="keywords" aria-hidden="true" style="display:none"> {{ trans('admin/settings/general.keywords.localization') }}</span>
135135
</a>
136136
</h5>
137137
<p class="help-block">{{ trans('admin/settings/general.localization_help') }}</p>
@@ -195,6 +195,7 @@
195195
<x-icon type="labels" class="fa-4x"/>
196196
<br><br>
197197
<span class="name">{{ trans('admin/settings/general.labels') }}</span>
198+
<span class="keywords" aria-hidden="true" style="display:none"> {{ trans('admin/settings/general.keywords.labels') }}</span>
198199
</a>
199200
</h5>
200201
<p class="help-block">{!! trans('admin/settings/general.labels_help') !!}</p>
@@ -303,7 +304,7 @@
303304
<i class="fab fa-php fa-4x" aria-hidden="true"></i>
304305
<br><br>
305306
<span class="name">{{ trans('admin/settings/general.php_overview') }}</span>
306-
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.php_overview_keywords') }}</span>
307+
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.keywords.php_overview') }}</span>
307308
</a>
308309
</h5>
309310
<p class="help-block">{{ trans('admin/settings/general.php_overview_help') }}</p>
@@ -321,7 +322,7 @@
321322
<i class="fas fa-trash fa-4x" aria-hidden="true"></i>
322323
<br><br>
323324
<span class="name">{{ trans('admin/settings/general.purge') }}</span>
324-
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.purge_keywords') }}</span>
325+
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.keywords.purge') }}</span>
325326
</a>
326327
</h5>
327328
<p class="help-block">{{ trans('admin/settings/general.purge_help') }}</p>

0 commit comments

Comments
 (0)