Merge pull request pterodactyl#1128 from stanjg/feature/user-specific-language

Add support for user specific languages

Author: DaneEveritt

.env.example

@@ -7,6 +7,7 @@ APP_CLEAR_TASKLOG=720
 APP_DELETE_MINUTES=10
 APP_ENVIRONMENT_ONLY=true
 LOG_CHANNEL=daily
+APP_LOCALE=en
 
 DB_HOST=127.0.0.1
 DB_PORT=3306
@@ -27,4 +28,4 @@ MAIL_FROM=no-reply@example.com
 
 QUEUE_HIGH=high
 QUEUE_STANDARD=standard
-QUEUE_LOW=low
+QUEUE_LOW=low

.gitignore

@@ -27,5 +27,7 @@ misc
 .phpstorm.meta.php
 .php_cs.cache
 
+coverage.xml
+
 # Vagrant
 *.log

CHANGELOG.md

@@ -12,6 +12,9 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 ### Changed
 * Egg and server variable values are no longer limited to 191 characters. Turns out some games require a large number of characters in these fields.
 
+### Added
+* Users can now select their preferred language in their account settings.
+
 ## v0.7.9 (Derelict Dermodactylus)
 ### Fixed
 * Fixes a two-factor authentication bypass present in the password reset process for an account.

app/Http/Controllers/Base/AccountController.php

@@ -8,10 +8,13 @@
 use Illuminate\Contracts\Session\Session;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Services\Users\UserUpdateService;
+use Pterodactyl\Traits\Helpers\AvailableLanguages;
 use Pterodactyl\Http\Requests\Base\AccountDataFormRequest;
 
 class AccountController extends Controller
 {
+    use AvailableLanguages;
+
     /**
      * @var \Prologue\Alerts\AlertsMessageBag
      */
@@ -48,7 +51,9 @@ public function __construct(AlertsMessageBag $alert, AuthManager $authManager, U
      */
     public function index()
     {
-        return view('base.account');
+        return view('base.account', [
+            'languages' => $this->getAvailableLanguages(true),
+        ]);
     }
 
     /**
@@ -70,7 +75,7 @@ public function update(AccountDataFormRequest $request)
             if ($request->input('do_action') === 'email') {
                 $data = ['email' => $request->input('new_email')];
             } elseif ($request->input('do_action') === 'identity') {
-                $data = $request->only(['name_first', 'name_last', 'username']);
+                $data = $request->only(['name_first', 'name_last', 'username', 'language']);
             } else {
                 $data = [];
             }

app/Http/Middleware/LanguageMiddleware.php

@@ -1,18 +1,10 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Http\Middleware;
 
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Foundation\Application;
-use Illuminate\Contracts\Config\Repository;
 
 class LanguageMiddleware
 {
@@ -21,33 +13,26 @@ class LanguageMiddleware
      */
     private $app;
 
-    /**
-     * @var \Illuminate\Contracts\Config\Repository
-     */
-    private $config;
-
     /**
      * LanguageMiddleware constructor.
      *
-     * @param \Illuminate\Foundation\Application      $app
-     * @param \Illuminate\Contracts\Config\Repository $config
+     * @param \Illuminate\Foundation\Application $app
      */
-    public function __construct(Application $app, Repository $config)
+    public function __construct(Application $app)
     {
         $this->app = $app;
-        $this->config = $config;
     }
 
     /**
-     * Handle an incoming request.
+     * Handle an incoming request and set the user's preferred language.
      *
      * @param \Illuminate\Http\Request $request
      * @param \Closure                 $next
      * @return mixed
      */
     public function handle(Request $request, Closure $next)
     {
-        $this->app->setLocale($this->config->get('app.locale', 'en'));
+        $this->app->setLocale($request->user()->language ?? config('app.locale', 'en'));
 
         return $next($request);
     }

resources/lang/en/base.php

@@ -69,6 +69,7 @@
         'last_name' => 'Last Name',
         'update_identity' => 'Update Identity',
         'username_help' => 'Your username must be unique to your account, and may only contain the following characters: :requirements.',
+        'language' => 'Language',
     ],
     'security' => [
         'session_mgmt_disabled' => 'Your host has not enabled the ability to manage account sessions via this interface.',