DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 21:54:14 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #10479 from adagioajanes/fixes/auto_asset_tag_phrasing

Browse source 
Fixed auto asset tag phrasing
This commit is contained in:
snipe 2021-12-31 15:17:59 -08:00 committed by GitHub
parent 2ee84c2675 87bb741013
commit 7a1ab1292c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/lang/en/admin/settings/general.php
View file

@ -16,14 +16,13 @@ return array(
'alert_inv_threshold' => 'Inventory Alert Threshold',
'allow_user_skin' => 'Allow user skin',
'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' ,
'asset_ids' => 'Asset IDs',
'audit_interval' => 'Audit Interval',
'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
'audit_warning_days' => 'Audit Warning Threshold',
'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Generate auto-incrementing asset IDs',
'auto_increment_assets' => 'Generate auto-incrementing asset tags',
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
'auto_incrementing_help' => 'Enable auto-incrementing asset tags first to set this',
'backups' => 'Backups',
'barcode_settings' => 'Barcode Settings',
'confirm_purge' => 'Confirm Purge',
@ -47,6 +46,7 @@ return array(
'barcode_type' => '2D Barcode Type',
'alt_barcode_type' => '1D barcode type',
'email_logo_size' => 'Square logos in email look best. ',
'enabled' => 'Enabled',
'eula_settings' => 'EULA Settings',
'eula_markdown' => 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
'favicon' => 'Favicon',

4
resources/views/settings/asset_tags.blade.php
View file

@ -43,11 +43,11 @@
<!-- auto ids -->
<div class="form-group">
<div class="col-md-5">
{{ Form::label('auto_increment_assets', trans('admin/settings/general.asset_ids')) }}
{{ Form::label('auto_increment_assets', trans('admin/settings/general.auto_increment_assets')) }}
</div>
<div class="col-md-7">
{{ Form::checkbox('auto_increment_assets', '1', old('auto_increment_assets', $setting->auto_increment_assets),array('class' => 'minimal', 'aria-label'=>'auto_increment_assets')) }}
{{ trans('admin/settings/general.auto_increment_assets') }}
{{ trans('admin/settings/general.enabled') }}
</div>
</div>