More organizing for translations

app/Models/Enums/ActiveState.php

@@ -14,7 +14,7 @@ class ActiveState extends Enum
     public const ACTIVE   = 1;
 
     public static $labels = [
-        ActiveState::ACTIVE   => 'system.global.active',
+        ActiveState::ACTIVE   => 'common.active',
-        ActiveState::INACTIVE => 'system.global.inactive',
+        ActiveState::INACTIVE => 'common.inactive',
     ];
 }

app/Models/Enums/AircraftStatus.php

@@ -17,10 +17,10 @@ class AircraftStatus extends Enum
     public const WRITTEN_OFF = 'W';
 
     public static $labels = [
-        AircraftStatus::ACTIVE      => 'system.aircraft.status.active',
+        AircraftStatus::ACTIVE      => 'aircraft.status.active',
-        AircraftStatus::STORED      => 'system.aircraft.status.stored',
+        AircraftStatus::STORED      => 'aircraft.status.stored',
-        AircraftStatus::RETIRED     => 'system.aircraft.status.retired',
+        AircraftStatus::RETIRED     => 'aircraft.status.retired',
-        AircraftStatus::SCRAPPED    => 'system.aircraft.status.scrapped',
+        AircraftStatus::SCRAPPED    => 'aircraft.status.scrapped',
-        AircraftStatus::WRITTEN_OFF => 'system.aircraft.status.written',
+        AircraftStatus::WRITTEN_OFF => 'aircraft.status.written',
     ];
 }

app/Models/Enums/Days.php

@@ -20,13 +20,13 @@ class Days extends Enum
     public const SUNDAY    = 1 << 6;
 
     public static $labels = [
-        Days::MONDAY    => 'system.days.mon',
+        Days::MONDAY    => 'common.days.mon',
-        Days::TUESDAY   => 'system.days.tues',
+        Days::TUESDAY   => 'common.days.tues',
-        Days::WEDNESDAY => 'system.days.wed',
+        Days::WEDNESDAY => 'common.days.wed',
-        Days::THURSDAY  => 'system.days.thurs',
+        Days::THURSDAY  => 'common.days.thurs',
-        Days::FRIDAY    => 'system.days.fri',
+        Days::FRIDAY    => 'common.days.fri',
-        Days::SATURDAY  => 'system.days.sat',
+        Days::SATURDAY  => 'common.days.sat',
-        Days::SUNDAY    => 'system.days.sun',
+        Days::SUNDAY    => 'common.days.sun',
     ];
 
     public static $codes = [

app/Models/Enums/ExpenseType.php

@@ -15,9 +15,9 @@ class ExpenseType extends Enum
     public const MONTHLY = 'M';
 
     protected static $labels = [
-        ExpenseType::FLIGHT  => 'system.expenses.type.flight',
+        ExpenseType::FLIGHT  => 'expenses.type.flight',
-        ExpenseType::DAILY   => 'system.expenses.type.daily',
+        ExpenseType::DAILY   => 'expenses.type.daily',
-        ExpenseType::MONTHLY => 'system.expenses.type.monthly',
+        ExpenseType::MONTHLY => 'expenses.type.monthly',
     ];
 
     protected static $codes = [

app/Models/Enums/FlightType.php

@@ -27,20 +27,20 @@ class FlightType extends Enum
     public const TECHNICAL_STOP     = 'X';
 
     protected static $labels = [
-        FlightType::SCHED_PAX          => 'system.flights.type.pass_scheduled',
+        FlightType::SCHED_PAX          => 'flights.type.pass_scheduled',
-        FlightType::SCHED_CARGO        => 'system.flights.type.cargo_scheduled',
+        FlightType::SCHED_CARGO        => 'flights.type.cargo_scheduled',
-        FlightType::CHARTER_PAX_ONLY   => 'system.flights.type.charter_pass_only',
+        FlightType::CHARTER_PAX_ONLY   => 'flights.type.charter_pass_only',
-        FlightType::ADDITIONAL_CARGO   => 'system.flights.type.addtl_cargo_mail',
+        FlightType::ADDITIONAL_CARGO   => 'flights.type.addtl_cargo_mail',
-        FlightType::VIP                => 'system.flights.type.special_vip',
+        FlightType::VIP                => 'flights.type.special_vip',
-        FlightType::ADDTL_PAX          => 'system.flights.type.pass_addtl',
+        FlightType::ADDTL_PAX          => 'flights.type.pass_addtl',
-        FlightType::CHARTER_CARGO_MAIL => 'system.flights.type.charter_cargo',
+        FlightType::CHARTER_CARGO_MAIL => 'flights.type.charter_cargo',
-        FlightType::AMBULANCE          => 'system.flights.type.ambulance',
+        FlightType::AMBULANCE          => 'flights.type.ambulance',
-        FlightType::TRAINING           => 'system.flights.type.training_flight',
+        FlightType::TRAINING           => 'flights.type.training_flight',
-        FlightType::MAIL_SERVICE       => 'system.flights.type.mail_service',
+        FlightType::MAIL_SERVICE       => 'flights.type.mail_service',
-        FlightType::CHARTER_SPECIAL    => 'system.flights.type.charter_special',
+        FlightType::CHARTER_SPECIAL    => 'flights.type.charter_special',
-        FlightType::POSITIONING        => 'system.flights.type.positioning',
+        FlightType::POSITIONING        => 'flights.type.positioning',
-        FlightType::TECHNICAL_TEST     => 'system.flights.type.technical_test',
+        FlightType::TECHNICAL_TEST     => 'flights.type.technical_test',
-        FlightType::MILITARY           => 'system.flights.type.military',
+        FlightType::MILITARY           => 'flights.type.military',
-        FlightType::TECHNICAL_STOP     => 'system.flights.type.technical_stop',
+        FlightType::TECHNICAL_STOP     => 'flights.type.technical_stop',
     ];
 }

app/Models/Enums/PirepSource.php

@@ -14,7 +14,7 @@ class PirepSource extends Enum
     public const ACARS  = 1;
 
     protected static $labels = [
-        PirepSource::MANUAL => 'system.pireps.source.manual',
+        PirepSource::MANUAL => 'pireps.source_types.manual',
-        PirepSource::ACARS  => 'system.pireps.source.acars',
+        PirepSource::ACARS  => 'pireps.source_types.acars',
     ];
 }

app/Models/Enums/PirepState.php

@@ -19,12 +19,12 @@ class PirepState extends Enum
     public const DRAFT       = 5;
 
     protected static $labels = [
-        PirepState::REJECTED    => 'system.pireps.state.rejected',
+        PirepState::REJECTED    => 'pireps.state.rejected',
-        PirepState::IN_PROGRESS => 'system.pireps.state.in_progress',
+        PirepState::IN_PROGRESS => 'pireps.state.in_progress',
-        PirepState::PENDING     => 'system.pireps.state.pending',
+        PirepState::PENDING     => 'pireps.state.pending',
-        PirepState::ACCEPTED    => 'system.pireps.state.accepted',
+        PirepState::ACCEPTED    => 'pireps.state.accepted',
-        PirepState::CANCELLED   => 'system.pireps.state.cancelled',
+        PirepState::CANCELLED   => 'pireps.state.cancelled',
-        PirepState::DELETED     => 'system.pireps.state.deleted',
+        PirepState::DELETED     => 'pireps.state.deleted',
-        PirepState::DRAFT       => 'system.pireps.state.draft',
+        PirepState::DRAFT       => 'pireps.state.draft',
     ];
 }

app/Models/Enums/PirepStatus.php

@@ -37,28 +37,28 @@ class PirepStatus extends Enum
     public const EMERG_DECENT  = 'EMG';
 
     protected static $labels = [
-        PirepStatus::INITIATED       => 'system.pireps.status.initialized',
+        PirepStatus::INITIATED       => 'pireps.status.initialized',
-        PirepStatus::SCHEDULED       => 'system.pireps.status.scheduled',
+        PirepStatus::SCHEDULED       => 'pireps.status.scheduled',
-        PirepStatus::BOARDING        => 'system.pireps.status.boarding',
+        PirepStatus::BOARDING        => 'pireps.status.boarding',
-        PirepStatus::RDY_START       => 'system.pireps.status.ready_start',
+        PirepStatus::RDY_START       => 'pireps.status.ready_start',
-        PirepStatus::PUSHBACK_TOW    => 'system.pireps.status.push_tow',
+        PirepStatus::PUSHBACK_TOW    => 'pireps.status.push_tow',
-        PirepStatus::DEPARTED        => 'system.pireps.status.departed',
+        PirepStatus::DEPARTED        => 'pireps.status.departed',
-        PirepStatus::RDY_DEICE       => 'system.pireps.status.ready_deice',
+        PirepStatus::RDY_DEICE       => 'pireps.status.ready_deice',
-        PirepStatus::STRT_DEICE      => 'system.pireps.status.deicing',
+        PirepStatus::STRT_DEICE      => 'pireps.status.deicing',
-        PirepStatus::GRND_RTRN       => 'system.pireps.status.ground_ret',
+        PirepStatus::GRND_RTRN       => 'pireps.status.ground_ret',
-        PirepStatus::TAXI            => 'system.pireps.status.taxi',
+        PirepStatus::TAXI            => 'pireps.status.taxi',
-        PirepStatus::TAKEOFF         => 'system.pireps.status.takeoff',
+        PirepStatus::TAKEOFF         => 'pireps.status.takeoff',
-        PirepStatus::INIT_CLIM       => 'system.pireps.status.initial_clb',
+        PirepStatus::INIT_CLIM       => 'pireps.status.initial_clb',
-        PirepStatus::AIRBORNE        => 'system.pireps.status.enroute',
+        PirepStatus::AIRBORNE        => 'pireps.status.enroute',
-        PirepStatus::ENROUTE         => 'system.pireps.status.enroute',
+        PirepStatus::ENROUTE         => 'pireps.status.enroute',
-        PirepStatus::DIVERTED        => 'system.pireps.status.diverted',
+        PirepStatus::DIVERTED        => 'pireps.status.diverted',
-        PirepStatus::APPROACH        => 'system.pireps.status.approach',
+        PirepStatus::APPROACH        => 'pireps.status.approach',
-        PirepStatus::APPROACH_ICAO   => 'system.pireps.status.approach',
+        PirepStatus::APPROACH_ICAO   => 'pireps.status.approach',
-        PirepStatus::ON_FINAL        => 'system.pireps.status.final_appr',
+        PirepStatus::ON_FINAL        => 'pireps.status.final_appr',
-        PirepStatus::LANDING         => 'system.pireps.status.landing',
+        PirepStatus::LANDING         => 'pireps.status.landing',
-        PirepStatus::LANDED          => 'system.pireps.status.landed',
+        PirepStatus::LANDED          => 'pireps.status.landed',
-        PirepStatus::ARRIVED         => 'system.pireps.status.arrived',
+        PirepStatus::ARRIVED         => 'pireps.status.arrived',
-        PirepStatus::CANCELLED       => 'system.pireps.status.cancelled',
+        PirepStatus::CANCELLED       => 'pireps.status.cancelled',
-        PirepStatus::EMERG_DECENT    => 'system.pireps.status.emerg_decent',
+        PirepStatus::EMERG_DECENT    => 'pireps.status.emerg_decent',
     ];
 }

app/Models/Enums/UserState.php

@@ -17,10 +17,10 @@ class UserState extends Enum
     public const SUSPENDED = 4;
 
     protected static $labels = [
-        UserState::PENDING   => 'system.users.state.pending',
+        UserState::PENDING   => 'users.state.pending',
-        UserState::ACTIVE    => 'system.users.state.active',
+        UserState::ACTIVE    => 'users.state.active',
-        UserState::REJECTED  => 'system.users.state.rejected',
+        UserState::REJECTED  => 'users.state.rejected',
-        UserState::ON_LEAVE  => 'system.users.state.on_leave',
+        UserState::ON_LEAVE  => 'users.state.on_leave',
-        UserState::SUSPENDED => 'system.users.state.suspended',
+        UserState::SUSPENDED => 'users.state.suspended',
     ];
 }

resources/lang/en/aircraft.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ *
+ */
+
+return [
+    'status' => [
+        'active'   => 'Active',
+        'stored'   => 'Stored',
+        'retired'  => 'Retired',
+        'scrapped' => 'Scrapped',
+        'written'  => 'Written Off',
+    ],
+];

resources/lang/en/airports.php

@@ -4,8 +4,9 @@
  */
 
 return [
-    'inboundflights'  => 'Inbound Flights',
+    'ident'     => 'Identification',
-    'outboundflights' => 'Outbound Flights',
+    'home'      => 'Home Airport',
-    'ident'           => 'Identification',
+    'current'   => 'Current Airport',
-    'noflightfound'   => 'No Flight Found.',
+    'departure' => 'Departure Airport',
+    'arrival'   => 'Arrival Airport',
 ];

resources/lang/en/auth.php

@@ -17,7 +17,7 @@ return [
     'pendingmessage'           => 'Your registration is pending approval. Please check your email!',
     'registrationsubmitted'    => 'Registration Submitted',
     'registrationconfirmation' => 'Registration Confirmation',
-    'confirmationmessage'      => 'Your application has been submitted. It requires staff member approval, once a\nstaff member has reviewed your application, you will receive a confirmation email.',
+    'confirmationmessage'      => 'Your application has been submitted. It requires staff member approval, once a staff member has reviewed your application, you will receive a confirmation email.',
     'registrationdenied'       => 'Registration Denied',
     'deniedmessage'            => 'Your registration was denied. Please contact an administrator.',
     'accountsuspended'         => 'Account Suspended',

resources/lang/en/common.php

@@ -14,9 +14,6 @@ return [
     'profile'          => 'Profile',
     'email'            => 'Email',
     'register'         => 'Register',
-    'confirmpassword'  => 'Confirm Password',
-    'homeairport'      => 'Home Airport',
-    'currentairport'   => 'Current Airport',
     'timezone'         => 'Timezone',
     'country'          => 'Country',
     'download'         => 'Download|Downloads',
@@ -32,11 +29,6 @@ return [
     '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',
@@ -50,4 +42,15 @@ return [
     'hello'            => 'Hello',
     'regards'          => 'Regards',
     'rightsreserved'   => 'All Rights Reserved',
+    'active'           => 'Active',
+    'inactive'         => 'Inactive',
+    'days'             => [
+        'mon'   => 'Monday',
+        'tues'  => 'Tuesday',
+        'wed'   => 'Wednesday',
+        'thurs' => 'Thursday',
+        'fri'   => 'Friday',
+        'sat'   => 'Saturday',
+        'sun'   => 'Sunday',
+    ],
 ];

resources/lang/en/expenses.php

@@ -0,0 +1,12 @@
+<?php
+/**
+ *
+ */
+
+return [
+    'type' => [
+        'flight'  => 'Flight',
+        'daily'   => 'Daily',
+        'monthly' => 'Monthly',
+    ],
+];

resources/lang/en/flights.php

@@ -4,6 +4,11 @@
  */
 
 return [
+    'flightnumber'     => 'Flight Number',
+    'flighttime'       => 'Flight Time',
+    'flighttype'       => 'Flight Type',
+    'flighthours'      => 'Flight Hours',
+    'route'            => 'Route',
     'mybid'            => 'My Bid|My Bids',
     'search'           => 'Search',
     'addremovebid'     => 'Add/Remove Bid',
@@ -13,4 +18,26 @@ return [
     'arr'              => 'Arr',
     'level'            => 'Level',
     'alternateairport' => 'Alternate Airport',
+    'inbound'          => 'Inbound Flights',
+    'outbound'         => 'Outbound Flights',
+    'none'             => 'No Flight Found.',
+    'departuretime'    => 'Departure Time',
+    'arrivaltime'      => 'Arrival Time',
+    'type'             => [
+        'pass_scheduled'    => 'Passenger - Scheduled',
+        'cargo_scheduled'   => 'Cargo - Scheduled',
+        'charter_pass_only' => 'Charter - Passenger Only',
+        'addtl_cargo_mail'  => 'Additional Cargo/Mail',
+        'special_vip'       => 'Special VIP Flight (FAA/Government)',
+        'pass_addtl'        => 'Passenger - Additional',
+        'charter_cargo'     => 'Charter - Cargo/Mail',
+        'ambulance'         => 'Ambulance Flight',
+        'training_flight'   => 'Training Flight',
+        'mail_service'      => 'Mail Service',
+        'charter_special'   => 'Charter w/ Special Handling',
+        'positioning'       => 'Positioning (Ferry/Delivery/Demo)',
+        'technical_test'    => 'Technical Test',
+        'military'          => 'Military',
+        'technical_stop'    => 'Technical Stop',
+    ],
 ];

resources/lang/en/passwords.php

@@ -14,9 +14,9 @@ return [
     */
 
     'password' => 'Passwords must be at least six characters and match the confirmation.',
-    'reset' => 'Your password has been reset!',
+    'reset'    => 'Your password has been reset!',
-    'sent' => 'We have e-mailed your password reset link!',
+    'sent'     => 'We have e-mailed your password reset link!',
-    'token' => 'This password reset token is invalid.',
+    'token'    => 'This password reset token is invalid.',
-    'user' => "We can't find a user with that e-mail address.",
+    'user'     => "We can't find a user with that e-mail address.",
-
+    'confirm'  => 'Confirm Password',
 ];

resources/lang/en/pireps.php

@@ -4,11 +4,15 @@
  */
 
 return [
+    'newflightreport'      => 'New Flight Report',
+    'editflightreport'     => 'Edit Flight Report',
+    'savepirep'            => 'Save PIREP',
+    'submitpirep'          => 'Submit PIREP',
+    'fileflightreport'     => 'File New Report',
     'filenewpirep'         => 'File New PIREP',
     'pilotreport'          => 'Pilot Report|Pilot Reports',
     'arrived'              => 'Arrived',
     'source'               => 'Source',
-    'flighttype'           => 'Flight Type',
     'filedroute'           => 'Filed Route',
     'filedon'              => 'Filed On',
     'fare'                 => 'Fare|Fares',
@@ -16,20 +20,50 @@ return [
     'count'                => 'Count',
     'flightlevel'          => 'Flight Level',
     'fieldsreadonly'       => 'Once a PIREP has been accepted/rejected, certain fields go into read-only mode.',
-    'flightinformations'   => 'Flight Informations',
+    'flightinformations'   => 'Flight Information',
     'flightident'          => 'Flight Number/Code/Leg',
     'codeoptional'         => 'Code (optional)',
     'legoptional'          => 'Leg (optional)',
-    'deparrinformations'   => 'Departure/Arrival Informations',
+    'deparrinformations'   => 'Departure/Arrival Information',
-    'aircraftinformations' => 'Aircraft Informations',
+    'aircraftinformations' => 'Aircraft Information',
     'dateflown'            => 'Date Flown',
-    'departuretime'        => 'Departure Time',
-    'arrivaltime'          => 'Arrival Time',
     'deletepirep'          => 'Delete PIREP',
-    'savepirep'            => 'Save PIREP',
-    'submitpirep'          => 'Submit PIREP',
-    'editflightreport'     => 'Edit Flight Report',
-    'fileflightreport'     => 'File New Report',
-    'newflightreport'      => 'New Flight Report',
     'submitted'            => 'Submitted',
+
+    'source_types' => [
+        'manual' => 'Manual',
+        'acars'  => 'ACARS',
+    ],
+    'state'  => [
+        'accepted'    => 'Accepted',
+        'pending'     => 'Pending Approval',
+        'rejected'    => 'Rejected',
+        'in_progress' => 'In Progress',
+        'cancelled'   => 'Cancelled',
+        'deleted'     => 'Deleted',
+        'draft'       => 'Draft',
+    ],
+    'status' => [
+        'initialized'  => 'Initiated',
+        'scheduled'    => 'Scheduled',
+        'boarding'     => 'Boarding',
+        'ready_start'  => 'Ready for start',
+        'push_tow'     => 'Pushback/towing',
+        'departed'     => 'Departed',
+        'ready_deice'  => 'Ready for de-icing',
+        'deicing'      => 'De-icing in progress',
+        'ground_ret'   => 'Ground return',
+        'taxi'         => 'Taxi',
+        'takeoff'      => 'Takeoff',
+        'initial_clb'  => 'Initial Climb',
+        'enroute'      => 'Enroute',
+        'diverted'     => 'Diverted',
+        'approach'     => 'Approach',
+        'final_appr'   => 'Final approach',
+        'landing'      => 'Landing',
+        'landed'       => 'Landed',
+        'arrived'      => 'Arrived',
+        'cancelled'    => 'Cancelled',
+        'emerg_decent' => 'Emergency decent',
+    ]
 ];

resources/lang/en/profile.php

@@ -5,7 +5,7 @@
 
 return [
     'avatarresize'    => 'This avatar will be resized to :width x :height pixels',
-    'flighthours'     => 'Flight Hours',
+
     'newapikey'       => 'New API Key',
     'yourprofile'     => 'Your Profile',
     'apikey'          => 'API Key',

resources/lang/en/system.php

@@ -1,106 +0,0 @@
-<?php
-
-return [
-
-    'global' => [
-        'active'   => 'Active',
-        'inactive' => 'Inactive'
-    ],
-
-    'aircraft' => [
-        'status' => [
-            'active'   => 'Active',
-            'stored'   => 'Stored',
-            'retired'  => 'Retired',
-            'scrapped' => 'Scrapped',
-            'written'  => 'Written Off',
-        ],
-    ],
-
-    'days' => [
-        'mon'   => 'Monday',
-        'tues'  => 'Tuesday',
-        'wed'   => 'Wednesday',
-        'thurs' => 'Thursday',
-        'fri'   => 'Friday',
-        'sat'   => 'Saturday',
-        'sun'   => 'Sunday',
-    ],
-
-    'expenses' => [
-        'type' => [
-            'flight'  => 'Flight',
-            'daily'   => 'Daily',
-            'monthly' => 'Monthly',
-        ],
-    ],
-
-    'flights' => [
-        'type' => [
-            'pass_scheduled'    => 'Passenger - Scheduled',
-            'cargo_scheduled'   => 'Cargo - Scheduled',
-            'charter_pass_only' => 'Charter - Passenger Only',
-            'addtl_cargo_mail'  => 'Additional Cargo/Mail',
-            'special_vip'       => 'Special VIP Flight (FAA/Government)',
-            'pass_addtl'        => 'Passenger - Additional',
-            'charter_cargo'     => 'Charter - Cargo/Mail',
-            'ambulance'         => 'Ambulance Flight',
-            'training_flight'   => 'Training Flight',
-            'mail_service'      => 'Mail Service',
-            'charter_special'   => 'Charter w/ Special Handling',
-            'positioning'       => 'Positioning (Ferry/Delivery/Demo)',
-            'technical_test'    => 'Technical Test',
-            'military'          => 'Military',
-            'technical_stop'    => 'Technical Stop',
-        ],
-    ],
-
-    'pireps' => [
-        'source' => [
-            'manual' => 'Manual',
-            'acars'  => 'ACARS',
-        ],
-        'state' => [
-            'accepted'    => 'Accepted',
-            'pending'     => 'Pending Approval',
-            'rejected'    => 'Rejected',
-            'in_progress' => 'In Progress',
-            'cancelled'   => 'Cancelled',
-            'deleted'     => 'Deleted',
-            'draft'       => 'Draft',
-        ],
-        'status' => [
-            'initialized'  => 'Initiated',
-            'scheduled'    => 'Scheduled',
-            'boarding'     => 'Boarding',
-            'ready_start'  => 'Ready for start',
-            'push_tow'     => 'Pushback/towing',
-            'departed'     => 'Departed',
-            'ready_deice'  => 'Ready for de-icing',
-            'deicing'      => 'De-icing in progress',
-            'ground_ret'   => 'Ground return',
-            'taxi'         => 'Taxi',
-            'takeoff'      => 'Takeoff',
-            'initial_clb'  => 'Initial Climb',
-            'enroute'      => 'Enroute',
-            'diverted'     => 'Diverted',
-            'approach'     => 'Approach',
-            'final_appr'   => 'Final approach',
-            'landing'      => 'Landing',
-            'landed'       => 'Landed',
-            'arrived'      => 'Arrived',
-            'cancelled'    => 'Cancelled',
-            'emerg_decent' => 'Emergency decent',
-        ]
-    ],
-
-    'users' => [
-        'state' => [
-            'pending'   => 'Pending',
-            'active'    => 'Active',
-            'rejected'  => 'Rejected',
-            'on_leave'  => 'On Leave',
-            'suspended' => 'Suspended',
-        ],
-    ],
-];

resources/lang/en/user.php

@@ -5,4 +5,11 @@
 
 return [
     'location' => 'Location',
+    'state' => [
+        'pending'   => 'Pending',
+        'active'    => 'Active',
+        'rejected'  => 'Rejected',
+        'on_leave'  => 'On Leave',
+        'suspended' => 'Suspended',
+    ],
 ];

resources/lang/en/validation.php

@@ -80,34 +80,34 @@ return [
      */
 
     'custom' => [
-        'airline_id' => [
+        'airline_id'           => [
             'required' => 'An airline is required',
-            'exists' => 'The airline doesn\'t exist',
+            'exists'   => 'The airline doesn\'t exist',
         ],
-        'aircraft_id' => [
+        'aircraft_id'          => [
             'required' => 'An aircraft is required',
-            'exists' => 'The aircraft doesn\'t exist',
+            'exists'   => 'The aircraft doesn\'t exist',
         ],
-        'arr_airport_id' => [
+        'arr_airport_id'       => [
             'required' => 'An arrival airport is required',
         ],
-        'dpt_airport_id' => [
+        'dpt_airport_id'       => [
             'required' => 'A departure airport is required',
         ],
-        'flight_time' => [
+        'flight_time'          => [
             'required' => 'Flight time, in minutes, is required',
-            'integer' => 'Flight time, in minutes, is required',
+            'integer'  => 'Flight time, in minutes, is required',
         ],
-        'planned_flight_time' => [
+        'planned_flight_time'  => [
             'required' => 'Flight time, in minutes, is required',
-            'integer' => 'Flight time, in minutes, is required',
+            'integer'  => 'Flight time, in minutes, is required',
         ],
-        'source_name' => [
+        'source_name'          => [
             'required' => 'PIREP Source is required',
         ],
         'g-recaptcha-response' => [
             'required' => 'Please verify that you are not a robot.',
-            'captcha' => 'Captcha error! try again later or contact site admin.',
+            'captcha'  => 'Captcha error! try again later or contact site admin.',
         ],
     ],
 

resources/lang/en/widgets.php

@@ -18,18 +18,18 @@ return [
     ],
 
     'weather' => [
-        'metarnotretrieved' => 'METAR/TAF data could not be retrieved',
+        'nometar'    => 'METAR/TAF data could not be retrieved',
-        'conditions'        => 'Conditions',
+        'conditions' => 'Conditions',
-        'visibility'        => 'visibility',
+        'visibility' => 'visibility',
-        'humidity'          => 'humidity',
+        'humidity'   => 'humidity',
-        'dewpoint'          => 'dew point',
+        'dewpoint'   => 'dew point',
-        'barometer'         => 'Barometer',
+        'barometer'  => 'Barometer',
-        'clouds'            => 'Clouds',
+        'clouds'     => 'Clouds',
-        'wind'              => 'Wind',
+        'wind'       => 'Wind',
-        'remarks'           => 'Remarks',
+        'remarks'    => 'Remarks',
-        'guststo'           => 'gusts to',
+        'guststo'    => 'gusts to',
-        'updated'           => 'Updated',
+        'updated'    => 'Updated',
-        'hrago'             => 'hr ago|hrs ago',
+        'hrago'      => 'hr ago|hrs ago',
-        'minago'            => 'min ago|mins ago',
+        'minago'     => 'min ago|mins ago',
     ],
 ];

resources/lang/it/aircraft.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ *
+ */
+
+return [
+    'status' => [
+        'active'   => 'Attivo',
+        'stored'   => 'Immagazzinato',
+        'retired'  => 'Ritirato',
+        'scrapped' => 'Rottamato',
+        'written'  => 'Stornato',
+    ],
+];

resources/lang/it/airports.php

@@ -4,8 +4,9 @@
  */
 
 return [
-    'inboundflights'  => 'Voli in Entrata',
+    'ident'     => 'Identificativo',
-    'outboundflights' => 'Voli in Uscita',
+    'home'      => 'Aeroporto di Casa',
-    'ident'           => 'Identificativo',
+    'current'   => 'Aeroporto Corrente',
-    'noflightfound'   => 'Nessun Volo Trovato.',
+    'departure' => 'Aeroporto di Partenza',
+    'arrival'   => 'Aeroporto d\'Arrivo',
 ];

resources/lang/it/auth.php

@@ -17,7 +17,7 @@ return [
     'pendingmessage'           => 'La tua registrazione è in attesa di approvazione. Controlla la tua email per favore.',
     'registrationsubmitted'    => 'Registrazione Inviata',
     'registrationconfirmation' => 'Conferma di Registrazione',
-    'confirmationmessage'      => 'La tua richiesta è stata inviata e richiede l\'approvazione di un membro dello staff. Quando\nverrà esaminata, riceverai una email di conferma.',
+    'confirmationmessage'      => 'La tua richiesta è stata inviata e richiede l\'approvazione di un membro dello staff. Quando verrà esaminata, riceverai una email di conferma.',
     'registrationdenied'       => 'Registrazione Negata',
     'deniedmessage'            => 'La tua registrazione è stata rifiutata. Contatta un amministratore per favore.',
     'accountsuspended'         => 'Account Sospeso',

resources/lang/it/common.php

@@ -15,9 +15,6 @@ return [
     'email'            => 'Email',
     'login'            => 'Accesso',
     'register'         => 'Registrazione',
-    'confirmpassword'  => 'Conferma Password',
-    'homeairport'      => 'Aeroporto di Casa',
-    'currentairport'   => 'Aeroporto Corrente',
     'timezone'         => 'Fuso Orario',
     'country'          => 'Paese',
     'download'         => 'Download|Downloads',
@@ -33,11 +30,6 @@ return [
     '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',
@@ -51,4 +43,15 @@ return [
     'hello'            => 'Ciao',
     'regards'          => 'Saluti',
     'rightsreserved'   => 'Tutti i Diritti Riservati',
+    'active'           => 'Attivo',
+    'inactive'         => 'Inattivo',
+    'days'             => [
+        'mon'   => 'Lunedì',
+        'tues'  => 'Martedì',
+        'wed'   => 'Mercoledì',
+        'thurs' => 'Giovedì',
+        'fri'   => 'Venerdì',
+        'sat'   => 'Sabato',
+        'sun'   => 'Domenica',
+    ],
 ];

resources/lang/it/expenses.php

@@ -0,0 +1,12 @@
+<?php
+/**
+ *
+ */
+
+return [
+    'type' => [
+        'flight'  => 'Volo',
+        'daily'   => 'Giornaliera',
+        'monthly' => 'Mensile',
+    ],
+];

resources/lang/it/flights.php

@@ -4,6 +4,11 @@
  */
 
 return [
+    'flightnumber'     => 'Numero di Volo',
+    'flighttime'       => 'Tempo di Volo',
+    'flighttype'       => 'Tipo di Volo',
+    'flighthours'      => 'Ore di Volo',
+    'route'            => 'Rotta',
     'mybid'            => 'Mia prenotazione|Mie Prenotazioni',
     'addremovebid'     => 'Aggiungi/Rimuovi Prenotazione',
     'bidremoved'       => 'La tua prenotazione è stata rimossa.',
@@ -12,4 +17,26 @@ return [
     'arr'              => 'Arr',
     'level'            => 'Livello',
     'alternateairport' => 'Aeroporto Alternativo',
+    'inbound'          => 'Voli in Entrata',
+    'outbound'         => 'Voli in Uscita',
+    'none'             => 'Nessun Volo Trovato.',
+    'departuretime'    => 'Ora di Partenza',
+    'arrivaltime'      => 'Ora di Arrivo',
+    'type'             => [
+        'pass_scheduled'    => 'Passeggeri - Programmato',
+        'cargo_scheduled'   => 'Cargo - Programmato',
+        'charter_pass_only' => 'Charter - Solo Passeggeri',
+        'addtl_cargo_mail'  => 'Cargo/Posta Addizionale',
+        'special_vip'       => 'Volo VIP Speciale (FAA/Governo)',
+        'pass_addtl'        => 'Passeggeri - Addizionale',
+        'charter_cargo'     => 'Charter - Cargo/Posta',
+        'ambulance'         => 'Volo Ambulanza',
+        'training_flight'   => 'Volo di Addestramento',
+        'mail_service'      => 'Servizio Postale',
+        'charter_special'   => 'Charter con Manutenzione Speciale',
+        'positioning'       => 'Posizionamento (Traghetto/Consegna/Dimostrazione)',
+        'technical_test'    => 'Prova Tecnica',
+        'military'          => 'Militare',
+        'technical_stop'    => 'Fermo Tecnico',
+    ],
 ];

resources/lang/it/passwords.php

@@ -14,9 +14,9 @@ return [
     */
 
     'password' => 'Le password devono essere lunghe almeno sei caratteri ed essere identiche al campo di conferma password.',
-    'reset' => 'La tua password è stata resettata!',
+    'reset'    => 'La tua password è stata resettata!',
-    'sent' => 'Ti abbiamo inviato via email il link per resettare la password!',
+    'sent'     => 'Ti abbiamo inviato via email il link per resettare la password!',
-    'token' => 'Questo token per resettare la password non è valido.',
+    'token'    => 'Questo token per resettare la password non è valido.',
-    'user' => "Non ci è stato possibile trovare un utente con questo indirizzo email.",
+    'user'     => 'Non ci è stato possibile trovare un utente con questo indirizzo email.',
-
+    'confirm'  => 'Conferma Password',
 ];

resources/lang/it/pireps.php

@@ -8,7 +8,6 @@ return [
     'pilotreport'          => 'Rapporto Pilota|Rapporti Pilota',
     'arrived'              => 'Arrivato',
     'source'               => 'Fonte',
-    'flighttype'           => 'Tipo di Volo',
     'filedroute'           => 'Rotta Inserita',
     'filedon'              => 'Inserito il',
     'fare'                 => 'Tariffa|Tariffe',
@@ -23,8 +22,6 @@ return [
     'deparrinformations'   => 'Informazioni di Partenza/Arrivo',
     'aircraftinformations' => 'Informazioni sull\'Aeromobile',
     'dateflown'            => 'Volato in Data',
-    'departuretime'        => 'Ora di Partenza',
-    'arrivaltime'          => 'Ora di Arrivo',
     'deletepirep'          => 'Cancella PIREP',
     'savepirep'            => 'Salva PIREP',
     'submitpirep'          => 'Invia PIREP',
@@ -32,4 +29,41 @@ return [
     'fileflightreport'     => 'Inserisci Rapporto di Volo',
     'newflightreport'      => 'Nuovo Rapporto di Volo',
     'submitted'            => 'Inviato',
+
+    'source_type' => [
+        'manual' => 'Manuale',
+        'acars'  => 'ACARS',
+    ],
+    'state'       => [
+        'accepted'    => 'Accettato',
+        'pending'     => 'In Attesa di Approvazione',
+        'rejected'    => 'Rifiutato',
+        'in_progress' => 'In Lavorazione',
+        'cancelled'   => 'Cancellato',
+        'deleted'     => 'Eliminato',
+        'draft'       => 'Bozza',
+    ],
+    'status'      => [
+        'initialized'  => 'Iniziato',
+        'scheduled'    => 'Programmato',
+        'boarding'     => 'Imbarco',
+        'ready_start'  => 'Pronto alla partenza',
+        'push_tow'     => 'Pushback/Rimorchio',
+        'departed'     => 'Partito',
+        'ready_deice'  => 'Pronto al de-icing',
+        'deicing'      => 'De-icing in corso',
+        'ground_ret'   => 'Ritorno a Terra',
+        'taxi'         => 'Taxi',
+        'takeoff'      => 'Decollo',
+        'initial_clb'  => 'Salita Iniziale',
+        'enroute'      => 'Enroute',
+        'diverted'     => 'Diverted',
+        'approach'     => 'Approccio',
+        'final_appr'   => 'Approccio Finale',
+        'landing'      => 'Atterraggio',
+        'landed'       => 'Atterrato',
+        'arrived'      => 'Arrivato',
+        'cancelled'    => 'Cancellato',
+        'emerg_decent' => 'Discesa di Emergenza',
+    ]
 ];

resources/lang/it/profile.php

@@ -5,7 +5,6 @@
 
 return [
     'avatarresize'    => 'Questo avatar sarà ridimensionato a :width x :height pixels',
-    'flighthours'     => 'Ore di Volo',
     'newapikey'       => 'Nuova Chiave API',
     'yourprofile'     => 'Il Tuo Profilo',
     'apikey'          => 'Chiave API',

resources/lang/it/system.php

@@ -1,106 +0,0 @@
-<?php
-
-return [
-
-    'global' => [
-        'active'   => 'Attivo',
-        'inactive' => 'Inattivo'
-    ],
-
-    'aircraft' => [
-        'status' => [
-            'active'   => 'Attivo',
-            'stored'   => 'Immagazzinato',
-            'retired'  => 'Ritirato',
-            'scrapped' => 'Rottamato',
-            'written'  => 'Stornato',
-        ],
-    ],
-
-    'days' => [
-        'mon'   => 'Lunedì',
-        'tues'  => 'Martedì',
-        'wed'   => 'Mercoledì',
-        'thurs' => 'Giovedì',
-        'fri'   => 'Venerdì',
-        'sat'   => 'Sabato',
-        'sun'   => 'Domenica',
-    ],
-
-    'expenses' => [
-        'type' => [
-            'flight'  => 'Volo',
-            'daily'   => 'Giornaliera',
-            'monthly' => 'Mensile',
-        ],
-    ],
-
-    'flights' => [
-        'type' => [
-            'pass_scheduled'    => 'Passeggeri - Programmato',
-            'cargo_scheduled'   => 'Cargo - Programmato',
-            'charter_pass_only' => 'Charter - Solo Passeggeri',
-            'addtl_cargo_mail'  => 'Cargo/Posta Addizionale',
-            'special_vip'       => 'Volo VIP Speciale (FAA/Governo)',
-            'pass_addtl'        => 'Passeggeri - Addizionale',
-            'charter_cargo'     => 'Charter - Cargo/Posta',
-            'ambulance'         => 'Volo Ambulanza',
-            'training_flight'   => 'Volo di Addestramento',
-            'mail_service'      => 'Servizio Postale',
-            'charter_special'   => 'Charter con Manutenzione Speciale',
-            'positioning'       => 'Posizionamento (Traghetto/Consegna/Dimostrazione)',
-            'technical_test'    => 'Prova Tecnica',
-            'military'          => 'Militare',
-            'technical_stop'    => 'Fermo Tecnico',
-        ],
-    ],
-
-    'pireps' => [
-        'source' => [
-            'manual' => 'Manuale',
-            'acars'  => 'ACARS',
-        ],
-        'state' => [
-            'accepted'    => 'Accettato',
-            'pending'     => 'In Attesa di Approvazione',
-            'rejected'    => 'Rifiutato',
-            'in_progress' => 'In Lavorazione',
-            'cancelled'   => 'Cancellato',
-            'deleted'     => 'Eliminato',
-            'draft'       => 'Bozza',
-        ],
-        'status' => [
-            'initialized'  => 'Iniziato',
-            'scheduled'    => 'Programmato',
-            'boarding'     => 'Imbarco',
-            'ready_start'  => 'Pronto alla partenza',
-            'push_tow'     => 'Pushback/Rimorchio',
-            'departed'     => 'Partito',
-            'ready_deice'  => 'Pronto al de-icing',
-            'deicing'      => 'De-icing in corso',
-            'ground_ret'   => 'Ritorno a Terra',
-            'taxi'         => 'Taxi',
-            'takeoff'      => 'Decollo',
-            'initial_clb'  => 'Salita Iniziale',
-            'enroute'      => 'Enroute',
-            'diverted'     => 'Diverted',
-            'approach'     => 'Approccio',
-            'final_appr'   => 'Approccio Finale',
-            'landing'      => 'Atterraggio',
-            'landed'       => 'Atterrato',
-            'arrived'      => 'Arrivato',
-            'cancelled'    => 'Cancellato',
-            'emerg_decent' => 'Discesa di Emergenza',
-        ]
-    ],
-
-    'users' => [
-        'state' => [
-            'pending'   => 'In Attesa',
-            'active'    => 'Attivo',
-            'rejected'  => 'Rifiutato',
-            'on_leave'  => 'In Ferie',
-            'suspended' => 'Sospeso',
-        ],
-    ],
-];

resources/lang/it/user.php

@@ -5,4 +5,11 @@
 
 return [
     'location' => 'Posizione',
+    'state' => [
+        'pending'   => 'In Attesa',
+        'active'    => 'Attivo',
+        'rejected'  => 'Rifiutato',
+        'on_leave'  => 'In Ferie',
+        'suspended' => 'Sospeso',
+    ],
 ];

resources/lang/it/widgets.php

@@ -18,18 +18,18 @@ return [
     ],
 
     'weather' => [
-        'metarnotretrieved' => 'I dati METAR/TAF non possono essere recuperati',
+        'nometar'    => 'I dati METAR/TAF non possono essere recuperati',
-        'conditions'        => 'Condizioni',
+        'conditions' => 'Condizioni',
-        'visibility'        => 'visibilità',
+        'visibility' => 'visibilità',
-        'humidity'          => 'umidità',
+        'humidity'   => 'umidità',
-        'dewpoint'          => 'punto di rugiada',
+        'dewpoint'   => 'punto di rugiada',
-        'barometer'         => 'Barometro',
+        'barometer'  => 'Barometro',
-        'clouds'            => 'Nuvole',
+        'clouds'     => 'Nuvole',
-        'wind'              => 'Vento',
+        'wind'       => 'Vento',
-        'guststo'           => 'raffiche da',
+        'guststo'    => 'raffiche da',
-        'remarks'           => 'Remarks',
+        'remarks'    => 'Remarks',
-        'updated'           => 'Aggiornato',
+        'updated'    => 'Aggiornato',
-        'hrago'             => 'ora fa|ore fa',
+        'hrago'      => 'ora fa|ore fa',
-        'minago'            => 'ninuto fa|minuti fa',
+        'minago'     => 'ninuto fa|minuti fa',
     ],
 ];

resources/views/admin/flights/fields.blade.php

@@ -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>

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

@@ -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">

resources/views/layouts/default/auth/register.blade.php

@@ -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>

resources/views/layouts/default/dashboard/index.blade.php

@@ -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>

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

@@ -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>
 

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

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

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

@@ -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>

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

@@ -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>

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

@@ -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>
 

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

@@ -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>

resources/views/layouts/default/profile/fields.blade.php

@@ -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>

resources/views/layouts/default/profile/index.blade.php

@@ -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
 

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

@@ -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>

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

@@ -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>