diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php index c69c944579..eb7ae05c27 100644 --- a/resources/lang/en/admin/settings/general.php +++ b/resources/lang/en/admin/settings/general.php @@ -330,4 +330,8 @@ return [ 'setup_migration_create_user' => 'Next: Create User', 'ldap_settings_link' => 'LDAP Settings Page', 'slack_test' => 'Test Integration', + 'google_callback_help' => 'This should be entered as your calback URL in your Google OAuth app settings in your Google admin console.', + 'google_login' => 'Google Login Settings', + 'enable_google_login' => 'Enable Google login', + ]; diff --git a/resources/views/settings/google.blade.php b/resources/views/settings/google.blade.php index e9091cebb9..72fb5c2c0f 100644 --- a/resources/views/settings/google.blade.php +++ b/resources/views/settings/google.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - Google + {{ trans('admin/settings/general.google_login') }} @parent @stop @@ -27,7 +27,7 @@

- Google + {{ trans('admin/settings/general.google_login') }}

@@ -37,14 +37,12 @@
-
- {{ Form::label('google_login', 'Google Login') }} -
-
+ +
@@ -90,8 +88,8 @@ Redirect URL
-

{{ config('app.url') }}/google/callback

-

This should be entered as your calback URL in your Google OAuth app settings in your Google admin console.

+

{{ config('app.url') }}/google/callback

+

{{ trans('admin/settings/general.google_callback_help') }}