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')

{{ Form::text('name', null, ['class' => 'form-control']) }} @@ -27,7 +27,7 @@

{{ $errors->first('email') }}

@endif - +
{{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
@@ -35,7 +35,7 @@

{{ $errors->first('airline_id') }}

@endif - +
{{ Form::select('home_airport_id', $airports, null , ['class' => 'form-control select2']) }}
@@ -43,7 +43,7 @@

{{ $errors->first('home_airport_id') }}

@endif - +
{{ Form::select('country', $countries, null, ['class' => 'form-control select2' ]) }}
@@ -51,7 +51,7 @@

{{ $errors->first('country') }}

@endif - +
{{ Form::select('timezone', $timezones, null, ['id'=>'timezone', 'class' => 'form-control select2' ]) }}
@@ -67,7 +67,7 @@

{{ $errors->first('password') }}

@endif - +
{{ 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 @@

{{ $user->flights }}

-
{{ trans_choice('frontend.global.flight', $user->flights) }}
+
{{ trans_choice('common.flight', $user->flights) }}
@@ -53,7 +53,7 @@ @else

{{ $user->home_airport_id }}

@endif -
@lang('frontend.global.currentairport')
+
@lang('common.currentairport')
@@ -105,7 +105,7 @@
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::submit(trans('frontend.global.find'), ['class' => 'btn btn-primary']) }}  - @lang('frontend.global.reset') + @lang('common.reset')
{{ 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 @@
- + + @if(filled($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)
@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 @@ @endif @@ -11,14 +11,14 @@ @@ -36,13 +36,13 @@ @@ -51,25 +51,25 @@ 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!
{{ Form::number('hours', null, [ 'class' => 'form-control', - 'placeholder' => trans_choice('frontend.global.hour', 2), + 'placeholder' => trans_choice('common.hour', 2), 'min' => '0', 'readonly' => (!empty($pirep) && $pirep->read_only), ]) }} {{ Form::number('minutes', null, [ 'class' => 'form-control', - 'placeholder' => trans_choice('frontend.global.minute', 2), + 'placeholder' => trans_choice('common.minute', 2), 'min' => 0, 'readonly' => (!empty($pirep) && $pirep->read_only), ]) }} @@ -234,7 +234,7 @@ flight reports that have been filed. You've been warned!
-  @lang('frontend.global.route') +  @lang('common.route')
@@ -250,13 +250,13 @@ flight reports that have been filed. You've been warned!
-  {{ trans_choice('frontend.global.remark', 2) }} +  {{ trans_choice('common.remark', 2) }}
- {{ Form::textarea('notes', null, ['class' => 'form-control', 'placeholder' => trans_choice('frontend.global.note', 2)]) }} + {{ Form::textarea('notes', null, ['class' => 'form-control', 'placeholder' => trans_choice('common.note', 2)]) }}

{{ $errors->first('notes') }}

@@ -269,7 +269,7 @@ flight reports that have been filed. You've been warned!
-  {{ trans_choice('frontend.global.field', 2) }} +  {{ trans_choice('common.field', 2) }}
diff --git a/resources/views/layouts/default/pireps/index.blade.php b/resources/views/layouts/default/pireps/index.blade.php index 5200bc38..e8b94d03 100644 --- a/resources/views/layouts/default/pireps/index.blade.php +++ b/resources/views/layouts/default/pireps/index.blade.php @@ -1,5 +1,5 @@ @extends('app') -@section('title', trans_choice('frontend.global.pirep', 2)) +@section('title', trans_choice('common.pirep', 2)) @section('content')
diff --git a/resources/views/layouts/default/pireps/pirep_card.blade.php b/resources/views/layouts/default/pireps/pirep_card.blade.php index a11d3b3d..ce95a252 100644 --- a/resources/views/layouts/default/pireps/pirep_card.blade.php +++ b/resources/views/layouts/default/pireps/pirep_card.blade.php @@ -5,7 +5,7 @@

@lang('frontend.global.edit') }} + ]) }}" class="btn btn-sm btn-info">@lang('common.edit') }}

@@ -45,7 +45,7 @@
- + diff --git a/resources/views/layouts/default/pireps/show.blade.php b/resources/views/layouts/default/pireps/show.blade.php index 0d3ee297..bf4cf56f 100644 --- a/resources/views/layouts/default/pireps/show.blade.php +++ b/resources/views/layouts/default/pireps/show.blade.php @@ -1,5 +1,5 @@ @extends('app') -@section('title', trans_choice('frontend.global.pirep', 1).' '.$pirep->ident) +@section('title', trans_choice('common.pirep', 1).' '.$pirep->ident) @section('content')
@@ -89,20 +89,20 @@ action="{{ route('frontend.pireps.edit', ['id' => $pirep->id]) }}" style="display: inline"> @csrf - +  
@csrf - +
@endif
@lang('frontend.global.departure')@lang('common.departure') {{ $flight->dpt_airport->name }} ( - @lang('frontend.global.route')@lang('common.route') {{ $flight->route }}
{{ trans_choice('frontend.global.note', 2) }}{{ trans_choice('common.note', 2) }} {{ $flight->notes }}
{{ Utils::minutesToTimeString($pirep->flight_time) }}
@lang('frontend.global.aircraft') @lang('common.aircraft')  {{ $pirep->aircraft->name }} ({{ $pirep->aircraft->registration }})
- + - + @@ -148,11 +148,11 @@ @endif @if(count($pirep->fields) > 0) -
{{ trans_choice('frontend.global.field', 2) }}
+
{{ trans_choice('common.field', 2) }}
@lang('frontend.global.status')@lang('common.status')
{{ PirepStatus::label($pirep->status) }} @@ -128,7 +128,7 @@
{{ trans_choice('frontend.global.note', 2) }}{{ trans_choice('common.note', 2) }} {{ $pirep->notes }}
- - + + @foreach($pirep->fields as $field) diff --git a/resources/views/layouts/default/pireps/table.blade.php b/resources/views/layouts/default/pireps/table.blade.php index 896ab401..e7c31fc6 100644 --- a/resources/views/layouts/default/pireps/table.blade.php +++ b/resources/views/layouts/default/pireps/table.blade.php @@ -3,12 +3,12 @@
@lang('frontend.global.name')@lang('frontend.global.value')@lang('common.name')@lang('common.value')
- - - - - - + + + + + + @@ -58,7 +58,7 @@ @if(!$pirep->read_only) @lang('frontend.global.edit') + ]) }}">@lang('common.edit') @endif diff --git a/resources/views/layouts/default/profile/fields.blade.php b/resources/views/layouts/default/profile/fields.blade.php index 4ac7e102..de73c49d 100644 --- a/resources/views/layouts/default/profile/fields.blade.php +++ b/resources/views/layouts/default/profile/fields.blade.php @@ -2,7 +2,7 @@
{{ trans_choice('frontend.global.flight', 1) }}@lang('frontend.global.departure')@lang('frontend.global.arrival')@lang('frontend.global.aircraft')@lang('frontend.global.flighttime')@lang('frontend.global.status'){{ trans_choice('common.flight', 1) }}@lang('common.departure')@lang('common.arrival')@lang('common.aircraft')@lang('common.flighttime')@lang('common.status') @lang('frontend.pireps.submitted')
- + - + - + - + - + - +
@lang('frontend.global.name')@lang('common.name')
{{ Form::text('name', null, ['class' => 'form-control']) }} @@ -14,7 +14,7 @@
@lang('frontend.global.email')@lang('common.email')
{{ Form::text('email', null, ['class' => 'form-control']) }} @@ -26,7 +26,7 @@
@lang('frontend.global.airline')@lang('common.airline')
{{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }} @@ -38,7 +38,7 @@
@lang('frontend.global.homeairport')@lang('common.homeairport')
{{ Form::select('home_airport_id', $airports, null , ['class' => 'form-control select2']) }} @@ -50,7 +50,7 @@
@lang('frontend.global.country')@lang('common.country')
{{ Form::select('country', $countries, null, ['class' => 'form-control select2' ]) }} @@ -62,7 +62,7 @@
@lang('frontend.global.timezone')@lang('common.timezone')
{{ Form::select('timezone', $timezones, null, ['class' => 'form-control select2' ]) }} @@ -84,7 +84,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/profile/index.blade.php b/resources/views/layouts/default/profile/index.blade.php index 7147e255..cea62529 100644 --- a/resources/views/layouts/default/profile/index.blade.php +++ b/resources/views/layouts/default/profile/index.blade.php @@ -23,7 +23,7 @@

@lang('frontend.profile.yourprofile')

- + @@ -75,7 +75,7 @@ - +
@lang('frontend.global.email')@lang('common.email') {{ $user->email }}
{{ $user->api_key }}
@lang('frontend.global.timezone')@lang('common.timezone') {{ $user->timezone }}
diff --git a/resources/views/layouts/default/users/index.blade.php b/resources/views/layouts/default/users/index.blade.php index 5605dcd9..e7572b78 100644 --- a/resources/views/layouts/default/users/index.blade.php +++ b/resources/views/layouts/default/users/index.blade.php @@ -1,10 +1,10 @@ @extends('app') -@section('title', trans_choice('frontend.global.pilot', 2)) +@section('title', trans_choice('common.pilot', 2)) @section('content')
-

{{ trans_choice('frontend.global.pilot', 2) }}

+

{{ trans_choice('common.pilot', 2) }}

@include('users.table')
diff --git a/resources/views/layouts/default/users/table.blade.php b/resources/views/layouts/default/users/table.blade.php index c3d7d8eb..951efbac 100644 --- a/resources/views/layouts/default/users/table.blade.php +++ b/resources/views/layouts/default/users/table.blade.php @@ -1,12 +1,12 @@ - + - + - - + + @foreach($users as $user) diff --git a/resources/views/layouts/default/widgets/live_map.blade.php b/resources/views/layouts/default/widgets/live_map.blade.php index 9252eb58..b826d0b0 100644 --- a/resources/views/layouts/default/widgets/live_map.blade.php +++ b/resources/views/layouts/default/widgets/live_map.blade.php @@ -37,7 +37,7 @@

- { pirep.dpt_airport.name } ({ pirep.dpt_airport.icao }) @lang('frontend.global.to') + { pirep.dpt_airport.name } ({ pirep.dpt_airport.icao }) @lang('common.to') { pirep.arr_airport.name } ({ pirep.arr_airport.icao })

@@ -50,9 +50,9 @@

- @lang('frontend.global.status'): { pirep.status_text }
- @lang('frontend.global.flighttime'): { pirep.flight_time | time_hm }
- @lang('frontend.global.distance'): { pirep.position.distance.{{setting('units.distance')}} } + @lang('common.status'): { pirep.status_text }
+ @lang('common.flighttime'): { pirep.flight_time | time_hm }
+ @lang('common.distance'): { pirep.position.distance.{{setting('units.distance')}} } / { pirep.planned_distance.{{setting('units.distance')}} }

@@ -78,14 +78,14 @@ and being mindful of the rivets bindings
@lang('frontend.global.name')@lang('common.name') @lang('frontend.global.airline')@lang('common.airline') @lang('frontend.users.location'){{ trans_choice('frontend.global.flight', 2) }}{{ trans_choice('frontend.global.hour', 2) }}{{ trans_choice('common.flight', 2) }}{{ trans_choice('common.hour', 2) }}
- - - - + + + + - + diff --git a/resources/views/layouts/default/widgets/weather.blade.php b/resources/views/layouts/default/widgets/weather.blade.php index 9e68c18d..27a588fc 100644 --- a/resources/views/layouts/default/widgets/weather.blade.php +++ b/resources/views/layouts/default/widgets/weather.blade.php @@ -49,7 +49,7 @@ https://api.checkwx.com/#metar-decoded - +
{{ trans_choice('frontend.global.Flight', 1) }}@lang('frontend.global.departure')@lang('frontend.global.arrival')@lang('frontend.global.aircraft'){{ trans_choice('common.Flight', 1) }}@lang('common.departure')@lang('common.arrival')@lang('common.aircraft') @lang('frontend.widgets.livemap.altitude') @lang('frontend.widgets.livemap.gs') @lang('frontend.widgets.livemap.distance')@lang('frontend.global.status') }}@lang('common.status') }}
@lang('frontend.widgets.weather.wind') - {{$metar['wind_speed']}} kts @lang('frontend.global.from') {{$metar['wind_direction_label']}} + {{$metar['wind_speed']}} kts @lang('common.from') {{$metar['wind_direction_label']}} ({{$metar['wind_direction']}}°) @if($metar['wind_gust_speed']) @lang('frontend.widgets.weather.guststo') {{ $metar['wind_gust_speed'] }} @@ -57,7 +57,7 @@ https://api.checkwx.com/#metar-decoded
@lang('frontend.global.metar')@lang('common.metar')
{{ $metar['raw'] }}