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

Fix phraseapp and move config location

Browse source
This commit is contained in:
Dane Everitt 2017-03-19 11:55:36 -04:00
parent a554f242a8
commit da19749098
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
5 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Providers/PhraseAppTranslationProvider.php
View file

@ -47,7 +47,7 @@ class PhraseAppTranslationProvider extends TranslationServiceProvider
// configuration so we can easily get both of these values from there.
$locale = $app['config']['app.locale'];
if ($app['config']['app.phrase_in_context']) {
if ($app['config']['pterodactyl.lang.in_context']) {
$trans = new PhraseAppTranslator($loader, $locale);
} else {
$trans = new IlluminateTranslator($loader, $locale);

2
config/app.php
View file

@ -6,8 +6,6 @@ return [
'version' => env('APP_VERSION', 'canary'),
'phrase_in_context' => env('PHRASE_IN_CONTEXT', false),
/*
|--------------------------------------------------------------------------
| Application Debug Mode

12
config/pterodactyl.php
View file

@ -91,4 +91,16 @@ return [
'cache' => 60,
'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),
],
];

2
resources/themes/pterodactyl/layouts/auth.blade.php
View file

@ -60,6 +60,6 @@
{!! Theme::js('vendor/jquery/jquery.min.js') !!}
{!! Theme::js('vendor/bootstrap/bootstrap.min.js') !!}
@if(config('app.phrase_in_context')) {!! Theme::js('vendor/phraseapp/phraseapp.js') !!} @endif
@if(config('pterodactyl.lang.in_context')) {!! Theme::js('vendor/phraseapp/phraseapp.js') !!} @endif
</body>
</html>

5
resources/themes/pterodactyl/layouts/master.blade.php
View file

@ -278,8 +278,9 @@
{!! Theme::js('vendor/adminlte/app.min.js') !!}
{!! Theme::js('vendor/socketio/socket.io.min.js') !!}
{!! Theme::js('vendor/bootstrap-notify/bootstrap-notify.min.js') !!}
@if(config('app.phrase_in_context')) {!! Theme::js('js/phraseapp.js') !!} @endif
@if(config('pterodactyl.lang.in_context'))
{!! Theme::js('vendor/phraseapp/phraseapp.js') !!}
@endif
@show
</body>
</html>