From 2b074ee894f728fb5253a249db028c4b472505ee Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Fri, 18 May 2018 14:59:34 -0500 Subject: [PATCH] Move widgets/home --- app/Support/Metar.php | 4 +- resources/lang/en/frontend.php | 5 +-- resources/lang/en/home.php | 11 ++++++ resources/lang/it/frontend.php | 37 ------------------- resources/lang/it/home.php | 11 ++++++ resources/lang/it/widgets.php | 35 ++++++++++++++++++ .../layouts/default/flights/nav.blade.php | 2 +- .../views/layouts/default/home.blade.php | 2 +- .../layouts/default/pireps/index.blade.php | 2 +- .../layouts/default/pireps/show.blade.php | 2 +- .../default/widgets/latest_news.blade.php | 4 +- .../default/widgets/live_map.blade.php | 14 +++---- .../layouts/default/widgets/weather.blade.php | 22 +++++------ 13 files changed, 84 insertions(+), 67 deletions(-) create mode 100644 resources/lang/en/home.php create mode 100644 resources/lang/it/home.php create mode 100644 resources/lang/it/widgets.php diff --git a/app/Support/Metar.php b/app/Support/Metar.php index 9d99d233..7f35a382 100644 --- a/app/Support/Metar.php +++ b/app/Support/Metar.php @@ -481,9 +481,9 @@ class Metar implements \ArrayAccess $time_diff = floor(($now - $local) / 60); if ($time_diff < 91) { - $this->set_result_value('observed_age', $time_diff.' '.trans_choice('frontend.widgets.weather.minago', $time_diff)); + $this->set_result_value('observed_age', $time_diff.' '.trans_choice('widgets.weather.minago', $time_diff)); } else { - $this->set_result_value('observed_age', floor($time_diff / 60).':'.sprintf("%02d", $time_diff % 60).' '.trans_choice('frontend.widgets.weather.hrago', floor($time_diff / 60))); + $this->set_result_value('observed_age', floor($time_diff / 60).':'.sprintf("%02d", $time_diff % 60).' '.trans_choice('widgets.weather.hrago', floor($time_diff / 60))); } } diff --git a/resources/lang/en/frontend.php b/resources/lang/en/frontend.php index 50187a15..766a2c9c 100644 --- a/resources/lang/en/frontend.php +++ b/resources/lang/en/frontend.php @@ -18,10 +18,7 @@ return [ ], 'home' => [ - 'welcome' => [ - 'title' => 'Welcome!', - 'message' => 'Welcome in :Appname', - ], + ], 'nav' => [ diff --git a/resources/lang/en/home.php b/resources/lang/en/home.php new file mode 100644 index 00000000..59113c12 --- /dev/null +++ b/resources/lang/en/home.php @@ -0,0 +1,11 @@ + [ + 'title' => 'Welcome!', + 'message' => 'Welcome to :appname', + ], +]; diff --git a/resources/lang/it/frontend.php b/resources/lang/it/frontend.php index 23db82c3..6711d848 100644 --- a/resources/lang/it/frontend.php +++ b/resources/lang/it/frontend.php @@ -18,13 +18,6 @@ return [ 'nodownloads' => 'Non ci sono downloads!', ], - 'home' => [ - 'welcome' => [ - 'title' => 'Benvenuti!', - 'message' => 'Benvenuti in :Appname', - ], - ], - 'nav' => [ 'administration' => 'Amministrazione', 'logout' => 'Uscita', @@ -108,34 +101,4 @@ return [ 'location' => 'Posizione', ], - 'widgets' => [ - 'latestnews' => [ - 'news' => 'Novità', - 'nonewsfound' => 'Nessuna Novità Trovata', - ], - - 'livemap' => [ - 'groundspeed' => 'Velocità al Suolo', - 'altitude' => 'Altitudine', - 'heading' => 'Direzione', - 'noflights' => 'Non ci sono voli.', - 'gs' => 'VS', - ], - - 'weather' => [ - 'metarnotretrieved' => 'I dati METAR/TAF non possono essere recuperati', - 'conditions' => 'Condizioni', - 'visibility' => 'visibilità', - 'humidity' => 'umidità', - 'dewpoint' => 'punto di rugiada', - 'barometer' => 'Barometro', - 'clouds' => 'Nuvole', - 'wind' => 'Vento', - 'guststo' => 'raffiche da', - 'remarks' => 'Remarks', - 'updated' => 'Aggiornato', - 'hrago' => 'ora fa|ore fa', - 'minago' => 'ninuto fa|minuti fa', - ], - ], ]; diff --git a/resources/lang/it/home.php b/resources/lang/it/home.php new file mode 100644 index 00000000..d9ccafd8 --- /dev/null +++ b/resources/lang/it/home.php @@ -0,0 +1,11 @@ + [ + 'title' => 'Benvenuti!', + 'message' => 'Benvenuti in :Appname', + ], +]; diff --git a/resources/lang/it/widgets.php b/resources/lang/it/widgets.php new file mode 100644 index 00000000..b2f10c9f --- /dev/null +++ b/resources/lang/it/widgets.php @@ -0,0 +1,35 @@ + [ + 'news' => 'Novità', + 'nonewsfound' => 'Nessuna Novità Trovata', + ], + + 'livemap' => [ + 'groundspeed' => 'Velocità al Suolo', + 'altitude' => 'Altitudine', + 'heading' => 'Direzione', + 'noflights' => 'Non ci sono voli.', + 'gs' => 'VS', + ], + + 'weather' => [ + 'metarnotretrieved' => 'I dati METAR/TAF non possono essere recuperati', + 'conditions' => 'Condizioni', + 'visibility' => 'visibilità', + 'humidity' => 'umidità', + 'dewpoint' => 'punto di rugiada', + 'barometer' => 'Barometro', + 'clouds' => 'Nuvole', + 'wind' => 'Vento', + 'guststo' => 'raffiche da', + 'remarks' => 'Remarks', + 'updated' => 'Aggiornato', + 'hrago' => 'ora fa|ore fa', + 'minago' => 'ninuto fa|minuti fa', + ], +]; diff --git a/resources/views/layouts/default/flights/nav.blade.php b/resources/views/layouts/default/flights/nav.blade.php index bb038bf1..660baa3b 100644 --- a/resources/views/layouts/default/flights/nav.blade.php +++ b/resources/views/layouts/default/flights/nav.blade.php @@ -1,7 +1,7 @@
- {{ trans_choice('frontend.flights.mybid', 2) }} + {{ trans_choice('flights.mybid', 2) }}
diff --git a/resources/views/layouts/default/home.blade.php b/resources/views/layouts/default/home.blade.php index cfdd3965..b905e7f5 100644 --- a/resources/views/layouts/default/home.blade.php +++ b/resources/views/layouts/default/home.blade.php @@ -1,5 +1,5 @@ @extends('app') -@section('title', trans('frontend.home.welcome.title')) +@section('title', __('home.welcome.title')) @section('content')
diff --git a/resources/views/layouts/default/pireps/index.blade.php b/resources/views/layouts/default/pireps/index.blade.php index 95337722..52919cc8 100644 --- a/resources/views/layouts/default/pireps/index.blade.php +++ b/resources/views/layouts/default/pireps/index.blade.php @@ -9,7 +9,7 @@ style="margin-top: -10px;margin-bottom: 5px" href="{{ route('frontend.pireps.create') }}">@lang('pireps.filenewpirep')
-

{{ trans_choice('frontend.pireps.pilotreport', 2) }}

+

{{ trans_choice('pireps.pilotreport', 2) }}

@include('flash::message') @include('pireps.table') diff --git a/resources/views/layouts/default/pireps/show.blade.php b/resources/views/layouts/default/pireps/show.blade.php index 7d3e6931..83be0f0b 100644 --- a/resources/views/layouts/default/pireps/show.blade.php +++ b/resources/views/layouts/default/pireps/show.blade.php @@ -175,7 +175,7 @@ @if(count($pirep->fares) > 0)
-
{{ trans_choice('frontend.pireps.fare', 2) }}
+
{{ trans_choice('pireps.fare', 2) }}
diff --git a/resources/views/layouts/default/widgets/latest_news.blade.php b/resources/views/layouts/default/widgets/latest_news.blade.php index 74481725..7907ce74 100644 --- a/resources/views/layouts/default/widgets/latest_news.blade.php +++ b/resources/views/layouts/default/widgets/latest_news.blade.php @@ -1,11 +1,11 @@
- @lang('frontend.widgets.latestnews.news') + @lang('widgets.latestnews.news')
@if($news->count() === 0)
- @lang('frontend.widgets.latestnews.nonewsfound') + @lang('widgets.latestnews.nonewsfound')
@endif diff --git a/resources/views/layouts/default/widgets/live_map.blade.php b/resources/views/layouts/default/widgets/live_map.blade.php index b826d0b0..0f02878a 100644 --- a/resources/views/layouts/default/widgets/live_map.blade.php +++ b/resources/views/layouts/default/widgets/live_map.blade.php @@ -43,9 +43,9 @@

- @lang('frontend.widgets.livemap.groundspeed'): { pirep.position.gs }
- @lang('frontend.widgets.livemap.altitude'): { pirep.position.altitude }
- @lang('frontend.widgets.livemap.heading'): { pirep.position.heading }
+ @lang('widgets.livemap.groundspeed'): { pirep.position.gs }
+ @lang('widgets.livemap.altitude'): { pirep.position.altitude }
+ @lang('widgets.livemap.heading'): { pirep.position.heading }

@@ -74,7 +74,7 @@ and being mindful of the rivets bindings --}}
-
@lang('frontend.widgets.livemap.noflights')
+
@lang('widgets.livemap.noflights')
@lang('pireps.class')
@@ -82,9 +82,9 @@ and being mindful of the rivets bindings - - - + + + diff --git a/resources/views/layouts/default/widgets/weather.blade.php b/resources/views/layouts/default/widgets/weather.blade.php index 27a588fc..5ee9875e 100644 --- a/resources/views/layouts/default/widgets/weather.blade.php +++ b/resources/views/layouts/default/widgets/weather.blade.php @@ -5,30 +5,30 @@ https://api.checkwx.com/#metar-decoded --}} @if(!$metar) -

@lang('frontend.widgets.weather.metarnotretrieved')

+

@lang('widgets.weather.metarnotretrieved')

@else
@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('widgets.livemap.altitude')@lang('widgets.livemap.gs')@lang('widgets.livemap.distance') @lang('common.status') }}
- + - + @if($metar['clouds']) - + @endif - + @@ -66,14 +66,14 @@ https://api.checkwx.com/#metar-decoded @if($metar['remarks']) - + @endif - +
@lang('frontend.widgets.weather.conditions')@lang('widgets.weather.conditions') {{ $metar['category'] }} {{ $metar['temperature'][$unit_temp] }} °{{strtoupper($unit_temp)}} @if($metar['visibility']) - , @lang('frontend.widgets.weather.visibility') {{ $metar['visibility'][$unit_dist] }} {{$unit_dist}} + , @lang('widgets.weather.visibility') {{ $metar['visibility'][$unit_dist] }} {{$unit_dist}} @endif @if($metar['humidity']) - , {{ $metar['humidity'] }}% @lang('frontend.widgets.weather.humidity') + , {{ $metar['humidity'] }}% @lang('widgets.weather.humidity') @endif @if($metar['dew_point']) - , @lang('frontend.widgets.weather.dewpoint') + , @lang('widgets.weather.dewpoint') {{ $metar['dew_point'][$unit_temp] }} °{{strtoupper($unit_temp)}} @endif
@lang('frontend.widgets.weather.barometer')@lang('widgets.weather.barometer') {{ number_format($metar['barometer'], 2) }} hPa / {{ number_format($metar['barometer_in'], 2) }} inHg @@ -36,7 +36,7 @@ https://api.checkwx.com/#metar-decoded
@lang('frontend.widgets.weather.clouds')@lang('widgets.weather.clouds') @if($unit_alt === 'ft') {{$metar['clouds_report_ft']}} @@ -47,12 +47,12 @@ https://api.checkwx.com/#metar-decoded
@lang('frontend.widgets.weather.wind')@lang('widgets.weather.wind') {{$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'] }} + @lang('widgets.weather.guststo') {{ $metar['wind_gust_speed'] }} @endif
@lang('frontend.widgets.weather.remarks')@lang('widgets.weather.remarks') {{ $metar['remarks'] }}
@lang('frontend.widgets.weather.updated')@lang('widgets.weather.updated') {{$metar['observed_time']}} ({{$metar['observed_age']}})