FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move frontend.global.* to common.*

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-05-18 14:18:12 -05:00
parent a747657642
commit 203b6496fc
25 changed files with 201 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
resources/lang/en/common.php Normal file
View File

@@ -0,0 +1,48 @@
<?php
/**
*
*/
return [
'dashboard' => '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',
];

4
resources/lang/en/nav.php Normal file
View File

@@ -0,0 +1,4 @@
<?php
/**
*
*/

49
resources/lang/it/common.php Normal file
View File

@@ -0,0 +1,49 @@
<?php
/**
*
*/
return [
'dashboard' => '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',
];

14
resources/views/layouts/default/airports/show.blade.php
View File

@@ -28,7 +28,7 @@
{{-- There are files uploaded and a user is logged in--}}
@if(count($airport->files) > 0 && Auth::check())
<div class="col-12">
<h3>{{ trans_choice('frontend.global.download', 2) }}</h3>
<h3>{{ trans_choice('common.download', 2) }}</h3>
@include('downloads.table', ['files' => $airport->files])
</div>
@endif
@@ -46,9 +46,9 @@
<thead>
<tr>
<th class="text-left">@lang('frontend.airports.ident')</th>
<th class="text-left">@lang('frontend.global.from')</th>
<th>@lang('frontend.global.departure')</th>
<th>@lang('frontend.global.arrival')</th>
<th class="text-left">@lang('common.from')</th>
<th>@lang('common.departure')</th>
<th>@lang('common.arrival')</th>
</tr>
</thead>
@foreach($inbound_flights as $flight)
@@ -81,9 +81,9 @@
<thead>
<tr>
<th class="text-left">@lang('frontend.airports.ident')</th>
<th class="text-left">@lang('frontend.global.to')</th>
<th>@lang('frontend.global.departure')</th>
<th>@lang('frontend.global.arrival')</th>
<th class="text-left">@lang('common.to')</th>
<th>@lang('common.departure')</th>
<th>@lang('common.arrival')</th>
</tr>
</thead>
@foreach($outbound_flights as $flight)

12
resources/views/layouts/default/auth/register.blade.php
View File

@@ -10,7 +10,7 @@
<div class="panel periodic-login">
<div class="panel-body">
<h2>@lang('frontend.global.register')</h2>
<h2>@lang('common.register')</h2>
<label for="name" class="control-label">@lang('frontend.auth.fullname')</label>
<div class="input-group form-group-no-border {{ $errors->has('name') ? 'has-danger' : '' }}">
{{ Form::text('name', null, ['class' => 'form-control']) }}
@@ -27,7 +27,7 @@
<p class="text-danger">{{ $errors->first('email') }}</p>
@endif
<label for="airline" class="control-label">@lang('frontend.global.airline')</label>
<label for="airline" class="control-label">@lang('common.airline')</label>
<div class="input-group form-group-no-border {{ $errors->has('airline') ? 'has-danger' : '' }}">
{{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
</div>
@@ -35,7 +35,7 @@
<p class="text-danger">{{ $errors->first('airline_id') }}</p>
@endif
<label for="home_airport" class="control-label">@lang('frontend.global.homeairport')</label>
<label for="home_airport" class="control-label">@lang('common.homeairport')</label>
<div class="input-group form-group-no-border {{ $errors->has('home_airport') ? 'has-danger' : '' }}">
{{ Form::select('home_airport_id', $airports, null , ['class' => 'form-control select2']) }}
</div>
@@ -43,7 +43,7 @@
<p class="text-danger">{{ $errors->first('home_airport_id') }}</p>
@endif
<label for="country" class="control-label">@lang('frontend.global.country')</label>
<label for="country" class="control-label">@lang('common.country')</label>
<div class="input-group form-group-no-border {{ $errors->has('country') ? 'has-danger' : '' }}">
{{ Form::select('country', $countries, null, ['class' => 'form-control select2' ]) }}
</div>
@@ -51,7 +51,7 @@
<p class="text-danger">{{ $errors->first('country') }}</p>
@endif
<label for="timezone" class="control-label">@lang('frontend.global.timezone')</label>
<label for="timezone" class="control-label">@lang('common.timezone')</label>
<div class="input-group form-group-no-border {{ $errors->has('timezone') ? 'has-danger' : '' }}">
{{ Form::select('timezone', $timezones, null, ['id'=>'timezone', 'class' => 'form-control select2' ]) }}
</div>
@@ -67,7 +67,7 @@
<p class="text-danger">{{ $errors->first('password') }}</p>
@endif
<label for="password_confirmation" class="control-label">@lang('frontend.global.confirmpassword')</label>
<label for="password_confirmation" class="control-label">@lang('common.confirmpassword')</label>
<div class="input-group form-group-no-border {{ $errors->has('password_confirmation') ? 'has-danger' : '' }}">
{{ Form::password('password_confirmation', ['class' => 'form-control']) }}
</div>

6
resources/views/layouts/default/dashboard/index.blade.php
View File

@@ -14,7 +14,7 @@
<i class="fas fa-plane icon"></i>
</div>
<h3 class="header">{{ $user->flights }}</h3>
<h5 class="description">{{ trans_choice('frontend.global.flight', $user->flights) }}</h5>
<h5 class="description">{{ trans_choice('common.flight', $user->flights) }}</h5>
</div>
</div>
</div>
@@ -53,7 +53,7 @@
@else
<h3 class="header">{{ $user->home_airport_id }}</h3>
@endif
<h5 class="description">@lang('frontend.global.currentairport')</h5>
<h5 class="description">@lang('common.currentairport')</h5>
</div>
</div>
</div>
@@ -105,7 +105,7 @@
<div class="card">
<div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
@lang('frontend.global.newestpilots')
@lang('common.newestpilots')
</div>
<div class="card-block">
<!-- Tab panes -->

4
resources/views/layouts/default/downloads/index.blade.php
View File

@@ -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')
<div class="row">
<div class="row-sm-12">
<h2>{{ trans_choice('frontend.global.download', 2) }}</h2>
<h2>{{ trans_choice('common.download', 2) }}</h2>
</div>
</div>
@if(!$grouped_files || \count($grouped_files) === 0)

2
resources/views/layouts/default/downloads/table.blade.php
View File

@@ -9,7 +9,7 @@
@if($file->description)
- {{$file->description}}
@endif
<span style="margin-left: 20px">{{ $file->download_count.' '.trans_choice('frontend.global.download', $file->download_count) }}</span>
<span style="margin-left: 20px">{{ $file->download_count.' '.trans_choice('common.download', $file->download_count) }}</span>
</li>
@endforeach
</ul>

2
resources/views/layouts/default/flash/modal.blade.php
View File

@@ -12,7 +12,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">@lang('frontend.global.close')</button>
<button type="button" class="btn btn-default" data-dismiss="modal">@lang('common.close')</button>
</div>
</div>
</div>

4
resources/views/layouts/default/flights/index.blade.php
View File

@@ -1,11 +1,11 @@
@extends('app')
@section('title', trans_choice('frontend.global.flight', 2))
@section('title', trans_choice('common.flight', 2))
@section('content')
<div class="row">
@include('flash::message')
<div class="col-md-9">
<h2>{{ $title ?? trans_choice('frontend.global.flight', 2) }}</h2>
<h2>{{ $title ?? trans_choice('common.flight', 2) }}</h2>
@include('flights.table')
</div>
<div class="col-md-3">

8
resources/views/layouts/default/flights/search.blade.php
View File

@@ -8,23 +8,23 @@
'class'=>'form-inline'
]) }}
<div>
<p>@lang('frontend.global.flightnumber')</p>
<p>@lang('common.flightnumber')</p>
{{ Form::text('flight_number', null, ['class' => 'form-control']) }}
</div>
<div style="margin-top: 10px;">
<p>@lang('frontend.global.departureairport')</p>
<p>@lang('common.departureairport')</p>
{{ Form::select('dep_icao', $airports, null , ['class' => 'form-control']) }}
</div>
<div style="margin-top: 10px;">
<p>@lang('frontend.global.arrivalairport')</p>
<p>@lang('common.arrivalairport')</p>
{{ Form::select('arr_icao', $airports, null , ['class' => 'form-control']) }}
</div>
<div class="clear" style="margin-top: 10px;">
{{ Form::submit(trans('frontend.global.find'), ['class' => 'btn btn-primary']) }}&nbsp;
<a href="{{ route('frontend.flights.index') }}">@lang('frontend.global.reset')</a>
<a href="{{ route('frontend.flights.index') }}">@lang('common.reset')</a>
</div>
{{ Form::close() }}
</div>

16
resources/views/layouts/default/flights/show.blade.php
View File

@@ -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')
<div class="row">
@@ -13,7 +13,7 @@
<div class="col-12">
<table class="table">
<tr>
<td>@lang('frontend.global.departure')</td>
<td>@lang('common.departure')</td>
<td>
{{ $flight->dpt_airport->name }}
(<a href="{{route('frontend.airports.show', [
@@ -24,7 +24,7 @@
</tr>
<tr>
<td>@lang('frontend.global.arrival')</td>
<td>@lang('common.arrival')</td>
<td>
{{ $flight->arr_airport->name }}
(<a href="{{route('frontend.airports.show', [
@@ -45,13 +45,13 @@
@endif
<tr>
<td>@lang('frontend.global.route')</td>
<td>@lang('common.route')</td>
<td>{{ $flight->route }}</td>
</tr>
@if(filled($flight->notes))
<tr>
<td>{{ trans_choice('frontend.global.note', 2) }}</td>
<td>{{ trans_choice('common.note', 2) }}</td>
<td>{{ $flight->notes }}</td>
</tr>
@endif
@@ -65,18 +65,18 @@
</div>
</div>
<div class="col-4">
<h5>{{$flight->dpt_airport_id}} @lang('frontend.global.metar')</h5>
<h5>{{$flight->dpt_airport_id}} @lang('common.metar')</h5>
{{ Widget::Weather([
'icao' => $flight->dpt_airport_id,
]) }}
<br />
<h5>{{$flight->arr_airport_id}} @lang('frontend.global.metar')</h5>
<h5>{{$flight->arr_airport_id}} @lang('common.metar')</h5>
{{ Widget::Weather([
'icao' => $flight->arr_airport_id,
]) }}
@if ($flight->alt_airport_id)
<br />
<h5>{{$flight->alt_airport_id}} @lang('frontend.global.metar')</h5>
<h5>{{$flight->alt_airport_id}} @lang('common.metar')</h5>
{{ Widget::Weather([
'icao' => $flight->alt_airport_id,
]) }}

4
resources/views/layouts/default/home.blade.php
View File

@@ -8,7 +8,7 @@
</div>
<div class="row">
<div class="col-sm-12">
<h2 class="description">@lang('frontend.global.newestpilots')</h2>
<h2 class="description">@lang('common.newestpilots')</h2>
@foreach($users as $user)
<div class="card card-signup blue-bg">
{{--<div class="card-bg">--}}
@@ -37,7 +37,7 @@
</div>
</div>
<div class="footer text-center">
<a href="{{ route('frontend.profile.show', ['id' => $user->id]) }}" class="btn btn-neutral btn-sm">@lang('frontend.global.profile')</a>
<a href="{{ route('frontend.profile.show', ['id' => $user->id]) }}" class="btn btn-neutral btn-sm">@lang('common.profile')</a>
</div>
</div>
@endforeach

18
resources/views/layouts/default/nav.blade.php
View File

@@ -3,7 +3,7 @@
<li class="nav-item">
<a class="nav-link" href="{{ route('frontend.dashboard.index') }}">
<i class="fas fa-tachometer-alt"></i>
<p>@lang('frontend.global.dashboard')</p>
<p>@lang('common.dashboard')</p>
</a>
</li>
@endif
@@ -11,14 +11,14 @@
<li class="nav-item">
<a class="nav-link" href="{{ route('frontend.livemap.index') }}">
<i class="fas fa-globe"></i>
<p>@lang('frontend.global.livemap')</p>
<p>@lang('common.livemap')</p>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ route('frontend.pilots.index') }}">
<i class="fas fa-users"></i>
<p>{{ trans_choice('frontend.global.pilot', 2) }}</p>
<p>{{ trans_choice('common.pilot', 2) }}</p>
</a>
</li>
@@ -36,13 +36,13 @@
<li class="nav-item">
<a class="nav-link" href="{{ url('/login') }}">
<i class="fas fa-sign-in-alt"></i>
<p>@lang('frontend.global.login')</p>
<p>@lang('common.login')</p>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ url('/register') }}">
<i class="far fa-id-card"></i>
<p>@lang('frontend.global.register')</p>
<p>@lang('common.register')</p>
</a>
</li>
@@ -51,25 +51,25 @@
<li class="nav-item">
<a class="nav-link" href="{{ route('frontend.flights.index') }}">
<i class="fab fa-avianex"></i>
<p>{{ trans_choice('frontend.global.flight', 2) }}</p>
<p>{{ trans_choice('common.flight', 2) }}</p>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ route('frontend.pireps.index') }}">
<i class="fas fa-cloud-upload-alt"></i>
<p>{{ trans_choice('frontend.global.pirep', 2) }}</p>
<p>{{ trans_choice('common.pirep', 2) }}</p>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ route('frontend.profile.index') }}">
<i class="far fa-user"></i>
<p>@lang('frontend.global.profile')</p>
<p>@lang('common.profile')</p>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ route('frontend.downloads.index') }}">
<i class="fas fa-download"></i>
<p>{{ trans_choice('frontend.global.download', 2) }}</p>
<p>{{ trans_choice('common.download', 2) }}</p>
</a>
</li>

14
resources/views/layouts/default/pireps/fields.blade.php
View File

@@ -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)
<p>
{{ $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') }}
</p>
@@ -107,14 +107,14 @@ flight reports that have been filed. You've been warned!
<div class="input-group input-group-sm" style="max-width: 200px;">
{{ 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!
<div class="form-container">
<h6><i class="far fa-comments"></i>
&nbsp;@lang('frontend.global.route')
&nbsp;@lang('common.route')
</h6>
<div class="form-container-body">
<div class="row">
@@ -250,13 +250,13 @@ flight reports that have been filed. You've been warned!
<div class="form-container">
<h6><i class="far fa-comments"></i>
&nbsp;{{ trans_choice('frontend.global.remark', 2) }}
&nbsp;{{ trans_choice('common.remark', 2) }}
</h6>
<div class="form-container-body">
<div class="row">
<div class="col">
<div class="input-group input-group-sm form-group">
{{ 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)]) }}
<p class="text-danger">{{ $errors->first('notes') }}</p>
</div>
</div>
@@ -269,7 +269,7 @@ flight reports that have been filed. You've been warned!
<div class="form-container">
<h6><i class="fab fa-wpforms"></i>
&nbsp;{{ trans_choice('frontend.global.field', 2) }}
&nbsp;{{ trans_choice('common.field', 2) }}
</h6>
<div class="form-container-body">

2
resources/views/layouts/default/pireps/index.blade.php
View File

@@ -1,5 +1,5 @@
@extends('app')
@section('title', trans_choice('frontend.global.pirep', 2))
@section('title', trans_choice('common.pirep', 2))
@section('content')
<div class="row">

4
resources/views/layouts/default/pireps/pirep_card.blade.php
View File

@@ -5,7 +5,7 @@
<p class="float-right">
<a href="{{ route('frontend.pireps.edit', [
'id' => $pirep->id,
]) }}" class="btn btn-sm btn-info">@lang('frontend.global.edit') }}</a>
]) }}" class="btn btn-sm btn-info">@lang('common.edit') }}</a>
</p>
<h5>
<a href="{{ route('frontend.pireps.show', [$pirep->id]) }}">
@@ -45,7 +45,7 @@
<td>{{ Utils::minutesToTimeString($pirep->flight_time) }}</td>
</tr>
<tr>
<td nowrap><span class="title">@lang('frontend.global.aircraft')&nbsp;</span></td>
<td nowrap><span class="title">@lang('common.aircraft')&nbsp;</span></td>
<td>{{ $pirep->aircraft->name }}
({{ $pirep->aircraft->registration }})</td>
</tr>

16
resources/views/layouts/default/pireps/show.blade.php
View File

@@ -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')
<div class="row">
@@ -89,20 +89,20 @@
action="{{ route('frontend.pireps.edit', ['id' => $pirep->id]) }}"
style="display: inline">
@csrf
<button class="btn btn-info">@lang('frontend.global.edit')</button>
<button class="btn btn-info">@lang('common.edit')</button>
</form>
&nbsp;
<form method="post"
action="{{ route('frontend.pireps.submit', ['id' => $pirep->id]) }}"
style="display: inline">
@csrf
<button class="btn btn-success">@lang('frontend.global.submit')</button>
<button class="btn btn-success">@lang('common.submit')</button>
</form>
</div>
@endif
<table class="table table-striped">
<tr>
<td width="30%">@lang('frontend.global.status')</td>
<td width="30%">@lang('common.status')</td>
<td>
<div class="badge badge-info">
{{ PirepStatus::label($pirep->status) }}
@@ -128,7 +128,7 @@
</tr>
<tr>
<td>{{ trans_choice('frontend.global.note', 2) }}</td>
<td>{{ trans_choice('common.note', 2) }}</td>
<td>
{{ $pirep->notes }}
</td>
@@ -148,11 +148,11 @@
@endif
@if(count($pirep->fields) > 0)
<h5>{{ trans_choice('frontend.global.field', 2) }}</h5>
<h5>{{ trans_choice('common.field', 2) }}</h5>
<table class="table table-hover table-condensed">
<thead>
<th>@lang('frontend.global.name')</th>
<th>@lang('frontend.global.value')</th>
<th>@lang('common.name')</th>
<th>@lang('common.value')</th>
</thead>
<tbody>
@foreach($pirep->fields as $field)

14
resources/views/layouts/default/pireps/table.blade.php
View File

@@ -3,12 +3,12 @@
<table class="table table-condensed table-hover">
<thead>
<tr>
<th>{{ trans_choice('frontend.global.flight', 1) }}</th>
<th>@lang('frontend.global.departure')</th>
<th>@lang('frontend.global.arrival')</th>
<th>@lang('frontend.global.aircraft')</th>
<th class="text-center">@lang('frontend.global.flighttime')</th>
<th class="text-center">@lang('frontend.global.status')</th>
<th>{{ trans_choice('common.flight', 1) }}</th>
<th>@lang('common.departure')</th>
<th>@lang('common.arrival')</th>
<th>@lang('common.aircraft')</th>
<th class="text-center">@lang('common.flighttime')</th>
<th class="text-center">@lang('common.status')</th>
<th>@lang('frontend.pireps.submitted')</th>
<th></th>
</tr>
@@ -58,7 +58,7 @@
@if(!$pirep->read_only)
<a href="{{ route('frontend.pireps.edit', [
'id' => $pirep->id,
]) }}">@lang('frontend.global.edit')</a>
]) }}">@lang('common.edit')</a>
@endif
</td>
</tr>

14
resources/views/layouts/default/profile/fields.blade.php
View File

@@ -2,7 +2,7 @@
<div class="col-md-12">
<table class="table">
<tr>
<td>@lang('frontend.global.name')</td>
<td>@lang('common.name')</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('name') ? ' has-danger' : '' }}">
{{ Form::text('name', null, ['class' => 'form-control']) }}
@@ -14,7 +14,7 @@
</tr>
<tr>
<td>@lang('frontend.global.email')</td>
<td>@lang('common.email')</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('email') ? ' has-danger' : '' }}">
{{ Form::text('email', null, ['class' => 'form-control']) }}
@@ -26,7 +26,7 @@
</tr>
<tr>
<td>@lang('frontend.global.airline')</td>
<td>@lang('common.airline')</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('airline') ? ' has-danger' : '' }}">
{{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
@@ -38,7 +38,7 @@
</tr>
<tr>
<td>@lang('frontend.global.homeairport')</td>
<td>@lang('common.homeairport')</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('home_airport_id') ? ' has-danger' : '' }}">
{{ Form::select('home_airport_id', $airports, null , ['class' => 'form-control select2']) }}
@@ -50,7 +50,7 @@
</tr>
<tr>
<td>@lang('frontend.global.country')</td>
<td>@lang('common.country')</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('country') ? ' has-danger' : '' }}">
{{ Form::select('country', $countries, null, ['class' => 'form-control select2' ]) }}
@@ -62,7 +62,7 @@
</tr>
<tr>
<td>@lang('frontend.global.timezone')</td>
<td>@lang('common.timezone')</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('timezone') ? ' has-danger' : '' }}">
{{ Form::select('timezone', $timezones, null, ['class' => 'form-control select2' ]) }}
@@ -84,7 +84,7 @@
<p class="text-danger">{{ $errors->first('password') }}</p>
@endif
<p>@lang('frontend.global.confirmpassword'):</p>
<p>@lang('common.confirmpassword'):</p>
<div class="input-group form-group-no-border{{ $errors->has('password_confirmation') ? ' has-danger' : '' }}">
{{ Form::password('password_confirmation', ['class' => 'form-control']) }}
</div>

12
resources/views/layouts/default/profile/index.blade.php
View File

@@ -23,7 +23,7 @@
<div class="content">
<div class="social-description">
<h2>{{ $user->flights}}</h2>
<p>{{ trans_choice('frontend.global.flight', $user->flights) }}</p>
<p>{{ trans_choice('common.flight', $user->flights) }}</p>
</div>
<div class="social-description">
@@ -34,14 +34,14 @@
@if($user->home_airport)
<div class="social-description">
<h2>{{ $user->home_airport->icao }}</h2>
<p>@lang('frontend.global.homeairport')</p>
<p>@lang('common.homeairport')</p>
</div>
@endif
@if($user->current_airport)
<div class="social-description">
<h2>{{ $user->current_airport->icao }}</h2>
<p>@lang('frontend.global.currentairport')</p>
<p>@lang('common.currentairport')</p>
</div>
@endif
@@ -61,13 +61,13 @@
onclick="return confirm({{ __('Are you sure? This will reset your API key.') }})">@lang('frontend.profile.newapikey')</a>
&nbsp;
<a href="{{ route('frontend.profile.edit', ['id' => $user->id]) }}"
class="btn btn-primary">@lang('frontend.global.edit')</a>
class="btn btn-primary">@lang('common.edit')</a>
</div>
<h3 class="description">@lang('frontend.profile.yourprofile')</h3>
<table class="table table-full-width">
<tr>
<td>@lang('frontend.global.email')</td>
<td>@lang('common.email')</td>
<td>{{ $user->email }}</td>
</tr>
<tr>
@@ -75,7 +75,7 @@
<td>{{ $user->api_key }}</td>
</tr>
<tr>
<td>@lang('frontend.global.timezone')</td>
<td>@lang('common.timezone')</td>
<td>{{ $user->timezone }}</td>
</tr>
</table>

4
resources/views/layouts/default/users/index.blade.php
View File

@@ -1,10 +1,10 @@
@extends('app')
@section('title', trans_choice('frontend.global.pilot', 2))
@section('title', trans_choice('common.pilot', 2))
@section('content')
<div class="row">
<div class="col-md-12">
<h2>{{ trans_choice('frontend.global.pilot', 2) }}</h2>
<h2>{{ trans_choice('common.pilot', 2) }}</h2>
@include('users.table')
</div>
</div>

8
resources/views/layouts/default/users/table.blade.php
View File

@@ -1,12 +1,12 @@
<table class="table table-hover" id="users-table">
<thead>
<th></th>
<th>@lang('frontend.global.name')</th>
<th>@lang('common.name')</th>
<th style="text-align: center"></th>
<th style="text-align: center">@lang('frontend.global.airline')</th>
<th style="text-align: center">@lang('common.airline')</th>
<th style="text-align: center">@lang('frontend.users.location')</th>
<th style="text-align: center">{{ trans_choice('frontend.global.flight', 2) }}</th>
<th style="text-align: center">{{ trans_choice('frontend.global.hour', 2) }}</th>
<th style="text-align: center">{{ trans_choice('common.flight', 2) }}</th>
<th style="text-align: center">{{ trans_choice('common.hour', 2) }}</th>
</thead>
<tbody>
@foreach($users as $user)

18
resources/views/layouts/default/widgets/live_map.blade.php
View File

@@ -37,7 +37,7 @@
</a>
</h3>
<p id="map_flight_info">
{ 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 })
</p>
</div>
@@ -50,9 +50,9 @@
</div>
<div style="float: right; margin-left: 30px;">
<p id="map_flight_stats_middle">
@lang('frontend.global.status'): <span style="font-weight: bold">{ pirep.status_text }</span><br />
@lang('frontend.global.flighttime'): <span style="font-weight: bold">{ pirep.flight_time | time_hm }</span><br />
@lang('frontend.global.distance'): <span style="font-weight: bold">{ pirep.position.distance.{{setting('units.distance')}} }</span>
@lang('common.status'): <span style="font-weight: bold">{ pirep.status_text }</span><br />
@lang('common.flighttime'): <span style="font-weight: bold">{ pirep.flight_time | time_hm }</span><br />
@lang('common.distance'): <span style="font-weight: bold">{ pirep.position.distance.{{setting('units.distance')}} }</span>
/ <span style="font-weight: bold">
{ pirep.planned_distance.{{setting('units.distance')}} }</span>
</p>
@@ -78,14 +78,14 @@ and being mindful of the rivets bindings
<table rv-show="has_data" id="live_flights_table" class="table table-striped">
<thead>
<tr class="text-small header">
<td class="text-small">{{ trans_choice('frontend.global.Flight', 1) }}</td>
<td class="text-small">@lang('frontend.global.departure')</td>
<td class="text-small">@lang('frontend.global.arrival')</td>
<td class="text-small">@lang('frontend.global.aircraft')</td>
<td class="text-small">{{ trans_choice('common.Flight', 1) }}</td>
<td class="text-small">@lang('common.departure')</td>
<td class="text-small">@lang('common.arrival')</td>
<td class="text-small">@lang('common.aircraft')</td>
<td class="text-small">@lang('frontend.widgets.livemap.altitude')</td>
<td class="text-small">@lang('frontend.widgets.livemap.gs')</td>
<td class="text-small">@lang('frontend.widgets.livemap.distance')</td>
<td class="text-small">@lang('frontend.global.status') }}</td>
<td class="text-small">@lang('common.status') }}</td>
</tr>
</thead>
<tbody>

4
resources/views/layouts/default/widgets/weather.blade.php
View File

@@ -49,7 +49,7 @@ https://api.checkwx.com/#metar-decoded
<tr>
<td>@lang('frontend.widgets.weather.wind')</td>
<td>
{{$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
</td>
</tr>
<tr>
<td>@lang('frontend.global.metar')</td>
<td>@lang('common.metar')</td>
<td>
<div style="line-height:1.5em;min-height: 3em;">
{{ $metar['raw'] }}