From e02ae682a8eaf1e5bea6315388faea9c77a3b8e5 Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Tue, 29 May 2018 09:16:07 -0500 Subject: [PATCH] lang fixes --- resources/lang/en/auth.php | 2 - resources/lang/en/common.php | 84 +++++++++--------- resources/lang/it/auth.php | 2 - resources/lang/it/common.php | 85 ++++++++++--------- .../layouts/default/auth/login.blade.php | 4 +- 5 files changed, 88 insertions(+), 89 deletions(-) diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php index c2943855..39f32de9 100755 --- a/resources/lang/en/auth.php +++ b/resources/lang/en/auth.php @@ -3,8 +3,6 @@ return [ 'failed' => 'These credentials do not match our records.', 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', - 'login' => 'Log In', - 'logout' => 'Log Out', 'password' => 'Password', 'createaccount' => 'Create Account', 'forgotpassword' => 'Forgot Password', diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php index 384575e6..b6ec12b4 100644 --- a/resources/lang/en/common.php +++ b/resources/lang/en/common.php @@ -4,47 +4,49 @@ */ return [ - 'dashboard' => 'Dashboard', - 'administration' => 'Administration', - 'flight' => 'Flight|Flights', - 'livemap' => 'Live Map', - 'pilot' => 'Pilot|Pilots', - 'pirep' => 'PIREP|PIREPs', - 'newestpilots' => 'Newest Pilots', - 'profile' => 'Profile', - 'email' => 'Email', - 'register' => 'Register', - 'timezone' => 'Timezone', - 'country' => 'Country', - 'download' => 'Download|Downloads', - 'from' => 'from', - 'to' => 'to', - 'status' => 'Status', - 'departure' => 'Departure', - 'arrival' => 'Arrival', - 'aircraft' => 'Aircraft', - 'airline' => 'Airline', - 'distance' => 'Distance', - 'metar' => 'METAR', - 'hour' => 'Hour|Hours', - 'minute' => 'Minute|Minutes', - 'note' => 'Note|Notes', - 'field' => 'Field|Fields', - 'name' => 'Name', - 'value' => 'Value|Values', - 'remark' => 'Remark|Remarks', - 'find' => 'Find', - 'reset' => 'Reset', - 'submit' => 'Submit', - 'edit' => 'Edit', - 'close' => 'Close', - 'whoops' => 'Whoops', - 'hello' => 'Hello', - 'regards' => 'Regards', - 'rightsreserved' => 'All Rights Reserved', - 'active' => 'Active', - 'inactive' => 'Inactive', - 'days' => [ + 'dashboard' => 'Dashboard', + 'administration' => 'Administration', + 'flight' => 'Flight|Flights', + 'livemap' => 'Live Map', + 'pilot' => 'Pilot|Pilots', + 'pirep' => 'PIREP|PIREPs', + 'newestpilots' => 'Newest Pilots', + 'profile' => 'Profile', + 'email' => 'Email', + 'register' => 'Register', + 'login' => 'Log In', + 'logout' => 'Log Out', + 'timezone' => 'Timezone', + 'country' => 'Country', + 'download' => 'Download|Downloads', + 'from' => 'from', + 'to' => 'to', + 'status' => 'Status', + 'departure' => 'Departure', + 'arrival' => 'Arrival', + 'aircraft' => 'Aircraft', + 'airline' => 'Airline', + 'distance' => 'Distance', + 'metar' => 'METAR', + 'hour' => 'Hour|Hours', + 'minute' => 'Minute|Minutes', + 'note' => 'Note|Notes', + 'field' => 'Field|Fields', + 'name' => 'Name', + 'value' => 'Value|Values', + 'remark' => 'Remark|Remarks', + 'find' => 'Find', + 'reset' => 'Reset', + 'submit' => 'Submit', + 'edit' => 'Edit', + 'close' => 'Close', + 'whoops' => 'Whoops', + 'hello' => 'Hello', + 'regards' => 'Regards', + 'rightsreserved' => 'All Rights Reserved', + 'active' => 'Active', + 'inactive' => 'Inactive', + 'days' => [ 'mon' => 'Monday', 'tues' => 'Tuesday', 'wed' => 'Wednesday', diff --git a/resources/lang/it/auth.php b/resources/lang/it/auth.php index fcbc5a60..08aa103f 100644 --- a/resources/lang/it/auth.php +++ b/resources/lang/it/auth.php @@ -3,8 +3,6 @@ return [ 'failed' => 'Queste credenziali non sono presenti nei nostri archivi.', 'throttle' => 'Troppi tentativi di login. Tenta di nuovo tra :seconds secondi per favore.', - 'login' => 'Accedi', - 'logout' => 'Uscita', 'password' => 'Password', 'createaccount' => 'Crea Account', 'forgotpassword' => 'Password Dimenticata', diff --git a/resources/lang/it/common.php b/resources/lang/it/common.php index 9ee9aede..a8f384aa 100644 --- a/resources/lang/it/common.php +++ b/resources/lang/it/common.php @@ -4,48 +4,49 @@ */ return [ - 'dashboard' => 'Dashboard', - 'administration' => 'Amministrazione', - 'flight' => 'Volo|Voli', - 'livemap' => 'Mappa Live', - 'pilot' => 'Pilota|Piloti', - 'pirep' => 'PIREP|PIREPs', - 'newestpilots' => 'Ultimi Piloti', - 'profile' => 'Profilo', - 'email' => 'Email', - 'login' => 'Accesso', - 'register' => 'Registrazione', - 'timezone' => 'Fuso Orario', - 'country' => 'Paese', - 'download' => 'Download|Downloads', - 'from' => 'da', - 'to' => 'a', - 'status' => 'Stato', - 'departure' => 'Partenza', - 'arrival' => 'Arrivo', - 'aircraft' => 'Aereomobile', - 'airline' => 'Compagnia Aerea', - 'distance' => 'Distanza', - 'metar' => 'METAR', - 'hour' => 'Ora|Ore', - 'minute' => 'Minuto|Minuti', - 'note' => 'Nota|Note', - 'field' => 'Campo|Campi', - 'name' => 'Nome', - 'value' => 'Valore|Valori', - 'remark' => 'Promemoria|Promemoria', - 'find' => 'Trova', - 'reset' => 'Resetta', - 'submit' => 'Invia', - 'edit' => 'Modifica', - 'close' => 'Chiudi', - 'whoops' => 'Ops', - 'hello' => 'Ciao', - 'regards' => 'Saluti', - 'rightsreserved' => 'Tutti i Diritti Riservati', - 'active' => 'Attivo', - 'inactive' => 'Inattivo', - 'days' => [ + 'dashboard' => 'Dashboard', + 'administration' => 'Amministrazione', + 'flight' => 'Volo|Voli', + 'livemap' => 'Mappa Live', + 'pilot' => 'Pilota|Piloti', + 'pirep' => 'PIREP|PIREPs', + 'newestpilots' => 'Ultimi Piloti', + 'profile' => 'Profilo', + 'email' => 'Email', + 'login' => 'Accesso', + 'logout' => 'Uscita', + 'register' => 'Registrazione', + 'timezone' => 'Fuso Orario', + 'country' => 'Paese', + 'download' => 'Download|Downloads', + 'from' => 'da', + 'to' => 'a', + 'status' => 'Stato', + 'departure' => 'Partenza', + 'arrival' => 'Arrivo', + 'aircraft' => 'Aereomobile', + 'airline' => 'Compagnia Aerea', + 'distance' => 'Distanza', + 'metar' => 'METAR', + 'hour' => 'Ora|Ore', + 'minute' => 'Minuto|Minuti', + 'note' => 'Nota|Note', + 'field' => 'Campo|Campi', + 'name' => 'Nome', + 'value' => 'Valore|Valori', + 'remark' => 'Promemoria|Promemoria', + 'find' => 'Trova', + 'reset' => 'Resetta', + 'submit' => 'Invia', + 'edit' => 'Modifica', + 'close' => 'Chiudi', + 'whoops' => 'Ops', + 'hello' => 'Ciao', + 'regards' => 'Saluti', + 'rightsreserved' => 'Tutti i Diritti Riservati', + 'active' => 'Attivo', + 'inactive' => 'Inattivo', + 'days' => [ 'mon' => 'Lunedì', 'tues' => 'Martedì', 'wed' => 'Mercoledì', diff --git a/resources/views/layouts/default/auth/login.blade.php b/resources/views/layouts/default/auth/login.blade.php index 056ad9e5..4cc71361 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', __('auth.login')) +@section('title', __('common.login')) @section('content')
@@ -51,7 +51,7 @@
- +