From fb51659a048f41734dbb22a0790eea811ca5ba04 Mon Sep 17 00:00:00 2001
From: Oreo Oreoniv <28255085+zKoz210@users.noreply.github.com>
Date: Sun, 9 Dec 2018 14:27:30 +0300
Subject: [PATCH 1/3] Fixed checking of the language change

---
 app/Http/Requests/Base/AccountDataFormRequest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/Http/Requests/Base/AccountDataFormRequest.php b/app/Http/Requests/Base/AccountDataFormRequest.php
index 0d24b7a1..6fa95d5f 100644
--- a/app/Http/Requests/Base/AccountDataFormRequest.php
+++ b/app/Http/Requests/Base/AccountDataFormRequest.php
@@ -9,12 +9,16 @@
 
 namespace Pterodactyl\Http\Requests\Base;
 
+use Illuminate\Validation\Rule;
 use Pterodactyl\Models\User;
 use Pterodactyl\Http\Requests\FrontendUserFormRequest;
 use Pterodactyl\Exceptions\Http\Base\InvalidPasswordProvidedException;
+use Pterodactyl\Traits\Helpers\AvailableLanguages;
 
 class AccountDataFormRequest extends FrontendUserFormRequest
 {
+    use AvailableLanguages;
+
     /**
      * @return bool
      * @throws \Pterodactyl\Exceptions\Http\Base\InvalidPasswordProvidedException
@@ -59,6 +63,7 @@ class AccountDataFormRequest extends FrontendUserFormRequest
                     'name_first' => array_get($modelRules, 'name_first'),
                     'name_last' => array_get($modelRules, 'name_last'),
                     'username' => array_get($modelRules, 'username'),
+                    'language' => 'required|string|' . Rule::in(array_keys($this->getAvailableLanguages())),
                 ];
                 break;
             default:

From a4a758e2027233582512091066ce792d7a253367 Mon Sep 17 00:00:00 2001
From: Oreo Oreoniv <28255085+zKoz210@users.noreply.github.com>
Date: Sun, 9 Dec 2018 14:29:43 +0300
Subject: [PATCH 2/3] Fixed StyleCI

---
 app/Http/Requests/Base/AccountDataFormRequest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Requests/Base/AccountDataFormRequest.php b/app/Http/Requests/Base/AccountDataFormRequest.php
index 6fa95d5f..f4bc8578 100644
--- a/app/Http/Requests/Base/AccountDataFormRequest.php
+++ b/app/Http/Requests/Base/AccountDataFormRequest.php
@@ -9,11 +9,11 @@
 
 namespace Pterodactyl\Http\Requests\Base;
 
-use Illuminate\Validation\Rule;
 use Pterodactyl\Models\User;
+use Illuminate\Validation\Rule;
+use Pterodactyl\Traits\Helpers\AvailableLanguages;
 use Pterodactyl\Http\Requests\FrontendUserFormRequest;
 use Pterodactyl\Exceptions\Http\Base\InvalidPasswordProvidedException;
-use Pterodactyl\Traits\Helpers\AvailableLanguages;
 
 class AccountDataFormRequest extends FrontendUserFormRequest
 {

From c1fb38fb5e516f23908905500ea16d7a071feaa1 Mon Sep 17 00:00:00 2001
From: Oreo Oreoniv <28255085+zKoz210@users.noreply.github.com>
Date: Sun, 9 Dec 2018 14:40:03 +0300
Subject: [PATCH 3/3] Cleanup

---
 app/Http/Requests/Base/AccountDataFormRequest.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/Http/Requests/Base/AccountDataFormRequest.php b/app/Http/Requests/Base/AccountDataFormRequest.php
index f4bc8578..076cba9b 100644
--- a/app/Http/Requests/Base/AccountDataFormRequest.php
+++ b/app/Http/Requests/Base/AccountDataFormRequest.php
@@ -10,15 +10,11 @@
 namespace Pterodactyl\Http\Requests\Base;
 
 use Pterodactyl\Models\User;
-use Illuminate\Validation\Rule;
-use Pterodactyl\Traits\Helpers\AvailableLanguages;
 use Pterodactyl\Http\Requests\FrontendUserFormRequest;
 use Pterodactyl\Exceptions\Http\Base\InvalidPasswordProvidedException;
 
 class AccountDataFormRequest extends FrontendUserFormRequest
 {
-    use AvailableLanguages;
-
     /**
      * @return bool
      * @throws \Pterodactyl\Exceptions\Http\Base\InvalidPasswordProvidedException
@@ -63,7 +59,7 @@ class AccountDataFormRequest extends FrontendUserFormRequest
                     'name_first' => array_get($modelRules, 'name_first'),
                     'name_last' => array_get($modelRules, 'name_last'),
                     'username' => array_get($modelRules, 'username'),
-                    'language' => 'required|string|' . Rule::in(array_keys($this->getAvailableLanguages())),
+                    'language' => array_get($modelRules, 'language'),
                 ];
                 break;
             default: