From 79d9cff22a18507505d09bdf923eced5faf85077 Mon Sep 17 00:00:00 2001 From: akemidx Date: Thu, 26 Jan 2023 16:26:31 -0500 Subject: [PATCH] translations added for the hardware blades --- resources/lang/en/admin/hardware/general.php | 2 ++ resources/lang/en/admin/models/message.php | 2 ++ resources/lang/en/general.php | 4 ++++ resources/views/hardware/checkin.blade.php | 6 +++--- resources/views/hardware/checkout.blade.php | 4 ++-- resources/views/hardware/quickscan-checkin.blade.php | 4 ++-- resources/views/hardware/quickscan.blade.php | 2 +- resources/views/hardware/view.blade.php | 9 ++++----- 8 files changed, 20 insertions(+), 13 deletions(-) diff --git a/resources/lang/en/admin/hardware/general.php b/resources/lang/en/admin/hardware/general.php index 67226061b1..7aa0db7f34 100644 --- a/resources/lang/en/admin/hardware/general.php +++ b/resources/lang/en/admin/hardware/general.php @@ -14,6 +14,8 @@ return [ 'deleted' => 'This asset has been deleted.', 'edit' => 'Edit Asset', 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', + 'model_invalid' => 'The Model of this Asset is invalid.', + 'model_invalid_fix' => 'The Asset should be edited to correct this before attempting to check it in or out.', 'requestable' => 'Requestable', 'requested' => 'Requested', 'not_requestable' => 'Not Requestable', diff --git a/resources/lang/en/admin/models/message.php b/resources/lang/en/admin/models/message.php index e3b29d5b4b..ac596cfb1d 100644 --- a/resources/lang/en/admin/models/message.php +++ b/resources/lang/en/admin/models/message.php @@ -3,6 +3,8 @@ return array( 'does_not_exist' => 'Model does not exist.', + 'no_association' => 'NO MODEL ASSOCIATED.', + 'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.', 'assoc_users' => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ', diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 43d8b3d9e1..232036b233 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -28,6 +28,10 @@ return [ 'audit' => 'Audit', 'audit_report' => 'Audit Log', 'assets' => 'Assets', + 'assets_audited' => 'assets audited', + 'assets_checked_in_count' => 'assets checked in', + 'assets_checked_out_count' => 'assets checked out', + 'asset_deleted_warning' => 'This asset has been deleted. You must restore it before you can assign it to someone.', 'assigned_date' => 'Date Assigned', 'assigned_to' => 'Assigned to :name', 'assignee' => 'Assigned to', diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php index c39704289f..7f9087ae3d 100755 --- a/resources/views/hardware/checkin.blade.php +++ b/resources/views/hardware/checkin.blade.php @@ -46,13 +46,13 @@ @else - This asset's model is invalid! - The asset should be edited to correct this before attempting to check it in or out. + {{ trans('admin/hardware/general.model_invalid')}} + {{ trans(admin/hardware/general.model_invalid_fix')}} @endif

- +
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php index 2b3cdbc19e..bdb03d3147 100755 --- a/resources/views/hardware/checkout.blade.php +++ b/resources/views/hardware/checkout.blade.php @@ -36,8 +36,8 @@ @else - This asset's model is invalid! - The asset should be edited to correct this before attempting to check it in or out. + {{ trans('admin/hardware/general.model_invalid')}} + {{ trans(admin/hardware/general.model_invalid_fix')}} @endif

diff --git a/resources/views/hardware/quickscan-checkin.blade.php b/resources/views/hardware/quickscan-checkin.blade.php index b2075c51d0..8884821809 100644 --- a/resources/views/hardware/quickscan-checkin.blade.php +++ b/resources/views/hardware/quickscan-checkin.blade.php @@ -73,7 +73,7 @@