From b63c9a8cd4cc2a1202450cf2f3610c0dba624ab1 Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Fri, 18 May 2018 14:30:59 -0500 Subject: [PATCH] Move frontend.auth.* to auth.* --- resources/lang/en/auth.php | 35 +++++++++++-------- resources/lang/it/auth.php | 35 +++++++++++-------- .../layouts/default/acars/index.blade.php | 2 +- .../layouts/default/auth/login.blade.php | 12 +++---- .../layouts/default/auth/pending.blade.php | 4 +-- .../layouts/default/auth/register.blade.php | 14 ++++---- .../layouts/default/auth/registered.blade.php | 6 ++-- .../layouts/default/auth/rejected.blade.php | 4 +-- .../layouts/default/auth/suspended.blade.php | 4 +-- .../layouts/default/dashboard/index.blade.php | 2 +- .../layouts/default/flights/search.blade.php | 2 +- .../layouts/default/flights/table.blade.php | 4 +-- .../layouts/default/pireps/fields.blade.php | 14 ++++---- .../layouts/default/profile/index.blade.php | 2 +- 14 files changed, 75 insertions(+), 65 deletions(-) diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php index e5506df2..0a0f02f2 100755 --- a/resources/lang/en/auth.php +++ b/resources/lang/en/auth.php @@ -1,19 +1,24 @@ 'These credentials do not match our records.', - 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', - + 'failed' => 'These credentials do not match our records.', + 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', + 'login' => 'Log In', + 'password' => 'Password', + 'createaccount' => 'Create Account', + 'forgotpassword' => 'Forgot Password', + 'fullname' => 'Full Name', + 'emailaddress' => 'Email Address', + 'fillcaptcha' => 'Fill out the captcha', + 'tocaccept' => 'By registering, you agree to the Terms and Conditions.', + 'register' => 'Register', + 'registrationpending' => 'Registration Pending', + 'pendingmessage' => 'Your registration is pending approval. Please check your email!', + 'registrationsubmitted' => 'Registration Submitted', + 'registrationconfirmation' => 'Registration Confirmation', + 'confirmationmessage' => 'Your application has been submitted. It requires staff member approval, once a\nstaff member has reviewed your application, you will receive a confirmation email.', + 'registrationdenied' => 'Registration Denied', + 'deniedmessage' => 'Your registration was denied. Please contact an administrator.', + 'accountsuspended' => 'Account Suspended', + 'suspendedmessage' => 'Your account has been suspended. Please contact an administrator.', ]; diff --git a/resources/lang/it/auth.php b/resources/lang/it/auth.php index be64a90c..fb7b4ec3 100644 --- a/resources/lang/it/auth.php +++ b/resources/lang/it/auth.php @@ -1,19 +1,24 @@ 'Queste credenziali non sono presenti nei nostri archivi.', - 'throttle' => 'Troppi tentativi di login. Tenta di nuovo tra :seconds secondi per favore.', - + 'failed' => 'Queste credenziali non sono presenti nei nostri archivi.', + 'throttle' => 'Troppi tentativi di login. Tenta di nuovo tra :seconds secondi per favore.', + 'login' => 'Accedi', + 'password' => 'Password', + 'createaccount' => 'Crea Account', + 'forgotpassword' => 'Password Dimenticata', + 'fullname' => 'Nome Completo', + 'emailaddress' => 'Indirizzo Email', + 'fillcaptcha' => 'Compila la captcha', + 'tocaccept' => 'Registrandoti confermi di accettare i Termini e le Condizioni di Utilizzo.', + 'register' => 'Registrati', + 'registrationpending' => 'Registrazione in Sospeso', + 'pendingmessage' => 'La tua registrazione è in attesa di approvazione. Controlla la tua email per favore.', + 'registrationsubmitted' => 'Registrazione Inviata', + 'registrationconfirmation' => 'Conferma di Registrazione', + 'confirmationmessage' => 'La tua richiesta è stata inviata e richiede l\'approvazione di un membro dello staff. Quando\nverrà esaminata, riceverai una email di conferma.', + 'registrationdenied' => 'Registrazione Negata', + 'deniedmessage' => 'La tua registrazione è stata rifiutata. Contatta un amministratore per favore.', + 'accountsuspended' => 'Account Sospeso', + 'suspendedmessage' => 'Il tuo account è stato sospeso. Contatta un amministratore per favore.', ]; diff --git a/resources/views/layouts/default/acars/index.blade.php b/resources/views/layouts/default/acars/index.blade.php index 2093eb12..5474abb3 100644 --- a/resources/views/layouts/default/acars/index.blade.php +++ b/resources/views/layouts/default/acars/index.blade.php @@ -1,5 +1,5 @@ @extends('app') -@section('title', trans('frontend.global.livemap')) +@section('title', __('common.livemap')) @section('content') {{ Widget::liveMap() }} diff --git a/resources/views/layouts/default/auth/login.blade.php b/resources/views/layouts/default/auth/login.blade.php index 6426f5b5..056ad9e5 100644 --- a/resources/views/layouts/default/auth/login.blade.php +++ b/resources/views/layouts/default/auth/login.blade.php @@ -1,5 +1,5 @@ @extends('auth.layout') -@section('title', trans('frontend.global.login')) +@section('title', __('auth.login')) @section('content')
@@ -18,7 +18,7 @@ {{ Form::text('email', old('email'), [ 'id' => 'email', - 'placeholder' => trans('frontend.global.email'), + 'placeholder' => __('common.email'), 'class' => 'form-control', 'required' => true, ]) @@ -38,7 +38,7 @@ Form::password('password', [ 'name' => 'password', 'class' => 'form-control', - 'placeholder' => trans('frontend.auth.password'), + 'placeholder' => __('auth.password'), 'required' => true, ]) }} @@ -51,16 +51,16 @@
- +
- @lang('frontend.auth.createaccount') + @lang('auth.createaccount')
- @lang('frontend.auth.forgotpassword')? + @lang('auth.forgotpassword')?
{{ Form::close() }} diff --git a/resources/views/layouts/default/auth/pending.blade.php b/resources/views/layouts/default/auth/pending.blade.php index 611bf173..cc29d2b3 100644 --- a/resources/views/layouts/default/auth/pending.blade.php +++ b/resources/views/layouts/default/auth/pending.blade.php @@ -1,12 +1,12 @@ @extends('app') -@section('title', trans('frontend.auth.registrationpending')) +@section('title', __('auth.registrationpending')) @section('content')
-

@lang('frontend.auth.pendingmessage')

+

@lang('auth.pendingmessage')

diff --git a/resources/views/layouts/default/auth/register.blade.php b/resources/views/layouts/default/auth/register.blade.php index d71f843d..0398e44b 100644 --- a/resources/views/layouts/default/auth/register.blade.php +++ b/resources/views/layouts/default/auth/register.blade.php @@ -1,5 +1,5 @@ @extends('app') -@section('title', trans('frontend.global.register')) +@section('title', __('auth.register')) @section('content')
@@ -11,7 +11,7 @@