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

Merge branch 'develop' into added-localized-strings

Browse source
This commit is contained in:
Nuraeil 2022-01-09 17:40:54 +01:00 committed by GitHub
parent b77e7f88d4 66976d9359
commit 5bb2f6fa0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,12 @@ return [
'auto_increment_prefix' => 'Prefix (optional)', 'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this', 'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
'backups' => 'Backups', 'backups' => 'Backups',
'backups_help' => 'Download files & Data', 'backups_restoring' => 'Restoring from Backup',
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in <code>:path</code>',
'backups_restore_warning' => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file. ',
'backups_logged_out' => 'You will be logged out once your restore is complete.',
'backups_large' => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
'barcode_settings' => 'Barcode Settings', 'barcode_settings' => 'Barcode Settings',
'confirm_purge' => 'Confirm Purge', 'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)', 'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
@ -269,23 +274,6 @@ return [
'oauth' => 'OAuth', 'oauth' => 'OAuth',
'oauth_help' => 'Oauth Endpoint Settings', 'oauth_help' => 'Oauth Endpoint Settings',
'asset_tag_title' => 'Update Asset Tag Settings', 'asset_tag_title' => 'Update Asset Tag Settings',
'backup_upload' => 'Upload Backup',
'backup_files_path' => '<p>Backup files on the server are stored in: <code>:path</code></p>',
'backup_restore' => 'Restoring from Backup',
'backup_restore_info' => ' <p>
Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to
restore from a previous backup. (This does not currently with with S3 file storage.)</p>
<p>Your <strong>entire :app database and any uploaded files will be completely replaced</strong> by what is in the backup file.
</p>
<p class="text-danger" style="font-weight: bold; font-size: 120%;">
You will be logged out once your restore is complete.
</p>
<p>
Very large backups may time out on the restore attempt and may still need to be run via command line.
</p>',
'barcode_title' => 'Update Barcode Settings', 'barcode_title' => 'Update Barcode Settings',
'barcodes' => 'Barcodes', 'barcodes' => 'Barcodes',
'barcodes_help_overview' => 'Barcode &amp; QR settings', 'barcodes_help_overview' => 'Barcode &amp; QR settings',

21
resources/views/settings/backups.blade.php
View file

@ -105,14 +105,17 @@
<div class="box-header with-border"> <div class="box-header with-border">
<h2 class="box-title"> <h2 class="box-title">
<i class="far fa-file-archive" aria-hidden="true"></i> <i class="far fa-file-archive" aria-hidden="true"></i>
{{ trans('admin/settings/general.backup_upload') }}</h2> {{ trans('admin/settings/general.backups_upload') }}
</h2>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
</div> </div>
</div><!-- /.box-header --> </div><!-- /.box-header -->
<div class="box-body"> <div class="box-body">
{!! trans('admin/settings/general.backup_files_path', array('path' => $path)) !!} <p>
{!! trans('admin/settings/general.backups_path', ['path'=> $path]) !!}
</p>
@if (config('app.lock_passwords')===true) @if (config('app.lock_passwords')===true)
<p class="alert alert-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p> <p class="alert alert-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
@ -171,13 +174,23 @@
<div class="box box-warning"> <div class="box box-warning">
<div class="box-header with-border"> <div class="box-header with-border">
<h2 class="box-title"> <h2 class="box-title">
<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i> {{ trans('admin/settings/general.backup_restore') }} </h2> <i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i> {{ trans('admin/settings/general.backups_restoring') }}</h2>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
</div> </div>
</div><!-- /.box-header --> </div><!-- /.box-header -->
<div class="box-body"> <div class="box-body">
{!! trans('admin/settings/general.backup_restore_info', array('app' => config('app.name'))) !!} <p>
{!! trans('admin/settings/general.backups_restore_warning', ['app_name' => config('app.name') ]) !!}
</p>
<p class="text-danger" style="font-weight: bold; font-size: 120%;">
{{ trans('admin/settings/general.backups_logged_out') }}
</p>
<p>
{{ trans('admin/settings/general.backups_large') }}
</p>
</div> </div>
</div> </div>