frontend translation + other stuff

This commit is contained in:
lordwilbur
2018-05-18 00:03:30 +02:00
committed by Nabeel Shahzad
parent ba8a819c7d
commit a346b0df2e
54 changed files with 966 additions and 771 deletions

View File

@@ -1,11 +1,11 @@
<div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
{{ __('News') }}
@lang('frontend.widgets.latestnews.news')
</div>
<div class="card border-blue-bottom">
<div class="card-block" style="min-height: 0px">
@if($news->count() === 0)
<div class="text-center text-muted" style="padding: 30px;">
{{ __('No News Found') }}
@lang('frontend.widgets.latestnews.nonewsfound')
</div>
@endif

View File

@@ -37,22 +37,22 @@
</a>
</h3>
<p id="map_flight_info">
{ pirep.dpt_airport.name } ({ pirep.dpt_airport.icao }) {{ __('to') }}
{ pirep.dpt_airport.name } ({ pirep.dpt_airport.icao }) @lang('frontend.global.to')
{ pirep.arr_airport.name } ({ pirep.arr_airport.icao })
</p>
</div>
<div style="float: right; margin-left: 30px; margin-right: 30px;">
<p id="map_flight_stats_right">
{{ __('Ground Speed') }}: <span style="font-weight: bold">{ pirep.position.gs }</span><br/>
{{ __('Altitude') }}: <span style="font-weight: bold">{ pirep.position.altitude }</span><br/>
{{ __('Heading') }}: <span style="font-weight: bold">{ pirep.position.heading }</span><br/>
@lang('frontend.widgets.livemap.groundspeed'): <span style="font-weight: bold">{ pirep.position.gs }</span><br/>
@lang('frontend.widgets.livemap.altitude'): <span style="font-weight: bold">{ pirep.position.altitude }</span><br/>
@lang('frontend.widgets.livemap.heading'): <span style="font-weight: bold">{ pirep.position.heading }</span><br/>
</p>
</div>
<div style="float: right; margin-left: 30px;">
<p id="map_flight_stats_middle">
{{ __('Status') }}: <span style="font-weight: bold">{ pirep.status_text }</span><br />
{{ __('Flight Time') }}: <span style="font-weight: bold">{ pirep.flight_time | time_hm }</span><br />
{{ __('Distance') }}: <span style="font-weight: bold">{ pirep.position.distance.{{setting('units.distance')}} }</span>
@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>
/ <span style="font-weight: bold">
{ pirep.planned_distance.{{setting('units.distance')}} }</span>
</p>
@@ -74,18 +74,18 @@ and being mindful of the rivets bindings
--}}
<div id="live_flights" class="row">
<div class="col-md-12">
<div rv-hide="has_data" class="jumbotron text-center">{{ __('There are no flights.') }}</div>
<div rv-hide="has_data" class="jumbotron text-center">@lang('frontend.widgets.livemap.noflights')</div>
<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('Flight', 1) }}</td>
<td class="text-small">{{ __('Departure') }}</td>
<td class="text-small">{{ __('Arrival') }}</td>
<td class="text-small">{{ __('Aircraft') }}</td>
<td class="text-small">{{ __('Altitude') }}</td>
<td class="text-small">{{ __('GS') }}</td>
<td class="text-small">{{ __('Distance') }}</td>
<td class="text-small">{{ __('Status') }}</td>
<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">@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>
</tr>
</thead>
<tbody>

View File

@@ -5,30 +5,30 @@ https://api.checkwx.com/#metar-decoded
--}}
@if(!$metar)
<p>{{ __('METAR/TAF data could not be retrieved') }}</p>
<p>@lang('frontend.widgets.weather.metarnotretrieved')</p>
@else
<table class="table table-striped">
<tr>
<td>{{ __('Conditions') }}</td>
<td>@lang('frontend.widgets.weather.conditions')</td>
<td>
{{ $metar['category'] }}
{{ $metar['temperature'][$unit_temp] }}
°{{strtoupper($unit_temp)}}
@if($metar['visibility'])
, {{ __('visibility') }} {{ $metar['visibility'][$unit_dist] }} {{$unit_dist}}
, @lang('frontend.widgets.weather.visibility') {{ $metar['visibility'][$unit_dist] }} {{$unit_dist}}
@endif
@if($metar['humidity'])
, {{ $metar['humidity'] }}% {{ __('humidity') }}
, {{ $metar['humidity'] }}% @lang('frontend.widgets.weather.humidity')
@endif
@if($metar['dew_point'])
, {{ __('dew point') }}
, @lang('frontend.widgets.weather.dewpoint')
{{ $metar['dew_point'][$unit_temp] }}
°{{strtoupper($unit_temp)}}
@endif
</td>
</tr>
<tr>
<td>{{ __('Barometer') }}</td>
<td>@lang('frontend.widgets.weather.barometer')</td>
<td>
{{ number_format($metar['barometer'], 2) }} hPa
/ {{ number_format($metar['barometer_in'], 2) }} inHg
@@ -36,7 +36,7 @@ https://api.checkwx.com/#metar-decoded
</tr>
@if($metar['clouds'])
<tr>
<td>{{ __('Clouds') }}</td>
<td>@lang('frontend.widgets.weather.clouds')</td>
<td>
@if($unit_alt === 'ft')
{{$metar['clouds_report_ft']}}
@@ -47,17 +47,17 @@ https://api.checkwx.com/#metar-decoded
</tr>
@endif
<tr>
<td>{{ __('Wind') }}</td>
<td>@lang('frontend.widgets.weather.wind')</td>
<td>
{{$metar['wind_speed']}} kts {{ __('from') }} {{$metar['wind_direction_label']}}
{{$metar['wind_speed']}} kts @lang('frontend.global.from') {{$metar['wind_direction_label']}}
({{$metar['wind_direction']}}°)
@if($metar['wind_gust_speed'])
{{ __('gusts to').' '.$metar['wind_gust_speed'] }}
@lang('frontend.widgets.weather.guststo') {{ $metar['wind_gust_speed'] }}
@endif
</td>
</tr>
<tr>
<td>{{ __('METAR') }}</td>
<td>@lang('frontend.global.metar')</td>
<td>
<div style="line-height:1.5em;min-height: 3em;">
{{ $metar['raw'] }}
@@ -66,14 +66,14 @@ https://api.checkwx.com/#metar-decoded
</tr>
@if($metar['remarks'])
<tr>
<td>{{ __('Remarks') }}</td>
<td>@lang('frontend.widgets.weather.remarks')</td>
<td>
{{ $metar['remarks'] }}
</td>
</tr>
@endif
<tr>
<td>{{ __('Updated') }}</td>
<td>@lang('frontend.widgets.weather.updated')</td>
<td>{{$metar['observed_time']}} ({{$metar['observed_age']}})</td>
</tr>
</table>