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

More organizing for translations

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-05-21 11:55:40 -05:00
parent 36dcd61feb
commit 0a7f002217
48 changed files with 393 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
resources/views/admin/flights/fields.blade.php
View File

@@ -147,31 +147,31 @@
<select id="days_of_week" name="days[]" multiple="multiple" size="7" style="width: 100%;">
<option value="{{\App\Models\Enums\Days::MONDAY}}"
{{in_mask($days, \App\Models\Enums\Days::MONDAY) ? 'selected':'' }}>
@lang('system.days.mon')
@lang('common.days.mon')
</option>
<option value="{{\App\Models\Enums\Days::TUESDAY}}"
{{in_mask($days, \App\Models\Enums\Days::TUESDAY) ? 'selected':'' }}>
@lang('system.days.tues')
@lang('common.days.tues')
</option>
<option value="{{\App\Models\Enums\Days::WEDNESDAY}}"
{{in_mask($days, \App\Models\Enums\Days::WEDNESDAY) ? 'selected':'' }}>
@lang('system.days.wed')
@lang('common.days.wed')
</option>
<option value="{{\App\Models\Enums\Days::THURSDAY}}"
{{in_mask($days, \App\Models\Enums\Days::THURSDAY) ? 'selected':'' }}>
@lang('system.days.thurs')
@lang('common.days.thurs')
</option>
<option value="{{\App\Models\Enums\Days::FRIDAY}}"
{{in_mask($days, \App\Models\Enums\Days::FRIDAY) ? 'selected':'' }}>
@lang('system.days.fri')
@lang('common.days.fri')
</option>
<option value="{{\App\Models\Enums\Days::SATURDAY}}"
{{in_mask($days, \App\Models\Enums\Days::SATURDAY) ? 'selected':'false' }}>
@lang('system.days.sat')
@lang('common.days.sat')
</option>
<option value="{{\App\Models\Enums\Days::SUNDAY}}"
{{in_mask($days, \App\Models\Enums\Days::SUNDAY) ? 'selected':'false' }}>
@lang('system.days.sun')
@lang('common.days.sun')
</option>
</select>
</div>

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

@@ -36,10 +36,10 @@
<div class="row">
<div class="col-6">
<h5>@lang('airports.inboundflights')</h5>
<h5>@lang('flights.inbound')</h5>
@if(!$inbound_flights)
<div class="jumbotron text-center">
@lang('airports.noflightfound')
@lang('flights.none')
</div>
@else
<table class="table table-striped table-condensed">
@@ -71,10 +71,10 @@
</div>
<div class="col-6">
<h5>@lang('airports.outboundflights')</h5>
<h5>@lang('flights.outbound')</h5>
@if(!$outbound_flights)
<div class="jumbotron text-center">
@lang('airports.noflightfound')
@lang('flights.none')
</div>
@else
<table class="table table-striped table-condensed">

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

@@ -35,7 +35,7 @@
<p class="text-danger">{{ $errors->first('airline_id') }}</p>
@endif
<label for="home_airport" class="control-label">@lang('common.homeairport')</label>
<label for="home_airport" class="control-label">@lang('airports.home')</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>
@@ -67,7 +67,7 @@
<p class="text-danger">{{ $errors->first('password') }}</p>
@endif
<label for="password_confirmation" class="control-label">@lang('common.confirmpassword')</label>
<label for="password_confirmation" class="control-label">@lang('passwords.confirm')</label>
<div class="input-group form-group-no-border {{ $errors->has('password_confirmation') ? 'has-danger' : '' }}">
{{ Form::password('password_confirmation', ['class' => 'form-control']) }}
</div>

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

@@ -53,7 +53,7 @@
@else
<h3 class="header">{{ $user->home_airport_id }}</h3>
@endif
<h5 class="description">@lang('common.currentairport')</h5>
<h5 class="description">@lang('airports.current')</h5>
</div>
</div>
</div>

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

@@ -8,17 +8,17 @@
'class'=>'form-inline'
]) }}
<div>
<p>@lang('common.flightnumber')</p>
<p>@lang('flights.flightnumber')</p>
{{ Form::text('flight_number', null, ['class' => 'form-control']) }}
</div>
<div style="margin-top: 10px;">
<p>@lang('common.departureairport')</p>
<p>@lang('airports.departure')</p>
{{ Form::select('dep_icao', $airports, null , ['class' => 'form-control']) }}
</div>
<div style="margin-top: 10px;">
<p>@lang('common.arrivalairport')</p>
<p>@lang('airports.arrival')</p>
{{ Form::select('arr_icao', $airports, null , ['class' => 'form-control']) }}
</div>

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

@@ -45,7 +45,7 @@
@endif
<tr>
<td>@lang('common.route')</td>
<td>@lang('flights.route')</td>
<td>{{ $flight->route }}</td>
</tr>

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

@@ -61,7 +61,7 @@
<div class="col-sm-7">
<div class="row">
<div class="col-sm-12">
<span class="title">{{ strtoupper(__('common.route')) }}&nbsp;</span>
<span class="title">{{ strtoupper(__('flights.route')) }}&nbsp;</span>
{{ $flight->route }}
</div>
</div>

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

@@ -52,7 +52,7 @@ flight reports that have been filed. You've been warned!
@else
<div class="input-group input-group-sm mb3">
{{ Form::text('flight_number', null, [
'placeholder' => __('common.flightnumber'),
'placeholder' => __('flights.flightnumber'),
'class' => 'form-control',
'readonly' => (!empty($pirep) && $pirep->read_only),
]) }}
@@ -75,7 +75,7 @@ flight reports that have been filed. You've been warned!
@endif
</div>
<div class="col-lg-4">
{{ Form::label('flight_type', __('pireps.flighttype')) }}
{{ Form::label('flight_type', __('flights.flighttype')) }}
@if(!empty($pirep) && $pirep->read_only)
<p>{{ \App\Models\Enums\FlightType::label($pirep->flight_type) }}</p>
{{ Form::hidden('flight_type') }}
@@ -96,7 +96,7 @@ flight reports that have been filed. You've been warned!
<div class="row">
<div class="col-3">
{{ Form::label('hours', __('common.flighttime')) }}
{{ Form::label('hours', __('flights.flighttime')) }}
@if(!empty($pirep) && $pirep->read_only)
<p>
{{ $pirep->hours.' '.trans_choice('common.hour', $pirep->hours) }}, {{ $pirep->minutes.' '.trans_choice('common.minute', $pirep->minutes) }}
@@ -135,18 +135,18 @@ flight reports that have been filed. You've been warned!
<div class="col-3">
{{--{{ Form::label('departure_time', __('pireps.departuretime')) }}
{{--{{ Form::label('departure_time', __('flights.departuretime')) }}
{{ Form::text('departure_time', null, [
'placeholder' => __('pireps.departuretime'),
'placeholder' => __('flights.departuretime'),
'class' => 'form-control',
'readonly' => $pirep->read_only]) }}--}}
</div>
<div class="col-3">
{{--{{ Form::label('arrival_time', __('pireps.arrivaltime')) }}
{{--{{ Form::label('arrival_time', __('flights.arrivaltime')) }}
{{ Form::text('arrival_time', null, [
'placeholder' => __('pireps.arrivaltime'),
'placeholder' => __('flights.arrivaltime'),
'class' => 'form-control',
'readonly' => $pirep->read_only]) }}--}}
</div>
@@ -163,7 +163,7 @@ flight reports that have been filed. You've been warned!
<div class="form-container-body">
<div class="row">
<div class="col-6">
{{ Form::label('dpt_airport_id', __('common.departureairport')) }}
{{ Form::label('dpt_airport_id', __('airports.departure')) }}
@if(!empty($pirep) && $pirep->read_only)
{{ $pirep->dpt_airport->name }}
(<a href="{{route('frontend.airports.show', [
@@ -183,7 +183,7 @@ flight reports that have been filed. You've been warned!
</div>
<div class="col-6">
{{ Form::label('arr_airport_id', __('common.arrivalairport')) }}
{{ Form::label('arr_airport_id', __('airports.arrival')) }}
@if(!empty($pirep) && $pirep->read_only)
{{ $pirep->arr_airport->name }}
(<a href="{{route('frontend.airports.show', [
@@ -234,13 +234,13 @@ flight reports that have been filed. You've been warned!
<div class="form-container">
<h6><i class="far fa-comments"></i>
&nbsp;@lang('common.route')
&nbsp;@lang('flights.route')
</h6>
<div class="form-container-body">
<div class="row">
<div class="col">
<div class="input-group input-group-sm form-group">
{{ Form::textarea('route', null, ['class' => 'form-control', 'placeholder' => __('common.route')]) }}
{{ Form::textarea('route', null, ['class' => 'form-control', 'placeholder' => __('flights.route')]) }}
<p class="text-danger">{{ $errors->first('route') }}</p>
</div>
</div>

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

@@ -116,7 +116,7 @@
</tr>
<tr>
<td>@lang('pireps.flighttype')</td>
<td>@lang('flights.flighttype')</td>
<td>{{ \App\Models\Enums\FlightType::label($pirep->flight_type) }}</td>
</tr>

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

@@ -7,7 +7,7 @@
<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('flights.flighttime')</th>
<th class="text-center">@lang('common.status')</th>
<th>@lang('pireps.submitted')</th>
<th></th>

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

@@ -38,7 +38,7 @@
</tr>
<tr>
<td>@lang('common.homeairport')</td>
<td>@lang('airports.home')</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']) }}
@@ -84,7 +84,7 @@
<p class="text-danger">{{ $errors->first('password') }}</p>
@endif
<p>@lang('common.confirmpassword'):</p>
<p>@lang('passwords.confirm'):</p>
<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/profile/index.blade.php
View File

@@ -28,20 +28,20 @@
<div class="social-description">
<h2>{{ \App\Facades\Utils::minutesToTimeString($user->flight_time, false) }}</h2>
<p>@lang('profile.flighthours')</p>
<p>@lang('flights.flighthours')</p>
</div>
@if($user->home_airport)
<div class="social-description">
<h2>{{ $user->home_airport->icao }}</h2>
<p>@lang('common.homeairport')</p>
<p>@lang('airports.home')</p>
</div>
@endif
@if($user->current_airport)
<div class="social-description">
<h2>{{ $user->current_airport->icao }}</h2>
<p>@lang('common.currentairport')</p>
<p>@lang('airports.current')</p>
</div>
@endif

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

@@ -51,7 +51,7 @@
<div style="float: right; margin-left: 30px;">
<p id="map_flight_stats_middle">
@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('flights.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>

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

@@ -5,7 +5,7 @@ https://api.checkwx.com/#metar-decoded
--}}
@if(!$metar)
<p>@lang('widgets.weather.metarnotretrieved')</p>
<p>@lang('widgets.weather.nometar')</p>
@else
<table class="table table-striped">
<tr>