From 2349f54013640f2d47d3d33e71e8165df2d80ae8 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 13 Feb 2023 13:30:36 -0800 Subject: [PATCH 1/2] Use translation strings for importer exceptions --- app/Http/Controllers/Api/ImportController.php | 4 ++-- resources/lang/en/admin/hardware/message.php | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/ImportController.php b/app/Http/Controllers/Api/ImportController.php index 9820b9ca0..2426a49be 100644 --- a/app/Http/Controllers/Api/ImportController.php +++ b/app/Http/Controllers/Api/ImportController.php @@ -73,7 +73,7 @@ class ImportController extends Controller Helper::formatStandardApiResponse( 'error', null, - 'One or more attributes in the header row contain malformed UTF-8 characters' + trans('admin/hardware/message.import.header_row_has_malformed_characters') ), 422 ); @@ -106,7 +106,7 @@ class ImportController extends Controller Helper::formatStandardApiResponse( 'error', null, - 'One or more attributes in row 2 contain malformed UTF-8 characters' + trans('admin/hardware/message.import.content_row_has_malformed_characters') ), 422 ); diff --git a/resources/lang/en/admin/hardware/message.php b/resources/lang/en/admin/hardware/message.php index d2214ce00..429342e0e 100644 --- a/resources/lang/en/admin/hardware/message.php +++ b/resources/lang/en/admin/hardware/message.php @@ -49,6 +49,8 @@ return [ 'success' => 'Your file has been imported', 'file_delete_success' => 'Your file has been been successfully deleted', 'file_delete_error' => 'The file was unable to be deleted', + 'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters', + 'content_row_has_malformed_characters' => 'One or more attributes in row 2 contain malformed UTF-8 characters', ], From 4bdb1cf5527b70c215fbd0a3dd3e61bd083d54a3 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 13 Feb 2023 13:34:20 -0800 Subject: [PATCH 2/2] Improve error message wording --- resources/lang/en/admin/hardware/message.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en/admin/hardware/message.php b/resources/lang/en/admin/hardware/message.php index 429342e0e..fabbb6324 100644 --- a/resources/lang/en/admin/hardware/message.php +++ b/resources/lang/en/admin/hardware/message.php @@ -50,7 +50,7 @@ return [ 'file_delete_success' => 'Your file has been been successfully deleted', 'file_delete_error' => 'The file was unable to be deleted', 'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters', - 'content_row_has_malformed_characters' => 'One or more attributes in row 2 contain malformed UTF-8 characters', + 'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters', ],