From d1683d1c653f70c95153fcad1934b6adba1f368f Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 5 Mar 2025 16:10:36 -0800 Subject: [PATCH] Use existing translation string --- app/Http/Controllers/Accessories/AccessoriesController.php | 2 +- app/Http/Controllers/Api/AccessoriesController.php | 2 +- resources/lang/en-US/admin/accessories/message.php | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Accessories/AccessoriesController.php b/app/Http/Controllers/Accessories/AccessoriesController.php index 3bebf895c..737f972c4 100755 --- a/app/Http/Controllers/Accessories/AccessoriesController.php +++ b/app/Http/Controllers/Accessories/AccessoriesController.php @@ -192,7 +192,7 @@ class AccessoriesController extends Controller if ($accessory->checkouts_count > 0) { - return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.assoc_checkouts', ['count' => $accessory->checkouts_count])); + return redirect()->route('accessories.index')->with('error', trans('admin/accessories/general.delete_disabled')); } if ($accessory->image) { diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.php index e859110f8..53ad49cd8 100644 --- a/app/Http/Controllers/Api/AccessoriesController.php +++ b/app/Http/Controllers/Api/AccessoriesController.php @@ -253,7 +253,7 @@ class AccessoriesController extends Controller $this->authorize($accessory); if ($accessory->checkouts_count > 0) { - return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/message.assoc_checkouts', ['count' => $accessory->checkouts_count]))); + return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/general.delete_disabled'))); } $accessory->delete(); diff --git a/resources/lang/en-US/admin/accessories/message.php b/resources/lang/en-US/admin/accessories/message.php index 693203c21..f60d41957 100644 --- a/resources/lang/en-US/admin/accessories/message.php +++ b/resources/lang/en-US/admin/accessories/message.php @@ -5,7 +5,6 @@ return array( 'does_not_exist' => 'The accessory [:id] does not exist.', 'not_found' => 'That accessory was not found.', 'assoc_users' => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ', - 'assoc_checkouts' => 'This accessory currently has :count items checked out. Please check in the accessories and and try again.', 'create' => array( 'error' => 'The accessory was not created, please try again.',