From b784e63aa8bb1150ee4ebc23191e271edcf5b202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C3=A4chtler=2C=20Yannick?= Date: Tue, 2 Nov 2021 10:13:22 +0100 Subject: [PATCH 01/27] Added localized strings for account --- resources/lang/en/general.php | 11 ++++++++++- resources/views/account/accept-asset.blade.php | 2 +- resources/views/account/accept/create.blade.php | 10 +++++----- resources/views/account/accept/index.blade.php | 5 +++-- resources/views/account/api.blade.php | 17 ++++++++--------- .../views/account/change-password.blade.php | 6 +++--- resources/views/account/profile.blade.php | 2 +- .../views/account/requestable-assets.blade.php | 2 +- resources/views/account/requested.blade.php | 10 +++++----- resources/views/account/view-assets.blade.php | 4 ++-- 10 files changed, 39 insertions(+), 30 deletions(-) diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 942947e6c..bd59be950 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -6,6 +6,7 @@ 'accessory' => 'Accessory', 'accessory_report' => 'Accessory Report', 'action' => 'Action', + 'actions' => 'Actions', 'activity_report' => 'Activity Report', 'address' => 'Address', 'admin' => 'Admin', @@ -62,6 +63,7 @@ 'updated_at' => 'Updated at', 'currency' => '$', // this is deprecated 'current' => 'Current', + 'current_password' => 'Current Password', 'custom_report' => 'Custom Asset Report', 'dashboard' => 'Dashboard', 'days' => 'days', @@ -104,9 +106,10 @@ 'file_type' => 'File Type', 'file_uploads' => 'File Uploads', 'generate' => 'Generate', - 'github_markdown' => 'This field accepts Github flavored markdown.', + 'github_markdown' => 'This field accepts Github flavored markdown.', 'groups' => 'Groups', 'gravatar_email' => 'Gravatar Email Address', + 'gravatar_url' => 'Change your avatar at Gravatar.com.', 'history' => 'History', 'history_for' => 'History for', 'id' => 'ID', @@ -122,6 +125,7 @@ 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', 'item' => 'Item', + 'item_name' => 'Item Name', 'insufficient_permissions' => 'Insufficient permissions!', 'kits' => 'Predefined Kits', 'language' => 'Language', @@ -151,6 +155,7 @@ 'months' => 'months', 'moreinfo' => 'More Info', 'name' => 'Name', + 'new_password' => 'New Password', 'next' => 'Next', 'next_audit_date' => 'Next Audit Date', 'last_audit' => 'Last Audit', @@ -178,7 +183,10 @@ 'reports' => 'Reports', 'restored' => 'restored', 'restore' => 'Restore', + 'requestable_models' => 'Requestable Models', 'requested' => 'Requested', + 'requested_date' => 'Requested Date', + 'requested_assets' => 'Requested Assets', 'request_canceled' => 'Request Canceled', 'save' => 'Save', 'select' => 'Select', @@ -231,6 +239,7 @@ 'users' => 'Users', 'viewall' => 'View All', 'viewassets' => 'View Assigned Assets', + 'viewassetsfor' => 'View Assets for :name', 'website' => 'Website', 'welcome' => 'Welcome, :name', 'years' => 'years', diff --git a/resources/views/account/accept-asset.blade.php b/resources/views/account/accept-asset.blade.php index cb4956a95..e9034c710 100644 --- a/resources/views/account/accept-asset.blade.php +++ b/resources/views/account/accept-asset.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - {{trans('general.accept', ['asset' => $item->present()->name()])}} + {{ trans('general.accept', ['asset' => $item->present()->name()]) }} @parent @stop diff --git a/resources/views/account/accept/create.blade.php b/resources/views/account/accept/create.blade.php index 816c0cb2b..defba995b 100644 --- a/resources/views/account/accept/create.blade.php +++ b/resources/views/account/accept/create.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - Accept {{ $acceptance->checkoutable->present()->name() }} + {{ trans('general.accept', array('asset' => $acceptance->checkoutable->present()->name())) }} @parent @stop @@ -47,14 +47,14 @@
@@ -69,7 +69,7 @@ @if ($snipeSettings->require_accept_signature=='1')
-

Sign below to indicate that you agree to the terms of service:

+

{{ trans('general.sign_tos') }}

@@ -77,7 +77,7 @@
- +
diff --git a/resources/views/account/accept/index.blade.php b/resources/views/account/accept/index.blade.php index aeab72a29..273feab95 100755 --- a/resources/views/account/accept/index.blade.php +++ b/resources/views/account/accept/index.blade.php @@ -2,6 +2,7 @@ {{-- Page title --}} @section('title') +//TODO: Debug page as it is not viewable in browser due to crash Accept assets {{ $user->present()->fullName() }} @parent @stop @@ -34,8 +35,8 @@ Accept assets {{ $user->present()->fullName() }} }'> - Name - Actions + {{ trans('general.name')}} + {{ trans('general.actions')}} diff --git a/resources/views/account/api.blade.php b/resources/views/account/api.blade.php index a91eb94cb..d54b1cc9f 100644 --- a/resources/views/account/api.blade.php +++ b/resources/views/account/api.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - Personal API Keys + {{ trans('account/api.personal_api_keys') }} @parent @stop @@ -24,18 +24,17 @@
- When generating an API token, be sure to copy it down immediately as they - will not be visible to you again.
+ {{ trans('account/api.api_key_warning') }} +
-

Your API base url is located at:
- {{ url('/api/v1') }}/<endpoint>

+

{{ trans('account/api.api_base_url') }}
+ {{ url('/api/v1') }}{{!! trans('account/api.api_base_url_endpoint') !!}}

-

API tokens are set to expire in: - {{ config('passport.expiration_years') }} years.

+

{{ trans('account/api.api_token_expiration_time') }} + {{ config('passport.expiration_years') }} {{ trans('general.years') }} .

-

Please check the API reference to - find specific API endpoints and additional API documentation.

+

{{!! trans('account/api.api_reference') !!}}

diff --git a/resources/views/account/change-password.blade.php b/resources/views/account/change-password.blade.php index 0a4ef2683..9899a9734 100755 --- a/resources/views/account/change-password.blade.php +++ b/resources/views/account/change-password.blade.php @@ -20,7 +20,7 @@
-
@@ -32,7 +32,7 @@
- +
{!! $errors->first('password', '') !!} @@ -44,7 +44,7 @@
- +
{!! $errors->first('password_confirmation', '') !!} diff --git a/resources/views/account/profile.blade.php b/resources/views/account/profile.blade.php index 465034062..7efb62681 100755 --- a/resources/views/account/profile.blade.php +++ b/resources/views/account/profile.blade.php @@ -97,7 +97,7 @@ {!! $errors->first('gravatar', '') !!}

{{ $user->present()->fullName() }} avatar image - Change your avatar at Gravatar.com. + {{!! trans('general.gravatar_url') !!}}

diff --git a/resources/views/account/requestable-assets.blade.php b/resources/views/account/requestable-assets.blade.php index b0b8a0f4f..039d0fb3b 100644 --- a/resources/views/account/requestable-assets.blade.php +++ b/resources/views/account/requestable-assets.blade.php @@ -72,7 +72,7 @@
@if ($models->count() > 0) -

Requestable Models

+

{{ trans('general.requestable_models') }}

- - - + + + - +
ImageItem NameType{{ trans('general.image') }}{{ trans('general.item_name') }}{{ trans('general.type') }} {{ trans('general.qty') }} {{ trans('admin/hardware/table.location') }} {{ trans('admin/hardware/form.expected_checkin') }}Requested Date {{ trans('general.requested_date') }}
diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index e50986470..dfbc19b96 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') -View Assets for {{ $user->present()->fullName() }} +{{ trans('general.viewassetsfor', array('name' => $user->fullName)) }} @parent @stop @@ -294,7 +294,7 @@ View Assets for {{ $user->present()->fullName() }} @if ($user->id)
-

History

+

{{ trans('general.history') }}

@endif From 433d6fd3e0391e7e76b843c427f447422acc6026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C3=A4chtler=2C=20Yannick?= Date: Tue, 2 Nov 2021 10:23:15 +0100 Subject: [PATCH 02/27] Added localized strings for admin/companies --- resources/lang/en/admin/companies/general.php | 2 ++ resources/views/companies/index.blade.php | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/lang/en/admin/companies/general.php b/resources/lang/en/admin/companies/general.php index 318d188e3..37781012b 100644 --- a/resources/lang/en/admin/companies/general.php +++ b/resources/lang/en/admin/companies/general.php @@ -2,4 +2,6 @@ return [ 'select_company' => 'Select Company', + 'about_companies' => 'About Companies', + 'about_companies_description' => ' You can use companies as a simple informative field, or you can use them to restrict asset visibility and availability to users with a specific company by enabling Full Company Support in your Admin Settings.', ]; diff --git a/resources/views/companies/index.blade.php b/resources/views/companies/index.blade.php index 7407f2a08..d7a55367b 100644 --- a/resources/views/companies/index.blade.php +++ b/resources/views/companies/index.blade.php @@ -44,10 +44,8 @@
-

About Companies

-

- You can use companies as a simple informative field, or you can use them to restrict asset visibility and availability to users with a specific company by enabling Full Company Support in your Admin Settings. -

+

{{ trans('admin/companies/general.about_companies') }}

+

{{ trans('admin/companies/general.about_companies_description') }}

@stop From c11af0e22213a203a74dddbbc8916e595530ed27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C3=A4chtler=2C=20Yannick?= Date: Tue, 2 Nov 2021 10:40:41 +0100 Subject: [PATCH 03/27] Added missing localized strings for account/accept/index.blade.php and view-assets.blade.php --- resources/lang/en/general.php | 4 +++- resources/views/account/accept/index.blade.php | 5 ++--- resources/views/account/view-assets.blade.php | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index bd59be950..9b6c4d4df 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -20,7 +20,8 @@ 'asset' => 'Asset', 'asset_report' => 'Asset Report', 'asset_tag' => 'Asset Tag', - 'assets_available' => 'assets available', + 'assets_available' => 'Assets available', + 'accept_assets' => 'Accept Assets :name', 'audit' => 'Audit', 'audit_report' => 'Audit Log', 'assets' => 'Assets', @@ -253,6 +254,7 @@ 'accept' => 'Accept :asset', 'i_accept' => 'I accept', 'i_decline' => 'I decline', + 'accept_decline' => 'Accept/Decline', 'sign_tos' => 'Sign below to indicate that you agree to the terms of service:', 'clear_signature' => 'Clear Signature', 'show_help' => 'Show help', diff --git a/resources/views/account/accept/index.blade.php b/resources/views/account/accept/index.blade.php index 273feab95..17997be6e 100755 --- a/resources/views/account/accept/index.blade.php +++ b/resources/views/account/accept/index.blade.php @@ -2,8 +2,7 @@ {{-- Page title --}} @section('title') -//TODO: Debug page as it is not viewable in browser due to crash -Accept assets {{ $user->present()->fullName() }} +{{ trans('general.accept_assets', array('name' => $user->present()->fullName())) }} @parent @stop @@ -43,7 +42,7 @@ Accept assets {{ $user->present()->fullName() }} @foreach ($acceptances as $acceptance) {{ ($acceptance->checkoutable) ? $acceptance->checkoutable->present()->name : '' }} - Accept/Decline + {{ trans('general.accept_decline') }} @endforeach diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index dfbc19b96..f5dc07eb8 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') -{{ trans('general.viewassetsfor', array('name' => $user->fullName)) }} +{{ trans('general.viewassetsfor', array('name' => $user->present()->fullName())) }} @parent @stop From a96c53784cc570e0a6a639380e62fb033e008c25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C3=A4chtler=2C=20Yannick?= Date: Tue, 2 Nov 2021 11:27:53 +0100 Subject: [PATCH 04/27] Added localized strings for custom_fields --- .../lang/en/admin/custom_fields/general.php | 13 ++++++++++ resources/lang/en/button.php | 1 + resources/lang/en/general.php | 3 ++- .../views/account/accept/index.blade.php | 2 +- .../views/custom_fields/fields/edit.blade.php | 8 +++--- .../custom_fields/fieldsets/edit.blade.php | 4 +-- .../custom_fields/fieldsets/view.blade.php | 14 +++++----- resources/views/custom_fields/index.blade.php | 26 +++++++++---------- 8 files changed, 43 insertions(+), 28 deletions(-) diff --git a/resources/lang/en/admin/custom_fields/general.php b/resources/lang/en/admin/custom_fields/general.php index 0fb90a507..8483c67c6 100644 --- a/resources/lang/en/admin/custom_fields/general.php +++ b/resources/lang/en/admin/custom_fields/general.php @@ -2,6 +2,7 @@ return [ 'custom_fields' => 'Custom Fields', + 'manage' => 'Manage', 'field' => 'Field', 'about_fieldsets_title' => 'About Fieldsets', 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.', @@ -26,7 +27,19 @@ return [ 'used_by_models' => 'Used By Models', 'order' => 'Order', 'create_fieldset' => 'New Fieldset', + 'create_fieldset_title' => 'Create a new fieldset', 'create_field' => 'New Custom Field', + 'create_field_title' => 'Create a new custom field', 'value_encrypted' => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value', 'show_in_email' => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.', + 'help_text' => 'Help Text', + 'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.', + 'about_custom_fields_title' => 'About Custom Fields', + 'about_custom_fields_text' => 'Custom fields allow you to add arbitrary attributes to assets.', + 'add_field_to_fieldset' => 'Add Field to Fieldset', + 'make_optional' => 'Required - click to make optional', + 'make_required' => 'Optional - click to make required', + 'reorder' => 'Reorder', + 'db_field' => 'DB Field', + 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column but should be :expected .' ]; diff --git a/resources/lang/en/button.php b/resources/lang/en/button.php index 12bda167b..ac1e6aa42 100644 --- a/resources/lang/en/button.php +++ b/resources/lang/en/button.php @@ -8,6 +8,7 @@ return [ 'delete' => 'Delete', 'edit' => 'Edit', 'restore' => 'Restore', + 'remove' => 'Remove', 'request' => 'Request', 'submit' => 'Submit', 'upload' => 'Upload', diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 9b6c4d4df..5cf5d8844 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -6,7 +6,6 @@ 'accessory' => 'Accessory', 'accessory_report' => 'Accessory Report', 'action' => 'Action', - 'actions' => 'Actions', 'activity_report' => 'Activity Report', 'address' => 'Address', 'admin' => 'Admin', @@ -261,4 +260,6 @@ 'hide_help' => 'Hide help', 'view_all' => 'view all', 'hide_deleted' => 'Hide Deleted', + 'email' => 'Email', + 'Help' ]; diff --git a/resources/views/account/accept/index.blade.php b/resources/views/account/accept/index.blade.php index 17997be6e..7370c3a38 100755 --- a/resources/views/account/accept/index.blade.php +++ b/resources/views/account/accept/index.blade.php @@ -35,7 +35,7 @@ {{ trans('general.name')}} - {{ trans('general.actions')}} + {{ trans('button.actions')}} diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php index a28a58f62..fd9e78ee3 100644 --- a/resources/views/custom_fields/fields/edit.blade.php +++ b/resources/views/custom_fields/fields/edit.blade.php @@ -96,11 +96,11 @@
{{ Form::text('help_text', old('help_text', $field->help_text), array('class' => 'form-control', 'aria-label'=>'help_text')) }} -

This is optional text that will appear below the form elements while editing an asset to provide context on the field.

+

{{ trans('admin/custom_fields/general.help_text_description') }}

{!! $errors->first('help_text', '') !!}
@@ -147,8 +147,8 @@
-

About Custom Fields

-

Custom fields allow you to add arbitrary attributes to assets.

+

{{ trans('admin/custom_fields/general.about_custom_fields_title') }}

+

{{ trans('admin/custom_fields/general.about_custom_fields_text') }}

diff --git a/resources/views/custom_fields/fieldsets/edit.blade.php b/resources/views/custom_fields/fieldsets/edit.blade.php index 99a614d83..04885891e 100644 --- a/resources/views/custom_fields/fieldsets/edit.blade.php +++ b/resources/views/custom_fields/fieldsets/edit.blade.php @@ -42,8 +42,8 @@ {{ Form::close() }}
-

About Fieldsets

-

Fieldsets work like containers of the custom fields you've created. This allows you to group commonly used custom attributes together for easy associations.

+

{{ trans('admin/custom_fields/general.about_fieldsets_title') }}

+

{{ trans('admin/custom_fields/general.about_fieldsets_text') }}

@stop diff --git a/resources/views/custom_fields/fieldsets/view.blade.php b/resources/views/custom_fields/fieldsets/view.blade.php index da08f7ab6..82b9498fa 100644 --- a/resources/views/custom_fields/fieldsets/view.blade.php +++ b/resources/views/custom_fields/fieldsets/view.blade.php @@ -27,7 +27,7 @@ {{-- Hide the sorting handle if we can't update the fieldset --}} @can('update', $custom_fieldset) - Reorder + {{ trans('admin/custom_fields/general.reorder') }} @endcan {{ trans('admin/custom_fields/general.order') }} {{ trans('admin/custom_fields/general.field_name') }} @@ -35,7 +35,7 @@ {{ trans('admin/custom_fields/general.field_element') }} {{ trans('admin/custom_fields/general.encrypted') }} {{ trans('admin/custom_fields/general.required') }} - Remove + {{ trans('button.remove') }} @@ -60,18 +60,18 @@ @if ($field->pivot->required) - Required - click to make optional + {{ trans('admin/custom_fields/general.make_optional') }} @else - Optional - click to make required + {{ trans('admin/custom_fields/general.make_required') }} @endif @can('update', $custom_fieldset) - Remove + {{ trans('button.remove') }} @endcan @@ -89,7 +89,7 @@
{{ Form::select("field_id",$custom_fields_list,"",['aria-label'=>'field_id', 'class'=>'select2']) }} @@ -106,7 +106,7 @@
{{ Form::text('order', $maxid, array('class' => 'form-control col-sm-1 col-md-1', 'style'=> 'width: 80px; padding-;right: 10px;', 'aria-label'=>'order', 'maxlength'=>'3', 'size'=>'3')) }} - +
diff --git a/resources/views/custom_fields/index.blade.php b/resources/views/custom_fields/index.blade.php index 434bd78a9..351e27cf5 100644 --- a/resources/views/custom_fields/index.blade.php +++ b/resources/views/custom_fields/index.blade.php @@ -6,7 +6,7 @@ {{-- Page title --}} @section('title') - Manage {{ trans('admin/custom_fields/general.custom_fields') }} + {{ trans('admin/custom_fields/general.manage') }} {{ trans('admin/custom_fields/general.custom_fields') }} @parent @stop @@ -21,7 +21,7 @@

{{ trans('admin/custom_fields/general.fieldsets') }}

@can('create', \App\Models\CustomFieldset::class) - {{ trans('admin/custom_fields/general.create_fieldset') }} + {{ trans('admin/custom_fields/general.create_fieldset') }} @endcan
@@ -48,7 +48,7 @@ {{ trans('general.name') }} {{ trans('admin/custom_fields/general.qty_fields') }} {{ trans('admin/custom_fields/general.used_by_models') }} - Actions + {{ trans('button.actions') }} @@ -100,7 +100,7 @@

{{ trans('admin/custom_fields/general.custom_fields') }}

@can('create', \App\Models\CustomField::class) - {{ trans('admin/custom_fields/general.create_field') }} + {{ trans('admin/custom_fields/general.create_field') }} @endcan
@@ -127,13 +127,13 @@ {{ trans('general.name') }} - Help Text - Email - DB Field + {{ trans('admin/custom_fields/general.help_text')}} + {{ trans('general.email') }} + {{ trans('admin/custom_fields/general.db_field') }} {{ trans('admin/custom_fields/general.field_format') }} {{ trans('admin/custom_fields/general.field_element_short') }} {{ trans('admin/custom_fields/general.fieldsets') }} - Actions + {{ trans('button.actions') }} @@ -145,7 +145,7 @@ {{ $field->convertUnicodeDbSlug() }} @if ($field->convertUnicodeDbSlug()!=$field->db_column) -
WARNING. This field is in the custom fields table as {{ $field->db_column }} but should be {{ $field->convertUnicodeDbSlug() }}. +
{{!! trans('admin/custom_fields/general.db_convert_warning', array('db_column' => $field->db_column, 'expected' => $field->convertUnicodeDbSlug())) !!}} @endif {{ $field->format }} @@ -160,19 +160,19 @@ @can('update', $field) - Edit + {{ trans('button.edit') }} - @endcan + @endcan @can('delete', $field) {{ Form::open(array('route' => array('fields.destroy', $field->id), 'method' => 'delete', 'style' => 'display:inline-block')) }} @if($field->fieldset->count()>0) + {{ trans('button.delete') }} @else @endif {{ Form::close() }} From e825fa81aa7dc4eec9078e228b8330ade6b54dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C3=A4chtler=2C=20Yannick?= Date: Tue, 2 Nov 2021 11:50:56 +0100 Subject: [PATCH 05/27] Added localized strings for depreciations --- resources/lang/en/admin/depreciations/general.php | 3 +-- resources/lang/en/button.php | 3 ++- resources/lang/en/general.php | 10 +++++++--- resources/views/depreciations/index.blade.php | 2 +- resources/views/depreciations/view.blade.php | 8 ++++---- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/resources/lang/en/admin/depreciations/general.php b/resources/lang/en/admin/depreciations/general.php index e188b2cc1..1e536085f 100644 --- a/resources/lang/en/admin/depreciations/general.php +++ b/resources/lang/en/admin/depreciations/general.php @@ -9,6 +9,5 @@ return [ 'depreciation_min' => 'Floor Value of Depreciation', 'number_of_months' => 'Number of Months', 'update' => 'Update Depreciation', - 'depreciation_min' => 'Minimum Value after Depreciation' - + 'depreciation_min' => 'Minimum Value after Depreciation', ]; diff --git a/resources/lang/en/button.php b/resources/lang/en/button.php index ac1e6aa42..1be2a483a 100644 --- a/resources/lang/en/button.php +++ b/resources/lang/en/button.php @@ -15,5 +15,6 @@ return [ 'select_file' => 'Select File...', 'select_files' => 'Select Files...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', - 'send_password_link' => 'Send Password Reset Link', + 'send_password_link' => 'Send Password Reset Link', + 'go' => 'Go', ]; diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 5cf5d8844..e11a0a0ba 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -31,6 +31,9 @@ 'bulkaudit' => 'Bulk Audit', 'bulkaudit_status' => 'Audit Status', 'bulk_checkout' => 'Bulk Checkout', + 'bulk_edit' => 'Bulk Edit', + 'bulk_delete' => 'Bulk Delete', + 'bulk_actions' => 'Bulk Actions', 'bystatus' => 'by Status', 'cancel' => 'Cancel', 'categories' => 'Categories', @@ -77,13 +80,14 @@ 'delete_seats' => 'Deleted Seats', 'deletion_failed' => 'Deletion failed', 'departments' => 'Departments', - 'department' => 'Department', + 'department' => 'Department', 'deployed' => 'Deployed', + 'depreciation' => 'Depreciation', + 'depreciations' => 'Depreciations', 'depreciation_report' => 'Depreciation Report', 'details' => 'Details', 'download' => 'Download', - 'download_all' => 'Download All', - 'depreciation' => 'Depreciation', + 'download_all' => 'Download All', 'editprofile' => 'Edit Your Profile', 'eol' => 'EOL', 'email_domain' => 'Email Domain', diff --git a/resources/views/depreciations/index.blade.php b/resources/views/depreciations/index.blade.php index bfbed2ca6..e71063771 100755 --- a/resources/views/depreciations/index.blade.php +++ b/resources/views/depreciations/index.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - Depreciations + {{ trans('general.depreciations')}} @parent @stop diff --git a/resources/views/depreciations/view.blade.php b/resources/views/depreciations/view.blade.php index c0263fda9..d075a31e9 100644 --- a/resources/views/depreciations/view.blade.php +++ b/resources/views/depreciations/view.blade.php @@ -111,12 +111,12 @@ ) }}
- + - +
From 167bf97d46e3a6f5cee42a450d2cf70d37af9fa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C3=A4chtler=2C=20Yannick?= Date: Tue, 2 Nov 2021 12:03:41 +0100 Subject: [PATCH 06/27] Added localized strings for groups --- resources/lang/en/admin/groups/titles.php | 4 +++- resources/lang/en/general.php | 1 - resources/views/account/accept/index.blade.php | 2 +- resources/views/custom_fields/index.blade.php | 2 +- resources/views/groups/edit.blade.php | 18 +++++++++--------- resources/views/groups/view.blade.php | 2 +- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/resources/lang/en/admin/groups/titles.php b/resources/lang/en/admin/groups/titles.php index 8807f5e54..d875f190d 100644 --- a/resources/lang/en/admin/groups/titles.php +++ b/resources/lang/en/admin/groups/titles.php @@ -10,5 +10,7 @@ return [ 'group_admin' => 'Group Admin', 'allow' => 'Allow', 'deny' => 'Deny', - + 'permission' => 'Permission', + 'grant' => 'Grant', + 'no_permissions' => 'This group has no permissions.' ]; diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index e11a0a0ba..d3aff3886 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -265,5 +265,4 @@ 'view_all' => 'view all', 'hide_deleted' => 'Hide Deleted', 'email' => 'Email', - 'Help' ]; diff --git a/resources/views/account/accept/index.blade.php b/resources/views/account/accept/index.blade.php index 7370c3a38..f97c6c564 100755 --- a/resources/views/account/accept/index.blade.php +++ b/resources/views/account/accept/index.blade.php @@ -35,7 +35,7 @@ {{ trans('general.name')}} - {{ trans('button.actions')}} + {{ trans('table.actions')}} diff --git a/resources/views/custom_fields/index.blade.php b/resources/views/custom_fields/index.blade.php index 351e27cf5..01314fb7b 100644 --- a/resources/views/custom_fields/index.blade.php +++ b/resources/views/custom_fields/index.blade.php @@ -48,7 +48,7 @@ {{ trans('general.name') }} {{ trans('admin/custom_fields/general.qty_fields') }} {{ trans('admin/custom_fields/general.used_by_models') }} - {{ trans('button.actions') }} + {{ trans('table.actions') }} diff --git a/resources/views/groups/edit.blade.php b/resources/views/groups/edit.blade.php index 8f280dfe9..3c8769f56 100755 --- a/resources/views/groups/edit.blade.php +++ b/resources/views/groups/edit.blade.php @@ -65,9 +65,9 @@ - - - + + + @foreach ($permissions as $area => $area_permission) @@ -87,11 +87,11 @@ @endunless @@ -108,11 +108,11 @@ @@ -128,11 +128,11 @@ {{ $this_permission['label'] }} diff --git a/resources/views/groups/view.blade.php b/resources/views/groups/view.blade.php index 84e91c9dd..9b6c09863 100644 --- a/resources/views/groups/view.blade.php +++ b/resources/views/groups/view.blade.php @@ -57,7 +57,7 @@ @else -

This group has no permissions.

+

{{ trans('admin/groups/title.no_permissions') }}

@endif From c16ade2d87d3dd4ed63c33ad07b20c18b4effc78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C3=A4chtler=2C=20Yannick?= Date: Tue, 2 Nov 2021 14:02:48 +0100 Subject: [PATCH 07/27] Added localized strings for hardware --- resources/lang/en/admin/hardware/form.php | 6 ++++ resources/lang/en/admin/hardware/general.php | 19 +++++++++++ resources/lang/en/admin/hardware/table.php | 8 +++-- resources/lang/en/button.php | 2 ++ resources/lang/en/general.php | 4 +++ resources/views/hardware/audit.blade.php | 2 +- .../views/hardware/bulk-delete.blade.php | 10 +++--- resources/views/hardware/bulk.blade.php | 10 +++--- resources/views/hardware/checkout.blade.php | 2 +- resources/views/hardware/edit.blade.php | 4 +-- resources/views/hardware/history.blade.php | 34 ++++++++----------- resources/views/hardware/index.blade.php | 6 ++-- resources/views/hardware/quickscan.blade.php | 4 +-- resources/views/hardware/requested.blade.php | 4 +-- resources/views/hardware/view.blade.php | 16 ++++----- 15 files changed, 80 insertions(+), 51 deletions(-) diff --git a/resources/lang/en/admin/hardware/form.php b/resources/lang/en/admin/hardware/form.php index 86a40a5fa..0c1a3167b 100644 --- a/resources/lang/en/admin/hardware/form.php +++ b/resources/lang/en/admin/hardware/form.php @@ -40,4 +40,10 @@ return [ 'warranty' => 'Warranty', 'warranty_expires' => 'Warranty Expires', 'years' => 'years', + 'asset_location' => 'Update Asset Location', + 'asset_location_update_default_current' => 'Update default location AND actual location', + 'asset_location_update_default' => 'Update only default location', + 'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.', + 'asset_deployable' => 'That status is deployable. This asset can be checked out.', + 'processing_spinner' => 'Processing...', ]; diff --git a/resources/lang/en/admin/hardware/general.php b/resources/lang/en/admin/hardware/general.php index 80a2c14e5..655696956 100644 --- a/resources/lang/en/admin/hardware/general.php +++ b/resources/lang/en/admin/hardware/general.php @@ -19,4 +19,23 @@ return [ 'pending' => 'Pending', 'undeployable' => 'Undeployable', 'view' => 'View Asset', + 'csv_error' => 'You have an error in your CSV file:', + 'import_text' => ' +

+ Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the Admin > General Settings. +

+ +

Fields included in the CSV must match the headers: Asset Tag, Name, Checkout Date, Checkin Date. Any additional fields will be ignored.

+ +

Checkin Date: blank or future checkin dates will checkout items to associated user. Excluding the Checkin Date column will create a checkin date with todays date.

+ ', + 'csv_import_match_f-l' => 'Try to match users by firstname.lastname (jane.smith) format', + 'csv_import_match_initial_last' => 'Try to match users by first initial last name (jsmith) format', + 'csv_import_match_first' => 'Try to match users by first name (jane) format', + 'csv_import_match_email' => 'Try to match users by email as username', + 'csv_import_match_username' => 'Try to match users by username', + 'error_messages' => 'Error messages:', + 'success_messages' => 'Success messages:', + 'alert_details' => 'Please see below for details.', + 'custom_export' => 'Custom Export' ]; diff --git a/resources/lang/en/admin/hardware/table.php b/resources/lang/en/admin/hardware/table.php index 828990b6e..6166ba804 100644 --- a/resources/lang/en/admin/hardware/table.php +++ b/resources/lang/en/admin/hardware/table.php @@ -19,8 +19,12 @@ return [ 'serial' => 'Serial', 'status' => 'Status', 'title' => 'Asset ', - 'image' => 'Device Image', + 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance', 'monthly_depreciation' => 'Monthly Depreciation', - + 'assigned_to' => 'Assigned To', + 'requesting_user' => 'Requesting User', + 'requested_date' => 'Requested Date', + 'changed' => 'Changed', + 'icon' => 'Icon', ]; diff --git a/resources/lang/en/button.php b/resources/lang/en/button.php index 1be2a483a..b39d0c054 100644 --- a/resources/lang/en/button.php +++ b/resources/lang/en/button.php @@ -17,4 +17,6 @@ return [ 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', 'send_password_link' => 'Send Password Reset Link', 'go' => 'Go', + 'bulk_actions' => 'Bulk Actions', + 'add_maintenance' => 'Add Maintenance', ]; diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index d3aff3886..d5d24afaf 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -88,6 +88,7 @@ 'details' => 'Details', 'download' => 'Download', 'download_all' => 'Download All', + 'edit' => 'Edit', 'editprofile' => 'Edit Your Profile', 'eol' => 'EOL', 'email_domain' => 'Email Domain', @@ -110,6 +111,7 @@ 'file_type' => 'File Type', 'file_uploads' => 'File Uploads', 'generate' => 'Generate', + 'generate_labels' => 'Generate Labels', 'github_markdown' => 'This field accepts Github flavored markdown.', 'groups' => 'Groups', 'gravatar_email' => 'Gravatar Email Address', @@ -213,6 +215,7 @@ 'sign_in' => 'Sign in', 'signature' => 'Signature', 'skin' => 'Skin', + 'slack_msg_note' => 'A slack message will be sent', 'slack_test_msg' => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!', 'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.', 'site_name' => 'Site Name', @@ -265,4 +268,5 @@ 'view_all' => 'view all', 'hide_deleted' => 'Hide Deleted', 'email' => 'Email', + 'do_not_change' => 'Do Not Change', ]; diff --git a/resources/views/hardware/audit.blade.php b/resources/views/hardware/audit.blade.php index ed395ec12..3ab2fbfc9 100644 --- a/resources/views/hardware/audit.blade.php +++ b/resources/views/hardware/audit.blade.php @@ -57,7 +57,7 @@
@include ('partials.more-info', ['helpText' => trans('help.audit_help'), 'helpPosition' => 'right']) diff --git a/resources/views/hardware/bulk-delete.blade.php b/resources/views/hardware/bulk-delete.blade.php index ed3629660..df19c9005 100644 --- a/resources/views/hardware/bulk-delete.blade.php +++ b/resources/views/hardware/bulk-delete.blade.php @@ -29,10 +29,10 @@
- - - - + + + + @@ -59,7 +59,7 @@
{{ trans('button.cancel') }} - +
diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php index ae84e9008..b073a3b74 100755 --- a/resources/views/hardware/bulk.blade.php +++ b/resources/views/hardware/bulk.blade.php @@ -75,12 +75,12 @@
@@ -137,13 +137,13 @@
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php index 8608fd627..9841e134e 100755 --- a/resources/views/hardware/checkout.blade.php +++ b/resources/views/hardware/checkout.blade.php @@ -124,7 +124,7 @@ @if ($snipeSettings->slack_endpoint!='') - A slack message will be sent + {{ trans('general.slack_msg_note')}} @endif diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php index 9f24460ef..20e93f067 100755 --- a/resources/views/hardware/edit.blade.php +++ b/resources/views/hardware/edit.blade.php @@ -181,7 +181,7 @@ $("#selected_status_status").removeClass('text-danger'); $("#selected_status_status").removeClass('text-warning'); $("#selected_status_status").addClass('text-success'); - $("#selected_status_status").html(' That status is deployable. This asset can be checked out.'); + $("#selected_status_status").html(' {{ trans('admin/hardware/form.asset_deployable')}}'); } else { @@ -189,7 +189,7 @@ $("#selected_status_status").removeClass('text-danger'); $("#selected_status_status").removeClass('text-success'); $("#selected_status_status").addClass('text-warning'); - $("#selected_status_status").html(' That asset status is not deployable. This asset cannot be checked out. '); + $("#selected_status_status").html(' {{ trans('admin/hardware/form.asset_not_deployable')}} '); } } }); diff --git a/resources/views/hardware/history.blade.php b/resources/views/hardware/history.blade.php index 9a8bcdda4..349dc8da3 100644 --- a/resources/views/hardware/history.blade.php +++ b/resources/views/hardware/history.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - Import History + {{ trans('general.import-history') }} @parent @stop @@ -22,8 +22,8 @@
- {{ count($status['error']) }} Error Messagess: - Please see below for errors. + {{ count($status['error']) }} {{ trans('admin/hardware/general.error_messages') }} + {{ trans('admin/hardware/general.alert_details') }}
@@ -35,8 +35,8 @@
- {{ count($status['success']) }} Success Messages: - Please see below for details. + {{ count($status['success']) }} {{ trans('admin/hardware/general.success_messages') }} + {{ trans('admin/hardware/general.alert_details') }}
@@ -55,18 +55,12 @@ @if (Session::get('message'))

- You have an error in your CSV file:
+ {{ trans('admin/hardware/general.csv_error') }}
{{ Session::get('message') }}

@endif -

- Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user's name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the Admin > General Settings. -

- -

Fields included in the CSV must match the headers: Asset Tag, Name, Checkout Date, Checkin Date. Any additional fields will be ignored.

- -

Checkin Date: blank or future checkin dates will checkout items to associated user. Excluding the Checkin Date column will create a checkin date with todays date.

+ {!! trans('admin/hardware/general.import_text') !!}
@@ -86,7 +80,7 @@
- {{ Form::checkbox('match_firstnamelastname', '1', Request::old('match_firstnamelastname')) }} Try to match users by firstname.lastname (jane.smith) format + {{ Form::checkbox('match_firstnamelastname', '1', Request::old('match_firstnamelastname')) }} {{ trans('admin/hardware/general.csv_import_match_f-l') }}
@@ -95,7 +89,7 @@
- {{ Form::checkbox('match_flastname', '1', Request::old('match_flastname')) }} Try to match users by first initial last name (jsmith) format + {{ Form::checkbox('match_flastname', '1', Request::old('match_flastname')) }} {{ trans('admin/hardware/general.csv_import_match_initial_last') }}
@@ -104,7 +98,7 @@
- {{ Form::checkbox('match_firstname', '1', Request::old('match_firstname')) }} Try to match users by first name (jane) format + {{ Form::checkbox('match_firstname', '1', Request::old('match_firstname')) }} {{ trans('admin/hardware/general.csv_import_match_first') }}
@@ -113,7 +107,7 @@
- {{ Form::checkbox('match_email', '1', Request::old('match_email')) }} Try to match users by email as username + {{ Form::checkbox('match_email', '1', Request::old('match_email')) }} {{ trans('admin/hardware/general.csv_import_match_email') }}
@@ -122,7 +116,7 @@
- {{ Form::checkbox('match_username', '1', Request::old('match_username')) }} Try to match users by username + {{ Form::checkbox('match_username', '1', Request::old('match_username')) }} {{ trans('admin/hardware/general.csv_import_match_username') }}
@@ -158,7 +152,7 @@
-

{{ count($status['error']) }} Error Messages

+

{{ count($status['error']) }} {{ trans('admin/hardware/general.error_messages') }}

@@ -185,7 +179,7 @@
-

{{ count($status['success']) }} Success Messages

+

{{ count($status['success']) }} {{ trans('admin/hardware/general.success_messages') }}

diff --git a/resources/views/hardware/index.blade.php b/resources/views/hardware/index.blade.php index 267b68a56..d4bd6fc88 100755 --- a/resources/views/hardware/index.blade.php +++ b/resources/views/hardware/index.blade.php @@ -43,7 +43,7 @@ @section('header_right') - Custom Export + {{ trans('admin/hardware/general.custom_export') }} @can('create', \App\Models\Asset::class) {{ trans('general.create') }} @endcan @@ -73,14 +73,14 @@ 'id' => 'bulkForm']) }} - + - + {{ Form::close() }}
diff --git a/resources/views/hardware/quickscan.blade.php b/resources/views/hardware/quickscan.blade.php index 2b81d858f..5b2e09b94 100644 --- a/resources/views/hardware/quickscan.blade.php +++ b/resources/views/hardware/quickscan.blade.php @@ -51,7 +51,7 @@
@@ -112,7 +112,7 @@
diff --git a/resources/views/hardware/requested.blade.php b/resources/views/hardware/requested.blade.php index f86675663..901356e69 100644 --- a/resources/views/hardware/requested.blade.php +++ b/resources/views/hardware/requested.blade.php @@ -49,8 +49,8 @@ - - + + diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 63ef53408..79e8301d7 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -972,13 +972,13 @@ 'class' => 'form-inline', 'id' => 'bulkForm']) }}
- + - +
@@ -1028,7 +1028,7 @@
@can('update', \App\Models\Asset::class) @endcan @@ -1083,7 +1083,7 @@ data-cookie="true">
- + @@ -1094,7 +1094,7 @@ @endif - +
PermissionGrantDeny{{ trans('admin/groups/titles.permission')}}{{ trans('admin/groups/titles.grant')}}{{ trans('admin/groups/titles.deny')}}
- + {{ Form::radio('permission['.$localPermission['permission'].']', '1',(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '1' : null),['value'=>"grant", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']']) }} - + {{ Form::radio('permission['.$localPermission['permission'].']', '0',(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '0' : null),['value'=>"grant", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
- + {{ Form::radio("$area", '1',false,['value'=>"grant", 'class'=>'minimal', 'data-checker-group' => str_slug($area), 'aria-label'=> $area]) }} - + {{ Form::radio("$area", '0',false,['value'=>"deny", 'class'=>'minimal', 'data-checker-group' => str_slug($area), 'aria-label'=> $area]) }}
- + {{ Form::radio('permission['.$this_permission['permission'].']', '1',(array_key_exists($this_permission['permission'], $groupPermissions) ? $groupPermissions[$this_permission['permission'] ] == '1' : null),['class'=>'minimal radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$this_permission['permission'].']']) }} - + {{ Form::radio('permission['.$this_permission['permission'].']', '0',(array_key_exists($this_permission['permission'], $groupPermissions) ? $groupPermissions[$this_permission['permission'] ] == '0' : null),['class'=>'minimal radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$this_permission['permission'].']']) }}
IDNameLocationAssigned To{{ trans('admin/hardware/table.id') }}{{ trans('admin/hardware/table.name') }}{{ trans('admin/hardware/table.location')}}{{ trans('admin/hardware/table.assigned_to') }}
Item Name {{ trans('admin/hardware/table.location') }} {{ trans('admin/hardware/form.expected_checkin') }}Requesting UserRequested Date{{ trans('admin/hardware/form.requesting_user') }}{{ trans('admin/hardware/form.requested_date') }}
{{ trans('general.date') }} {{ trans('general.admin') }} {{ trans('general.action') }}{{ trans('general.signature') }}{{ trans('general.download') }}Changed{{ trans('admin/hardware/table.changed')}}
From 26e056fb3c15396f069f4ced5abede3b258e4a7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C3=A4chtler=2C=20Yannick?= Date: Tue, 2 Nov 2021 14:09:22 +0100 Subject: [PATCH 08/27] Added localized strings for improter, added en structure --- resources/views/importer/import.blade.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/views/importer/import.blade.php b/resources/views/importer/import.blade.php index 54c1c90be..ca585d1f4 100644 --- a/resources/views/importer/import.blade.php +++ b/resources/views/importer/import.blade.php @@ -42,9 +42,9 @@ @if (!config('app.lock_passwords')) - Select Import File... + {{ trans('admin/importer/general.select_import_file') }} - + @endif @@ -67,11 +67,11 @@ class="col-md-12 table table-striped snipe-table"> - File - Created - Size - Process - Delete + {{ trans('admin/importer/table.file') }} + {{ trans('admin/importer/table.created') }} + {{ trans('admin/importer/table.size') }} + {{ trans('admin/importer/table.process') }} + {{ trans('admin/importer/table.delete') }}