Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better naming of PhraseApp related stuff

Browse source
This commit is contained in:
Jakob Schrettenbrunner 2017-02-02 23:14:53 +01:00
parent d9225e65df
commit 7f0608d412
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Extensions/Translator.php → app/Extensions/PhraseAppTranslator.php
View file

@ -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.

10
app/Providers/TranslationProvider.php → app/Providers/PhraseAppTranslationProvider.php
View file

@ -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']);

2
config/app.php
View file

@ -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