better naming of PhraseApp related stuff
This commit is contained in:
parent
d9225e65df
commit
7f0608d412
|
@ -26,7 +26,7 @@ namespace Pterodactyl\Extensions;
|
||||||
|
|
||||||
use Illuminate\Translation\Translator as LaravelTranslator;
|
use Illuminate\Translation\Translator as LaravelTranslator;
|
||||||
|
|
||||||
class Translator extends LaravelTranslator
|
class PhraseAppTranslator extends LaravelTranslator
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Get the translation for the given key.
|
* Get the translation for the given key.
|
|
@ -24,11 +24,11 @@
|
||||||
|
|
||||||
namespace Pterodactyl\Providers;
|
namespace Pterodactyl\Providers;
|
||||||
|
|
||||||
use Pterodactyl\Extensions\Translator as PterodactylTranslator;
|
use Pterodactyl\Extensions\PhraseAppTranslator;
|
||||||
use Illuminate\Translation\Translator;
|
|
||||||
use Illuminate\Translation\TranslationServiceProvider;
|
use Illuminate\Translation\TranslationServiceProvider;
|
||||||
|
use Illuminate\Translation\Translator as IlluminateTranslator;
|
||||||
|
|
||||||
class TranslationProvider extends TranslationServiceProvider {
|
class PhraseAppTranslationProvider extends TranslationServiceProvider {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Register the service provider.
|
* Register the service provider.
|
||||||
|
@ -48,9 +48,9 @@ class TranslationProvider extends TranslationServiceProvider {
|
||||||
$locale = $app['config']['app.locale'];
|
$locale = $app['config']['app.locale'];
|
||||||
|
|
||||||
if ($app['config']['app.phrase_in_context']) {
|
if ($app['config']['app.phrase_in_context']) {
|
||||||
$trans = new PterodactylTranslator($loader, $locale);
|
$trans = new PhraseAppTranslator($loader, $locale);
|
||||||
} else {
|
} else {
|
||||||
$trans = new Translator($loader, $locale);
|
$trans = new IlluminateTranslator($loader, $locale);
|
||||||
}
|
}
|
||||||
|
|
||||||
$trans->setFallback($app['config']['app.fallback_locale']);
|
$trans->setFallback($app['config']['app.fallback_locale']);
|
|
@ -151,7 +151,7 @@ return [
|
||||||
Pterodactyl\Providers\AuthServiceProvider::class,
|
Pterodactyl\Providers\AuthServiceProvider::class,
|
||||||
Pterodactyl\Providers\EventServiceProvider::class,
|
Pterodactyl\Providers\EventServiceProvider::class,
|
||||||
Pterodactyl\Providers\RouteServiceProvider::class,
|
Pterodactyl\Providers\RouteServiceProvider::class,
|
||||||
Pterodactyl\Providers\TranslationProvider::class,
|
Pterodactyl\Providers\PhraseAppTranslationProvider::class,
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Additional Dependencies
|
* Additional Dependencies
|
||||||
|
|
Loading…
Reference in New Issue