diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php
new file mode 100644
index 00000000..b558d505
--- /dev/null
+++ b/resources/lang/en/common.php
@@ -0,0 +1,48 @@
+ 'Dashboard',
+ 'flight' => 'Flight|Flights',
+ 'livemap' => 'Live Map',
+ 'pilot' => 'Pilot|Pilots',
+ 'pirep' => 'PIREP|PIREPs',
+ 'newestpilots' => 'Newest Pilots',
+ 'profile' => 'Profile',
+ 'email' => 'Email',
+ 'register' => 'Register',
+ 'confirmpassword' => 'Confirm Password',
+ 'homeairport' => 'Home Airport',
+ 'currentairport' => 'Current Airport',
+ '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',
+ 'route' => 'Route',
+ 'flightnumber' => 'Flight Number',
+ 'flighttime' => 'Flight Time',
+ 'departureairport' => 'Departure Airport',
+ 'arrivalairport' => 'Arrival Airport',
+ 'field' => 'Field|Fields',
+ 'name' => 'Name',
+ 'value' => 'Value|Values',
+ 'remark' => 'Remark|Remarks',
+ 'find' => 'Find',
+ 'reset' => 'Reset',
+ 'submit' => 'Submit',
+ 'edit' => 'Edit',
+ 'close' => 'Close',
+];
diff --git a/resources/lang/en/nav.php b/resources/lang/en/nav.php
new file mode 100644
index 00000000..9d3c5823
--- /dev/null
+++ b/resources/lang/en/nav.php
@@ -0,0 +1,4 @@
+ 'Dashboard',
+ 'flight' => 'Volo|Voli',
+ 'livemap' => 'Mappa Live',
+ 'pilot' => 'Pilota|Piloti',
+ 'pirep' => 'PIREP|PIREPs',
+ 'newestpilots' => 'Ultimi Piloti',
+ 'profile' => 'Profilo',
+ 'email' => 'Email',
+ 'login' => 'Accesso',
+ 'register' => 'Registrazione',
+ 'confirmpassword' => 'Conferma Password',
+ 'homeairport' => 'Aeroporto di Casa',
+ 'currentairport' => 'Aeroporto Corrente',
+ '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',
+ 'route' => 'Rotta',
+ 'flightnumber' => 'Numero di Volo',
+ 'flighttime' => 'Tempo di Volo',
+ 'departureairport' => 'Aeroporto di Partenza',
+ 'arrivalairport' => 'Aeroporto d\'Arrivo',
+ 'field' => 'Campo|Campi',
+ 'name' => 'Nome',
+ 'value' => 'Valore|Valori',
+ 'remark' => 'Promemoria|Promemoria',
+ 'find' => 'Trova',
+ 'reset' => 'Resetta',
+ 'submit' => 'Invia',
+ 'edit' => 'Modifica',
+ 'close' => 'Chiudi',
+];
diff --git a/resources/views/layouts/default/airports/show.blade.php b/resources/views/layouts/default/airports/show.blade.php
index b40bce52..4563b6f6 100644
--- a/resources/views/layouts/default/airports/show.blade.php
+++ b/resources/views/layouts/default/airports/show.blade.php
@@ -28,7 +28,7 @@
{{-- There are files uploaded and a user is logged in--}}
@if(count($airport->files) > 0 && Auth::check())
-
{{ trans_choice('frontend.global.download', 2) }}
+ {{ trans_choice('common.download', 2) }}
@include('downloads.table', ['files' => $airport->files])
@endif
@@ -46,9 +46,9 @@
@lang('frontend.airports.ident')
- @lang('frontend.global.from')
- @lang('frontend.global.departure')
- @lang('frontend.global.arrival')
+ @lang('common.from')
+ @lang('common.departure')
+ @lang('common.arrival')
@foreach($inbound_flights as $flight)
@@ -81,9 +81,9 @@
@lang('frontend.airports.ident')
- @lang('frontend.global.to')
- @lang('frontend.global.departure')
- @lang('frontend.global.arrival')
+ @lang('common.to')
+ @lang('common.departure')
+ @lang('common.arrival')
@foreach($outbound_flights as $flight)
diff --git a/resources/views/layouts/default/auth/register.blade.php b/resources/views/layouts/default/auth/register.blade.php
index 7c0b611d..d71f843d 100644
--- a/resources/views/layouts/default/auth/register.blade.php
+++ b/resources/views/layouts/default/auth/register.blade.php
@@ -10,7 +10,7 @@
-
@lang('frontend.global.register')
+
@lang('common.register')
@lang('frontend.auth.fullname')
{{ Form::text('name', null, ['class' => 'form-control']) }}
@@ -27,7 +27,7 @@
{{ $errors->first('email') }}
@endif
-
@lang('frontend.global.airline')
+
@lang('common.airline')
{{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
@@ -35,7 +35,7 @@
{{ $errors->first('airline_id') }}
@endif
-
@lang('frontend.global.homeairport')
+
@lang('common.homeairport')
{{ Form::select('home_airport_id', $airports, null , ['class' => 'form-control select2']) }}
@@ -43,7 +43,7 @@
{{ $errors->first('home_airport_id') }}
@endif
-
@lang('frontend.global.country')
+
@lang('common.country')
{{ Form::select('country', $countries, null, ['class' => 'form-control select2' ]) }}
@@ -51,7 +51,7 @@
{{ $errors->first('country') }}
@endif
-
@lang('frontend.global.timezone')
+
@lang('common.timezone')
{{ Form::select('timezone', $timezones, null, ['id'=>'timezone', 'class' => 'form-control select2' ]) }}
@@ -67,7 +67,7 @@
{{ $errors->first('password') }}
@endif
-
@lang('frontend.global.confirmpassword')
+
@lang('common.confirmpassword')
{{ Form::password('password_confirmation', ['class' => 'form-control']) }}
diff --git a/resources/views/layouts/default/dashboard/index.blade.php b/resources/views/layouts/default/dashboard/index.blade.php
index fe17b964..3313fa00 100644
--- a/resources/views/layouts/default/dashboard/index.blade.php
+++ b/resources/views/layouts/default/dashboard/index.blade.php
@@ -14,7 +14,7 @@
-
{{ trans_choice('frontend.global.flight', $user->flights) }}
+
{{ trans_choice('common.flight', $user->flights) }}
@@ -53,7 +53,7 @@
@else
@endif
- @lang('frontend.global.currentairport')
+ @lang('common.currentairport')
@@ -105,7 +105,7 @@
- @lang('frontend.global.newestpilots')
+ @lang('common.newestpilots')
diff --git a/resources/views/layouts/default/downloads/index.blade.php b/resources/views/layouts/default/downloads/index.blade.php
index 53f1c1ef..8cd7aeb9 100644
--- a/resources/views/layouts/default/downloads/index.blade.php
+++ b/resources/views/layouts/default/downloads/index.blade.php
@@ -1,11 +1,11 @@
@extends('app')
-@section('title', trans_choice('frontend.global.download', 2))
+@section('title', trans_choice('common.download', 2))
@section('content')
@include('flash::message')
-
{{ trans_choice('frontend.global.download', 2) }}
+ {{ trans_choice('common.download', 2) }}
@if(!$grouped_files || \count($grouped_files) === 0)
diff --git a/resources/views/layouts/default/downloads/table.blade.php b/resources/views/layouts/default/downloads/table.blade.php
index c1942e63..8aee4891 100644
--- a/resources/views/layouts/default/downloads/table.blade.php
+++ b/resources/views/layouts/default/downloads/table.blade.php
@@ -9,7 +9,7 @@
@if($file->description)
- {{$file->description}}
@endif
-
{{ $file->download_count.' '.trans_choice('frontend.global.download', $file->download_count) }}
+
{{ $file->download_count.' '.trans_choice('common.download', $file->download_count) }}
@endforeach
diff --git a/resources/views/layouts/default/flash/modal.blade.php b/resources/views/layouts/default/flash/modal.blade.php
index ece0efa9..09262233 100644
--- a/resources/views/layouts/default/flash/modal.blade.php
+++ b/resources/views/layouts/default/flash/modal.blade.php
@@ -12,7 +12,7 @@
diff --git a/resources/views/layouts/default/flights/index.blade.php b/resources/views/layouts/default/flights/index.blade.php
index 07a61d57..2b2e142b 100644
--- a/resources/views/layouts/default/flights/index.blade.php
+++ b/resources/views/layouts/default/flights/index.blade.php
@@ -1,11 +1,11 @@
@extends('app')
-@section('title', trans_choice('frontend.global.flight', 2))
+@section('title', trans_choice('common.flight', 2))
@section('content')
@include('flash::message')
-
{{ $title ?? trans_choice('frontend.global.flight', 2) }}
+ {{ $title ?? trans_choice('common.flight', 2) }}
@include('flights.table')
diff --git a/resources/views/layouts/default/flights/search.blade.php b/resources/views/layouts/default/flights/search.blade.php
index 3064a717..4058419f 100644
--- a/resources/views/layouts/default/flights/search.blade.php
+++ b/resources/views/layouts/default/flights/search.blade.php
@@ -8,23 +8,23 @@
'class'=>'form-inline'
]) }}
-
@lang('frontend.global.flightnumber')
+
@lang('common.flightnumber')
{{ Form::text('flight_number', null, ['class' => 'form-control']) }}
-
@lang('frontend.global.departureairport')
+
@lang('common.departureairport')
{{ Form::select('dep_icao', $airports, null , ['class' => 'form-control']) }}
-
@lang('frontend.global.arrivalairport')
+
@lang('common.arrivalairport')
{{ Form::select('arr_icao', $airports, null , ['class' => 'form-control']) }}
{{ Form::close() }}
diff --git a/resources/views/layouts/default/flights/show.blade.php b/resources/views/layouts/default/flights/show.blade.php
index f8c72fd0..0f3c6f0e 100644
--- a/resources/views/layouts/default/flights/show.blade.php
+++ b/resources/views/layouts/default/flights/show.blade.php
@@ -1,5 +1,5 @@
@extends('app')
-@section('title', trans_choice('frontend.global.flight', 1).' '.$flight->ident)
+@section('title', trans_choice('common.flight', 1).' '.$flight->ident)
@section('content')
@@ -13,7 +13,7 @@
- @lang('frontend.global.departure')
+ @lang('common.departure')
{{ $flight->dpt_airport->name }}
(
- @lang('frontend.global.route')
+ @lang('common.route')
{{ $flight->route }}
@if(filled($flight->notes))
- {{ trans_choice('frontend.global.note', 2) }}
+ {{ trans_choice('common.note', 2) }}
{{ $flight->notes }}
@endif
@@ -65,18 +65,18 @@
-
{{$flight->dpt_airport_id}} @lang('frontend.global.metar')
+ {{$flight->dpt_airport_id}} @lang('common.metar')
{{ Widget::Weather([
'icao' => $flight->dpt_airport_id,
]) }}
- {{$flight->arr_airport_id}} @lang('frontend.global.metar')
+ {{$flight->arr_airport_id}} @lang('common.metar')
{{ Widget::Weather([
'icao' => $flight->arr_airport_id,
]) }}
@if ($flight->alt_airport_id)
- {{$flight->alt_airport_id}} @lang('frontend.global.metar')
+ {{$flight->alt_airport_id}} @lang('common.metar')
{{ Widget::Weather([
'icao' => $flight->alt_airport_id,
]) }}
diff --git a/resources/views/layouts/default/home.blade.php b/resources/views/layouts/default/home.blade.php
index db243feb..cfdd3965 100644
--- a/resources/views/layouts/default/home.blade.php
+++ b/resources/views/layouts/default/home.blade.php
@@ -8,7 +8,7 @@
-
@lang('frontend.global.newestpilots')
+
@lang('common.newestpilots')
@foreach($users as $user)
{{--
--}}
@@ -37,7 +37,7 @@
@endforeach
diff --git a/resources/views/layouts/default/nav.blade.php b/resources/views/layouts/default/nav.blade.php
index 8d9ebaad..3cfcc3a2 100644
--- a/resources/views/layouts/default/nav.blade.php
+++ b/resources/views/layouts/default/nav.blade.php
@@ -3,7 +3,7 @@
- @lang('frontend.global.dashboard')
+ @lang('common.dashboard')
@endif
@@ -11,14 +11,14 @@
- @lang('frontend.global.livemap')
+ @lang('common.livemap')
- {{ trans_choice('frontend.global.pilot', 2) }}
+ {{ trans_choice('common.pilot', 2) }}
@@ -36,13 +36,13 @@
- @lang('frontend.global.login')
+ @lang('common.login')
- @lang('frontend.global.register')
+ @lang('common.register')
@@ -51,25 +51,25 @@
- {{ trans_choice('frontend.global.flight', 2) }}
+ {{ trans_choice('common.flight', 2) }}
- {{ trans_choice('frontend.global.pirep', 2) }}
+ {{ trans_choice('common.pirep', 2) }}
- @lang('frontend.global.profile')
+ @lang('common.profile')
- {{ trans_choice('frontend.global.download', 2) }}
+ {{ trans_choice('common.download', 2) }}
diff --git a/resources/views/layouts/default/pireps/fields.blade.php b/resources/views/layouts/default/pireps/fields.blade.php
index e1f5922b..afcaad2b 100644
--- a/resources/views/layouts/default/pireps/fields.blade.php
+++ b/resources/views/layouts/default/pireps/fields.blade.php
@@ -99,7 +99,7 @@ flight reports that have been filed. You've been warned!
{{ Form::label('hours', trans('frontend.global.flighttime')) }}
@if(!empty($pirep) && $pirep->read_only)
- {{ $pirep->hours.' '.trans_choice('frontend.global.hour', $pirep->hours) }}, {{ $pirep->minutes.' '.trans_choice('frontend.global.minute', $pirep->minutes) }}
+ {{ $pirep->hours.' '.trans_choice('common.hour', $pirep->hours) }}, {{ $pirep->minutes.' '.trans_choice('common.minute', $pirep->minutes) }}
{{ Form::hidden('hours') }}
{{ Form::hidden('minutes') }}
@@ -107,14 +107,14 @@ flight reports that have been filed. You've been warned!