Move widgets/home

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)));
         }
     }
 

resources/lang/en/frontend.php

@@ -18,10 +18,7 @@ return [
     ],
 
     'home' => [
-        'welcome' => [
+
-            'title' => 'Welcome!',
-            'message' => 'Welcome in :Appname',
-        ],
     ],
 
     'nav' => [

resources/lang/en/home.php

@@ -0,0 +1,11 @@
+<?php
+/**
+ *
+ */
+
+return [
+    'welcome' => [
+        'title'   => 'Welcome!',
+        'message' => 'Welcome to :appname',
+    ],
+];

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',
-        ],
-    ],
 ];

resources/lang/it/home.php

@@ -0,0 +1,11 @@
+<?php
+/**
+ *
+ */
+
+return [
+    'welcome' => [
+        'title'   => 'Benvenuti!',
+        'message' => 'Benvenuti in :Appname',
+    ],
+];

resources/lang/it/widgets.php

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

resources/views/layouts/default/flights/nav.blade.php

@@ -1,7 +1,7 @@
 <div class="card">
     <div class="card-block" style="min-height: 0px">
         <div class="form-group text-right">
-            <a href="{{ route('frontend.flights.bids') }}">{{ trans_choice('frontend.flights.mybid', 2) }}</a>
+            <a href="{{ route('frontend.flights.bids') }}">{{ trans_choice('flights.mybid', 2) }}</a>
         </div>
     </div>
 </div>

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')
     <div class="row">

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')</a>
         </div>
-        <h2>{{ trans_choice('frontend.pireps.pilotreport', 2) }}</h2>
+        <h2>{{ trans_choice('pireps.pilotreport', 2) }}</h2>
         @include('flash::message')
         @include('pireps.table')
     </div>

resources/views/layouts/default/pireps/show.blade.php

@@ -175,7 +175,7 @@
             @if(count($pirep->fares) > 0)
                 <div class="row">
                     <div class="col-12">
-                        <h5>{{ trans_choice('frontend.pireps.fare', 2) }}</h5>
+                        <h5>{{ trans_choice('pireps.fare', 2) }}</h5>
                         <table class="table table-hover table-condensed">
                             <thead>
                             <th>@lang('pireps.class')</th>

resources/views/layouts/default/widgets/latest_news.blade.php

@@ -1,11 +1,11 @@
 <div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
-    @lang('frontend.widgets.latestnews.news')
+    @lang('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;">
-                @lang('frontend.widgets.latestnews.nonewsfound')
+                @lang('widgets.latestnews.nonewsfound')
             </div>
         @endif
 

resources/views/layouts/default/widgets/live_map.blade.php

@@ -43,9 +43,9 @@
                     </div>
                     <div style="float: right; margin-left: 30px; margin-right: 30px;">
                         <p id="map_flight_stats_right">
-                            @lang('frontend.widgets.livemap.groundspeed'): <span style="font-weight: bold">{ pirep.position.gs }</span><br/>
+                            @lang('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('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/>
+                            @lang('widgets.livemap.heading'): <span style="font-weight: bold">{ pirep.position.heading }</span><br/>
                         </p>
                     </div>
                     <div style="float: right; margin-left: 30px;">
@@ -74,7 +74,7 @@ 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">@lang('frontend.widgets.livemap.noflights')</div>
+        <div rv-hide="has_data" class="jumbotron text-center">@lang('widgets.livemap.noflights')</div>
         <table rv-show="has_data" id="live_flights_table" class="table table-striped">
             <thead>
                 <tr class="text-small header">
@@ -82,9 +82,9 @@ and being mindful of the rivets bindings
                     <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('widgets.livemap.altitude')</td>
-                    <td class="text-small">@lang('frontend.widgets.livemap.gs')</td>
+                    <td class="text-small">@lang('widgets.livemap.gs')</td>
-                    <td class="text-small">@lang('frontend.widgets.livemap.distance')</td>
+                    <td class="text-small">@lang('widgets.livemap.distance')</td>
                     <td class="text-small">@lang('common.status') }}</td>
                 </tr>
             </thead>

resources/views/layouts/default/widgets/weather.blade.php

@@ -5,30 +5,30 @@ https://api.checkwx.com/#metar-decoded
 
 --}}
 @if(!$metar)
-    <p>@lang('frontend.widgets.weather.metarnotretrieved')</p>
+    <p>@lang('widgets.weather.metarnotretrieved')</p>
 @else
     <table class="table table-striped">
         <tr>
-            <td>@lang('frontend.widgets.weather.conditions')</td>
+            <td>@lang('widgets.weather.conditions')</td>
             <td>
                 {{ $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
             </td>
         </tr>
         <tr>
-            <td>@lang('frontend.widgets.weather.barometer')</td>
+            <td>@lang('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>@lang('frontend.widgets.weather.clouds')</td>
+                <td>@lang('widgets.weather.clouds')</td>
                 <td>
                     @if($unit_alt === 'ft')
                         {{$metar['clouds_report_ft']}}
@@ -47,12 +47,12 @@ https://api.checkwx.com/#metar-decoded
             </tr>
         @endif
         <tr>
-            <td>@lang('frontend.widgets.weather.wind')</td>
+            <td>@lang('widgets.weather.wind')</td>
             <td>
                 {{$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
             </td>
         </tr>
@@ -66,14 +66,14 @@ https://api.checkwx.com/#metar-decoded
         </tr>
         @if($metar['remarks'])
             <tr>
-                <td>@lang('frontend.widgets.weather.remarks')</td>
+                <td>@lang('widgets.weather.remarks')</td>
                 <td>
                     {{ $metar['remarks'] }}
                 </td>
             </tr>
         @endif
         <tr>
-            <td>@lang('frontend.widgets.weather.updated')</td>
+            <td>@lang('widgets.weather.updated')</td>
             <td>{{$metar['observed_time']}} ({{$metar['observed_age']}})</td>
         </tr>
     </table>