From 7f0608d412ae6e601154f5e7bbba62a062bfd393 Mon Sep 17 00:00:00 2001
From: Jakob Schrettenbrunner <dev@schrej.net>
Date: Thu, 2 Feb 2017 23:14:53 +0100
Subject: [PATCH] better naming of PhraseApp related stuff

---
 .../{Translator.php => PhraseAppTranslator.php}        |  2 +-
 ...onProvider.php => PhraseAppTranslationProvider.php} | 10 +++++-----
 config/app.php                                         |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename app/Extensions/{Translator.php => PhraseAppTranslator.php} (97%)
 rename app/Providers/{TranslationProvider.php => PhraseAppTranslationProvider.php} (86%)

diff --git a/app/Extensions/Translator.php b/app/Extensions/PhraseAppTranslator.php
similarity index 97%
rename from app/Extensions/Translator.php
rename to app/Extensions/PhraseAppTranslator.php
index 5a3edcf4f..0d755664d 100644
--- a/app/Extensions/Translator.php
+++ b/app/Extensions/PhraseAppTranslator.php
@@ -26,7 +26,7 @@ namespace Pterodactyl\Extensions;
 
 use Illuminate\Translation\Translator as LaravelTranslator;
 
-class Translator extends LaravelTranslator
+class PhraseAppTranslator extends LaravelTranslator
 {
     /**
      * Get the translation for the given key.
diff --git a/app/Providers/TranslationProvider.php b/app/Providers/PhraseAppTranslationProvider.php
similarity index 86%
rename from app/Providers/TranslationProvider.php
rename to app/Providers/PhraseAppTranslationProvider.php
index 474737b50..76de046ec 100644
--- a/app/Providers/TranslationProvider.php
+++ b/app/Providers/PhraseAppTranslationProvider.php
@@ -24,11 +24,11 @@
 
 namespace Pterodactyl\Providers;
 
-use Pterodactyl\Extensions\Translator as PterodactylTranslator;
-use Illuminate\Translation\Translator;
+use Pterodactyl\Extensions\PhraseAppTranslator;
 use Illuminate\Translation\TranslationServiceProvider;
+use Illuminate\Translation\Translator as IlluminateTranslator;
 
-class TranslationProvider extends TranslationServiceProvider {
+class PhraseAppTranslationProvider extends TranslationServiceProvider {
 
     /**
      * Register the service provider.
@@ -48,9 +48,9 @@ class TranslationProvider extends TranslationServiceProvider {
             $locale = $app['config']['app.locale'];
 
             if ($app['config']['app.phrase_in_context']) {
-                $trans = new PterodactylTranslator($loader, $locale);
+                $trans = new PhraseAppTranslator($loader, $locale);
             } else {
-                $trans = new Translator($loader, $locale);
+                $trans = new IlluminateTranslator($loader, $locale);
             }
 
             $trans->setFallback($app['config']['app.fallback_locale']);
diff --git a/config/app.php b/config/app.php
index abaabe25b..79bd1c07b 100644
--- a/config/app.php
+++ b/config/app.php
@@ -151,7 +151,7 @@ return [
         Pterodactyl\Providers\AuthServiceProvider::class,
         Pterodactyl\Providers\EventServiceProvider::class,
         Pterodactyl\Providers\RouteServiceProvider::class,
-        Pterodactyl\Providers\TranslationProvider::class,
+        Pterodactyl\Providers\PhraseAppTranslationProvider::class,
 
         /*
          * Additional Dependencies