sonot
/
PteroTheme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix phraseapp and move config location

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. // configuration so we can easily get both of these values from there.
$locale = $app['config']['app.locale']; $locale = $app['config']['app.locale'];
if ($app['config']['app.phrase_in_context']) { if ($app['config']['pterodactyl.lang.in_context']) {
$trans = new PhraseAppTranslator($loader, $locale); $trans = new PhraseAppTranslator($loader, $locale);
} else { } else {
$trans = new IlluminateTranslator($loader, $locale); $trans = new IlluminateTranslator($loader, $locale);

2
config/app.php
View File

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

12
config/pterodactyl.php
View File

@ -91,4 +91,16 @@ return [
'cache' => 60, 'cache' => 60,
'url' => 'https://cdn.pterodactyl.io/releases/latest.json', '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/jquery/jquery.min.js') !!}
{!! Theme::js('vendor/bootstrap/bootstrap.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> </body>
</html> </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/adminlte/app.min.js') !!}
{!! Theme::js('vendor/socketio/socket.io.min.js') !!} {!! Theme::js('vendor/socketio/socket.io.min.js') !!}
{!! Theme::js('vendor/bootstrap-notify/bootstrap-notify.min.js') !!} {!! Theme::js('vendor/bootstrap-notify/bootstrap-notify.min.js') !!}
@if(config('pterodactyl.lang.in_context'))
@if(config('app.phrase_in_context')) {!! Theme::js('js/phraseapp.js') !!} @endif {!! Theme::js('vendor/phraseapp/phraseapp.js') !!}
@endif
@show @show
</body> </body>
</html> </html>