Skip to content

Commit 28f7a80

Browse files
authored
fix: exception localization (pterodactyl#3850)
resolves pterodactyl#3849
1 parent 49dd719 commit 28f7a80

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

app/Http/Controllers/Admin/UserController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public function view(User $user)
127127
public function delete(Request $request, User $user)
128128
{
129129
if ($request->user()->id === $user->id) {
130-
throw new DisplayException($this->translator->trans('admin/user.exceptions.user_has_servers'));
130+
throw new DisplayException($this->translator->get('admin/user.exceptions.user_has_servers'));
131131
}
132132

133133
$this->deletionService->handle($user);

app/Services/Nodes/NodeDeletionService.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Pterodactyl - Panel
45
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
@@ -62,7 +63,7 @@ public function handle($node)
6263

6364
$servers = $this->serverRepository->setColumns('id')->findCountWhere([['node_id', '=', $node]]);
6465
if ($servers > 0) {
65-
throw new HasActiveServersException($this->translator->trans('exceptions.node.servers_attached'));
66+
throw new HasActiveServersException($this->translator->get('exceptions.node.servers_attached'));
6667
}
6768

6869
return $this->repository->delete($node);

app/Services/Users/UserDeletionService.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Pterodactyl - Panel
45
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
@@ -62,7 +63,7 @@ public function handle($user)
6263

6364
$servers = $this->serverRepository->setColumns('id')->findCountWhere([['owner_id', '=', $user]]);
6465
if ($servers > 0) {
65-
throw new DisplayException($this->translator->trans('admin/user.exceptions.user_has_servers'));
66+
throw new DisplayException($this->translator->get('admin/user.exceptions.user_has_servers'));
6667
}
6768

6869
return $this->repository->delete($user);

0 commit comments

Comments
 (0)