DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 06:04:08 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Fix strings for StatusLabels, they still referenced locations.

Browse source
This commit is contained in:
Daniel Meltzer 2016-05-24 17:54:44 -05:00
parent d6dc57286f
commit 293b8c0dea
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/StatuslabelsController.php
View file

@ -193,7 +193,7 @@ class StatuslabelsController extends Controller
if ($statuslabel->has_assets() > 0) { if ($statuslabel->has_assets() > 0) {
// Redirect to the asset management page // Redirect to the asset management page
return redirect()->to('admin/settings/statuslabels')->with('error', trans('admin/statuslabels/message.assoc_users')); return redirect()->to('admin/settings/statuslabels')->with('error', trans('admin/statuslabels/message.assoc_assets'));
} else { } else {
$statuslabel->delete(); $statuslabel->delete();

18
resources/lang/en/admin/statuslabels/message.php
View file

@ -2,24 +2,24 @@
return array( return array(
'does_not_exist' => 'Location does not exist.', 'does_not_exist' => 'Status Label does not exist.',
'assoc_users' => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ', 'assoc_assets' => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ',
'create' => array( 'create' => array(
'error' => 'Location was not created, please try again.', 'error' => 'Status Label was not created, please try again.',
'success' => 'Location created successfully.' 'success' => 'Status Label created successfully.'
), ),
'update' => array( 'update' => array(
'error' => 'Location was not updated, please try again', 'error' => 'Status Label was not updated, please try again',
'success' => 'Location updated successfully.' 'success' => 'Status Label updated successfully.'
), ),
'delete' => array( 'delete' => array(
'confirm' => 'Are you sure you wish to delete this status label?', 'confirm' => 'Are you sure you wish to delete this Status Label?',
'error' => 'There was an issue deleting the location. Please try again.', 'error' => 'There was an issue deleting the Status Label. Please try again.',
'success' => 'The location was deleted successfully.' 'success' => 'The Status Label was deleted successfully.'
) )
); );