From 507a69304526e741775663c00d99751cb09d01a4 Mon Sep 17 00:00:00 2001
From: Lance Pioch <git@lance.sh>
Date: Mon, 22 Oct 2018 18:46:18 -0400
Subject: [PATCH 01/12] Delete .phraseapp.yml

---
 .phraseapp.yml | 29 -----------------------------
 1 file changed, 29 deletions(-)
 delete mode 100644 .phraseapp.yml

diff --git a/.phraseapp.yml b/.phraseapp.yml
deleted file mode 100644
index 007c00ebb..000000000
--- a/.phraseapp.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-phraseapp:
-  project_id: 94f8b39450cd749ae9c3cc0ab8cdb61d
-  file_format: laravel
-  push:
-    sources:
-    - file: ./resources/lang/<locale_code>/<tag>.php
-  pull:
-    targets:
-    - file: ./resources/lang/<locale_code>/auth.php
-      params:
-        tag: "auth"
-    - file: ./resources/lang/<locale_code>/base.php
-      params:
-        tag: "base"
-    - file: ./resources/lang/<locale_code>/pagination.php
-      params:
-        tag: "pagination"
-    - file: ./resources/lang/<locale_code>/passwords.php
-      params:
-        tag: "passwords"
-    - file: ./resources/lang/<locale_code>/server.php
-      params:
-        tag: "server"
-    - file: ./resources/lang/<locale_code>/strings.php
-      params:
-        tag: "strings"
-    - file: ./resources/lang/<locale_code>/validation.php
-      params:
-        tag: "validation"

From 08fbe58b9c1cae20c5df3de1edee072ab50a3fe2 Mon Sep 17 00:00:00 2001
From: Lance Pioch <git@lance.sh>
Date: Mon, 22 Oct 2018 18:47:55 -0400
Subject: [PATCH 02/12] Update README.md

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 1bc66ca2c..5831a8709 100644
--- a/README.md
+++ b/README.md
@@ -41,8 +41,7 @@ In addition to our standard nest of supported games, our community is constantly
 * Discord ATLBot
 
 ## Credits
-A huge thank you to [PhraseApp](https://phraseapp.com) who provide us the software to help translate this project. This software would not be possible
-without the work of other open-source authors who provide tools such as:
+This software would not be possible without the work of other open-source authors who provide tools such as:
 
 [Ace Editor](https://ace.c9.io), [AdminLTE](https://almsaeedstudio.com), [Animate.css](http://daneden.github.io/animate.css/), [AnsiUp](https://github.com/drudru/ansi_up), [Async.js](https://github.com/caolan/async), 
 [Bootstrap](http://getbootstrap.com), [Bootstrap Notify](http://bootstrap-notify.remabledesigns.com), [Chart.js](http://www.chartjs.org), [FontAwesome](http://fontawesome.io),

From 5b1859ba6f98663e33215765e9cfe69d6d96e501 Mon Sep 17 00:00:00 2001
From: Lance Pioch <git@lance.sh>
Date: Wed, 24 Oct 2018 11:26:40 -0400
Subject: [PATCH 03/12] Delete phraseapp.js

---
 public/themes/pterodactyl/vendor/phraseapp/phraseapp.js | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 public/themes/pterodactyl/vendor/phraseapp/phraseapp.js

diff --git a/public/themes/pterodactyl/vendor/phraseapp/phraseapp.js b/public/themes/pterodactyl/vendor/phraseapp/phraseapp.js
deleted file mode 100644
index a11a22655..000000000
--- a/public/themes/pterodactyl/vendor/phraseapp/phraseapp.js
+++ /dev/null
@@ -1,8 +0,0 @@
-window.PHRASEAPP_CONFIG = {
-  projectId: '94f8b39450cd749ae9c3cc0ab8cdb61d'
-};
-(function() {
-    var phraseapp = document.createElement('script'); phraseapp.type = 'text/javascript'; phraseapp.async = true;
-    phraseapp.src = ['https://', 'phraseapp.com/assets/in-context-editor/2.0/app.js?', new Date().getTime()].join('');
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(phraseapp, s);
-})();

From 33f86a93a05d6674389f0726c5c543bbc538101e Mon Sep 17 00:00:00 2001
From: Lance Pioch <git@lance.sh>
Date: Wed, 24 Oct 2018 11:27:07 -0400
Subject: [PATCH 04/12] Update auth.blade.php

---
 resources/themes/pterodactyl/layouts/auth.blade.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/resources/themes/pterodactyl/layouts/auth.blade.php b/resources/themes/pterodactyl/layouts/auth.blade.php
index 0157864eb..108e1311f 100644
--- a/resources/themes/pterodactyl/layouts/auth.blade.php
+++ b/resources/themes/pterodactyl/layouts/auth.blade.php
@@ -60,7 +60,5 @@
                 particlesJS.load('particles-js', '{!! Theme::url('vendor/particlesjs/particles.json?t={cache-version}') !!}', function() {});
             })
         </script>
-
-        @if(config('pterodactyl.lang.in_context')) {!! Theme::js('vendor/phraseapp/phraseapp.js?t={cache-version}') !!} @endif
     </body>
 </html>

From e5cf512fed6b21ed2c75ce4e475e156885cc3ea9 Mon Sep 17 00:00:00 2001
From: Lance Pioch <git@lance.sh>
Date: Wed, 24 Oct 2018 11:27:47 -0400
Subject: [PATCH 05/12] Update master.blade.php

---
 resources/themes/pterodactyl/layouts/master.blade.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/resources/themes/pterodactyl/layouts/master.blade.php b/resources/themes/pterodactyl/layouts/master.blade.php
index 15d88b96b..f83a6f151 100644
--- a/resources/themes/pterodactyl/layouts/master.blade.php
+++ b/resources/themes/pterodactyl/layouts/master.blade.php
@@ -286,9 +286,6 @@
             {!! Theme::js('vendor/socketio/socket.io.v203.min.js?t={cache-version}') !!}
             {!! Theme::js('vendor/bootstrap-notify/bootstrap-notify.min.js?t={cache-version}') !!}
             {!! Theme::js('js/autocomplete.js?t={cache-version}') !!}
-            @if(config('pterodactyl.lang.in_context'))
-                {!! Theme::js('vendor/phraseapp/phraseapp.js?t={cache-version}') !!}
-            @endif
 
             @if(Auth::user()->root_admin)
                 <script>

From 74ca11c37dc61bddc5a7344db4390ee15e70a307 Mon Sep 17 00:00:00 2001
From: Lance Pioch <git@lance.sh>
Date: Wed, 24 Oct 2018 11:32:00 -0400
Subject: [PATCH 06/12] Delete PhraseAppTranslationProvider.php

---
 .../PhraseAppTranslationProvider.php          | 44 -------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 app/Providers/PhraseAppTranslationProvider.php

diff --git a/app/Providers/PhraseAppTranslationProvider.php b/app/Providers/PhraseAppTranslationProvider.php
deleted file mode 100644
index 1365bd021..000000000
--- a/app/Providers/PhraseAppTranslationProvider.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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\Providers;
-
-use Pterodactyl\Extensions\PhraseAppTranslator;
-use Illuminate\Translation\TranslationServiceProvider;
-use Illuminate\Translation\Translator as IlluminateTranslator;
-
-class PhraseAppTranslationProvider extends TranslationServiceProvider
-{
-    /**
-     * Register the service provider.
-     */
-    public function register()
-    {
-        $this->registerLoader();
-
-        $this->app->singleton('translator', function ($app) {
-            $loader = $app['translation.loader'];
-
-            // When registering the translator component, we'll need to set the default
-            // locale as well as the fallback locale. So, we'll grab the application
-            // configuration so we can easily get both of these values from there.
-            $locale = $app['config']['app.locale'];
-
-            if ($app['config']['pterodactyl.lang.in_context']) {
-                $trans = new PhraseAppTranslator($loader, $locale);
-            } else {
-                $trans = new IlluminateTranslator($loader, $locale);
-            }
-
-            $trans->setFallback($app['config']['app.fallback_locale']);
-
-            return $trans;
-        });
-    }
-}

From e0dfe31efc7db70fca4ddd54492c349cae97cb57 Mon Sep 17 00:00:00 2001
From: Lance Pioch <git@lance.sh>
Date: Wed, 24 Oct 2018 11:33:32 -0400
Subject: [PATCH 07/12] Remove phraseapp settings

---
 config/pterodactyl.php | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/config/pterodactyl.php b/config/pterodactyl.php
index e06c709ef..766ecd681 100644
--- a/config/pterodactyl.php
+++ b/config/pterodactyl.php
@@ -151,33 +151,6 @@ return [
         'url' => 'https://cdn.pterodactyl.io/releases/latest.json',
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | Language Editor
-    |--------------------------------------------------------------------------
-    |
-    | Set `PHRASE_IN_CONTEXT` to true to enable the PhaseApp in-context editor
-    | on this site which allows you to translate the panel, from the panel.
-    */
-    'lang' => [
-        'in_context' => env('PHRASE_IN_CONTEXT', false),
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Language Editor
-    |--------------------------------------------------------------------------
-    |
-    | Set `PHRASE_IN_CONTEXT` to true to enable the PhaseApp in-context editor
-    | on this site which allows you to translate the panel, from the panel.
-    */
-    'client_features' => [
-        'databases' => [
-            'enabled' => env('PTERODACTYL_CLIENT_DATABASES_ENABLED', true),
-            'allow_random' => env('PTERODACTYL_CLIENT_DATABASES_ALLOW_RANDOM', true),
-        ],
-    ],
-
     /*
     |--------------------------------------------------------------------------
     | File Editor

From fb133056411048e09f38f361b1b72338527f9d91 Mon Sep 17 00:00:00 2001
From: Lance Pioch <git@lance.sh>
Date: Wed, 24 Oct 2018 11:34:49 -0400
Subject: [PATCH 08/12] Delete PhraseAppTranslator.php

---
 app/Extensions/PhraseAppTranslator.php | 31 --------------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 app/Extensions/PhraseAppTranslator.php

diff --git a/app/Extensions/PhraseAppTranslator.php b/app/Extensions/PhraseAppTranslator.php
deleted file mode 100644
index 145f60392..000000000
--- a/app/Extensions/PhraseAppTranslator.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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\Extensions;
-
-use Illuminate\Translation\Translator as LaravelTranslator;
-
-class PhraseAppTranslator extends LaravelTranslator
-{
-    /**
-     * Get the translation for the given key.
-     *
-     * @param string      $key
-     * @param array       $replace
-     * @param string|null $locale
-     * @param bool        $fallback
-     * @return string
-     */
-    public function get($key, array $replace = [], $locale = null, $fallback = true)
-    {
-        $key = substr($key, strpos($key, '.') + 1);
-
-        return "{{__phrase_${key}__}}";
-    }
-}

From 76b835e392ee1bfdc213bf7de6b83c0ce792ede2 Mon Sep 17 00:00:00 2001
From: Lance Pioch <git@lance.sh>
Date: Wed, 24 Oct 2018 11:39:54 -0400
Subject: [PATCH 09/12] Remove PhraseAppTranslationProvider

---
 config/app.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/app.php b/config/app.php
index a92ab0362..df2ed62b5 100644
--- a/config/app.php
+++ b/config/app.php
@@ -179,7 +179,6 @@ return [
         Pterodactyl\Providers\HashidsServiceProvider::class,
         Pterodactyl\Providers\RouteServiceProvider::class,
         Pterodactyl\Providers\MacroServiceProvider::class,
-        Pterodactyl\Providers\PhraseAppTranslationProvider::class,
         Pterodactyl\Providers\RepositoryServiceProvider::class,
         Pterodactyl\Providers\ViewComposerServiceProvider::class,
 

From 03e15701acaeac644f1eb935d78ae1b561de9ead Mon Sep 17 00:00:00 2001
From: Lance Pioch <git@lance.sh>
Date: Wed, 24 Oct 2018 11:43:51 -0400
Subject: [PATCH 10/12] Restore this config and add a correct description

---
 config/pterodactyl.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/config/pterodactyl.php b/config/pterodactyl.php
index 766ecd681..3e74b8895 100644
--- a/config/pterodactyl.php
+++ b/config/pterodactyl.php
@@ -150,6 +150,20 @@ return [
         'cache_time' => 60,
         'url' => 'https://cdn.pterodactyl.io/releases/latest.json',
     ],
+    
+    /*
+    |--------------------------------------------------------------------------
+    | Client Features
+    |--------------------------------------------------------------------------
+    |
+    | Allow clients to create their own databases.
+    */
+    'client_features' => [
+        'databases' => [
+            'enabled' => env('PTERODACTYL_CLIENT_DATABASES_ENABLED', true),
+            'allow_random' => env('PTERODACTYL_CLIENT_DATABASES_ALLOW_RANDOM', true),
+        ],
+    ],
 
     /*
     |--------------------------------------------------------------------------

From 49281ac5e93b3897a56967680bc256bb71a81641 Mon Sep 17 00:00:00 2001
From: Lance Pioch <git@lance.sh>
Date: Wed, 24 Oct 2018 11:46:36 -0400
Subject: [PATCH 11/12] Fix spacing

---
 config/pterodactyl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/pterodactyl.php b/config/pterodactyl.php
index 3e74b8895..54be4346d 100644
--- a/config/pterodactyl.php
+++ b/config/pterodactyl.php
@@ -150,7 +150,7 @@ return [
         'cache_time' => 60,
         'url' => 'https://cdn.pterodactyl.io/releases/latest.json',
     ],
-    
+
     /*
     |--------------------------------------------------------------------------
     | Client Features

From fe4494a04093b9b42090b0ba5927ebeaa69017f5 Mon Sep 17 00:00:00 2001
From: Lance Pioch <git@lance.sh>
Date: Wed, 24 Oct 2018 12:22:33 -0400
Subject: [PATCH 12/12] Add vanilla translation provider

---
 config/app.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/app.php b/config/app.php
index df2ed62b5..f5bb491ae 100644
--- a/config/app.php
+++ b/config/app.php
@@ -166,6 +166,7 @@ return [
         Illuminate\Redis\RedisServiceProvider::class,
         Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
         Illuminate\Session\SessionServiceProvider::class,
+        Illuminate\Translation\TranslationServiceProvider::class,
         Illuminate\Validation\ValidationServiceProvider::class,
         Illuminate\View\ViewServiceProvider::class,