Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: exception localization (#3850)

Browse source 
resolves #3849
This commit is contained in:
Alex 2022-01-15 18:10:37 +02:00 committed by GitHub
parent 49dd719117
commit 28f7a809a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Admin/UserController.php
View file

@ -127,7 +127,7 @@ class UserController extends Controller
public function delete(Request $request, User $user) public function delete(Request $request, User $user)
{ {
if ($request->user()->id === $user->id) { if ($request->user()->id === $user->id) {
throw new DisplayException($this->translator->trans('admin/user.exceptions.user_has_servers')); throw new DisplayException($this->translator->get('admin/user.exceptions.user_has_servers'));
} }
$this->deletionService->handle($user); $this->deletionService->handle($user);

3
app/Services/Nodes/NodeDeletionService.php
View file

@ -1,4 +1,5 @@
<?php <?php
/** /**
* Pterodactyl - Panel * Pterodactyl - Panel
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>. * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
@ -62,7 +63,7 @@ class NodeDeletionService
$servers = $this->serverRepository->setColumns('id')->findCountWhere([['node_id', '=', $node]]); $servers = $this->serverRepository->setColumns('id')->findCountWhere([['node_id', '=', $node]]);
if ($servers > 0) { if ($servers > 0) {
throw new HasActiveServersException($this->translator->trans('exceptions.node.servers_attached')); throw new HasActiveServersException($this->translator->get('exceptions.node.servers_attached'));
} }
return $this->repository->delete($node); return $this->repository->delete($node);

3
app/Services/Users/UserDeletionService.php
View file

@ -1,4 +1,5 @@
<?php <?php
/** /**
* Pterodactyl - Panel * Pterodactyl - Panel
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>. * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
@ -62,7 +63,7 @@ class UserDeletionService
$servers = $this->serverRepository->setColumns('id')->findCountWhere([['owner_id', '=', $user]]); $servers = $this->serverRepository->setColumns('id')->findCountWhere([['owner_id', '=', $user]]);
if ($servers > 0) { if ($servers > 0) {
throw new DisplayException($this->translator->trans('admin/user.exceptions.user_has_servers')); throw new DisplayException($this->translator->get('admin/user.exceptions.user_has_servers'));
} }
return $this->repository->delete($user); return $this->repository->delete($user);