DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-19 23:37:38 -07:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Use better error message

Browse source
This commit is contained in:
Marcus Moore 2024-07-17 16:28:26 -07:00
parent cfca1514c0
commit 81bffccf01
No known key found for this signature in database
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Livewire/Importer.php
View file

@ -529,8 +529,7 @@ class Importer extends Component
// for example having an import open in two tabs, deleting it, and then changing // for example having an import open in two tabs, deleting it, and then changing
// the import type in the other tab. The error message below wouldn't display in that case. // the import type in the other tab. The error message below wouldn't display in that case.
if (!$import) { if (!$import) {
// @todo: improve error message $this->message = trans('admin/hardware/message.import.file_already_deleted');
$this->message = trans('admin/hardware/message.import.file_delete_error');
$this->message_type = 'danger'; $this->message_type = 'danger';
return; return;

1
resources/lang/en-US/admin/hardware/message.php
View file

@ -58,6 +58,7 @@ return [
'file_delete_success' => 'Your file has been been successfully deleted', 'file_delete_success' => 'Your file has been been successfully deleted',
'file_delete_error' => 'The file was unable to be deleted', 'file_delete_error' => 'The file was unable to be deleted',
'file_missing' => 'The file selected is missing', 'file_missing' => 'The file selected is missing',
'file_already_deleted' => 'The file selected was already deleted',
'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters', '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 the first row of content 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',
], ],