From 0a7f002217449eb39551419b3cbef43fed0db2e6 Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Mon, 21 May 2018 11:55:40 -0500 Subject: [PATCH] More organizing for translations --- app/Models/Enums/ActiveState.php | 4 +- app/Models/Enums/AircraftStatus.php | 10 +- app/Models/Enums/Days.php | 14 +-- app/Models/Enums/ExpenseType.php | 6 +- app/Models/Enums/FlightType.php | 30 ++--- app/Models/Enums/PirepSource.php | 4 +- app/Models/Enums/PirepState.php | 14 +-- app/Models/Enums/PirepStatus.php | 46 ++++---- app/Models/Enums/UserState.php | 10 +- resources/lang/en/aircraft.php | 14 +++ resources/lang/en/airports.php | 9 +- resources/lang/en/auth.php | 2 +- resources/lang/en/common.php | 19 ++-- resources/lang/en/expenses.php | 12 ++ resources/lang/en/flights.php | 27 +++++ resources/lang/en/passwords.php | 10 +- resources/lang/en/pireps.php | 56 +++++++-- resources/lang/en/profile.php | 2 +- resources/lang/en/system.php | 106 ------------------ resources/lang/en/user.php | 7 ++ resources/lang/en/validation.php | 24 ++-- resources/lang/en/widgets.php | 26 ++--- resources/lang/it/aircraft.php | 14 +++ resources/lang/it/airports.php | 9 +- resources/lang/it/auth.php | 2 +- resources/lang/it/common.php | 19 ++-- resources/lang/it/expenses.php | 12 ++ resources/lang/it/flights.php | 27 +++++ resources/lang/it/passwords.php | 10 +- resources/lang/it/pireps.php | 40 ++++++- resources/lang/it/profile.php | 1 - resources/lang/it/system.php | 106 ------------------ resources/lang/it/user.php | 7 ++ resources/lang/it/widgets.php | 26 ++--- .../views/admin/flights/fields.blade.php | 14 +-- .../layouts/default/airports/show.blade.php | 8 +- .../layouts/default/auth/register.blade.php | 4 +- .../layouts/default/dashboard/index.blade.php | 2 +- .../layouts/default/flights/search.blade.php | 6 +- .../layouts/default/flights/show.blade.php | 2 +- .../layouts/default/flights/table.blade.php | 2 +- .../layouts/default/pireps/fields.blade.php | 22 ++-- .../layouts/default/pireps/show.blade.php | 2 +- .../layouts/default/pireps/table.blade.php | 2 +- .../layouts/default/profile/fields.blade.php | 4 +- .../layouts/default/profile/index.blade.php | 6 +- .../default/widgets/live_map.blade.php | 2 +- .../layouts/default/widgets/weather.blade.php | 2 +- 48 files changed, 393 insertions(+), 410 deletions(-) create mode 100644 resources/lang/en/aircraft.php create mode 100644 resources/lang/en/expenses.php delete mode 100644 resources/lang/en/system.php create mode 100644 resources/lang/it/aircraft.php create mode 100644 resources/lang/it/expenses.php delete mode 100644 resources/lang/it/system.php diff --git a/app/Models/Enums/ActiveState.php b/app/Models/Enums/ActiveState.php index bfe5df17..ac09b249 100644 --- a/app/Models/Enums/ActiveState.php +++ b/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::INACTIVE => 'system.global.inactive', + ActiveState::ACTIVE => 'common.active', + ActiveState::INACTIVE => 'common.inactive', ]; } diff --git a/app/Models/Enums/AircraftStatus.php b/app/Models/Enums/AircraftStatus.php index 28b5cc48..82f05afe 100644 --- a/app/Models/Enums/AircraftStatus.php +++ b/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::STORED => 'system.aircraft.status.stored', - AircraftStatus::RETIRED => 'system.aircraft.status.retired', - AircraftStatus::SCRAPPED => 'system.aircraft.status.scrapped', - AircraftStatus::WRITTEN_OFF => 'system.aircraft.status.written', + AircraftStatus::ACTIVE => 'aircraft.status.active', + AircraftStatus::STORED => 'aircraft.status.stored', + AircraftStatus::RETIRED => 'aircraft.status.retired', + AircraftStatus::SCRAPPED => 'aircraft.status.scrapped', + AircraftStatus::WRITTEN_OFF => 'aircraft.status.written', ]; } diff --git a/app/Models/Enums/Days.php b/app/Models/Enums/Days.php index 5eaa0ee9..feddc424 100644 --- a/app/Models/Enums/Days.php +++ b/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::TUESDAY => 'system.days.tues', - Days::WEDNESDAY => 'system.days.wed', - Days::THURSDAY => 'system.days.thurs', - Days::FRIDAY => 'system.days.fri', - Days::SATURDAY => 'system.days.sat', - Days::SUNDAY => 'system.days.sun', + Days::MONDAY => 'common.days.mon', + Days::TUESDAY => 'common.days.tues', + Days::WEDNESDAY => 'common.days.wed', + Days::THURSDAY => 'common.days.thurs', + Days::FRIDAY => 'common.days.fri', + Days::SATURDAY => 'common.days.sat', + Days::SUNDAY => 'common.days.sun', ]; public static $codes = [ diff --git a/app/Models/Enums/ExpenseType.php b/app/Models/Enums/ExpenseType.php index 1e744e6b..6d119d49 100644 --- a/app/Models/Enums/ExpenseType.php +++ b/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::DAILY => 'system.expenses.type.daily', - ExpenseType::MONTHLY => 'system.expenses.type.monthly', + ExpenseType::FLIGHT => 'expenses.type.flight', + ExpenseType::DAILY => 'expenses.type.daily', + ExpenseType::MONTHLY => 'expenses.type.monthly', ]; protected static $codes = [ diff --git a/app/Models/Enums/FlightType.php b/app/Models/Enums/FlightType.php index fba52f01..fe24815f 100644 --- a/app/Models/Enums/FlightType.php +++ b/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_CARGO => 'system.flights.type.cargo_scheduled', - FlightType::CHARTER_PAX_ONLY => 'system.flights.type.charter_pass_only', - FlightType::ADDITIONAL_CARGO => 'system.flights.type.addtl_cargo_mail', - FlightType::VIP => 'system.flights.type.special_vip', - FlightType::ADDTL_PAX => 'system.flights.type.pass_addtl', - FlightType::CHARTER_CARGO_MAIL => 'system.flights.type.charter_cargo', - FlightType::AMBULANCE => 'system.flights.type.ambulance', - FlightType::TRAINING => 'system.flights.type.training_flight', - FlightType::MAIL_SERVICE => 'system.flights.type.mail_service', - FlightType::CHARTER_SPECIAL => 'system.flights.type.charter_special', - FlightType::POSITIONING => 'system.flights.type.positioning', - FlightType::TECHNICAL_TEST => 'system.flights.type.technical_test', - FlightType::MILITARY => 'system.flights.type.military', - FlightType::TECHNICAL_STOP => 'system.flights.type.technical_stop', + FlightType::SCHED_PAX => 'flights.type.pass_scheduled', + FlightType::SCHED_CARGO => 'flights.type.cargo_scheduled', + FlightType::CHARTER_PAX_ONLY => 'flights.type.charter_pass_only', + FlightType::ADDITIONAL_CARGO => 'flights.type.addtl_cargo_mail', + FlightType::VIP => 'flights.type.special_vip', + FlightType::ADDTL_PAX => 'flights.type.pass_addtl', + FlightType::CHARTER_CARGO_MAIL => 'flights.type.charter_cargo', + FlightType::AMBULANCE => 'flights.type.ambulance', + FlightType::TRAINING => 'flights.type.training_flight', + FlightType::MAIL_SERVICE => 'flights.type.mail_service', + FlightType::CHARTER_SPECIAL => 'flights.type.charter_special', + FlightType::POSITIONING => 'flights.type.positioning', + FlightType::TECHNICAL_TEST => 'flights.type.technical_test', + FlightType::MILITARY => 'flights.type.military', + FlightType::TECHNICAL_STOP => 'flights.type.technical_stop', ]; } diff --git a/app/Models/Enums/PirepSource.php b/app/Models/Enums/PirepSource.php index 0acee6e8..47c61428 100644 --- a/app/Models/Enums/PirepSource.php +++ b/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::ACARS => 'system.pireps.source.acars', + PirepSource::MANUAL => 'pireps.source_types.manual', + PirepSource::ACARS => 'pireps.source_types.acars', ]; } diff --git a/app/Models/Enums/PirepState.php b/app/Models/Enums/PirepState.php index 23939a98..0c89e940 100644 --- a/app/Models/Enums/PirepState.php +++ b/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::IN_PROGRESS => 'system.pireps.state.in_progress', - PirepState::PENDING => 'system.pireps.state.pending', - PirepState::ACCEPTED => 'system.pireps.state.accepted', - PirepState::CANCELLED => 'system.pireps.state.cancelled', - PirepState::DELETED => 'system.pireps.state.deleted', - PirepState::DRAFT => 'system.pireps.state.draft', + PirepState::REJECTED => 'pireps.state.rejected', + PirepState::IN_PROGRESS => 'pireps.state.in_progress', + PirepState::PENDING => 'pireps.state.pending', + PirepState::ACCEPTED => 'pireps.state.accepted', + PirepState::CANCELLED => 'pireps.state.cancelled', + PirepState::DELETED => 'pireps.state.deleted', + PirepState::DRAFT => 'pireps.state.draft', ]; } diff --git a/app/Models/Enums/PirepStatus.php b/app/Models/Enums/PirepStatus.php index d8fbffd0..290984bd 100644 --- a/app/Models/Enums/PirepStatus.php +++ b/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::SCHEDULED => 'system.pireps.status.scheduled', - PirepStatus::BOARDING => 'system.pireps.status.boarding', - PirepStatus::RDY_START => 'system.pireps.status.ready_start', - PirepStatus::PUSHBACK_TOW => 'system.pireps.status.push_tow', - PirepStatus::DEPARTED => 'system.pireps.status.departed', - PirepStatus::RDY_DEICE => 'system.pireps.status.ready_deice', - PirepStatus::STRT_DEICE => 'system.pireps.status.deicing', - PirepStatus::GRND_RTRN => 'system.pireps.status.ground_ret', - PirepStatus::TAXI => 'system.pireps.status.taxi', - PirepStatus::TAKEOFF => 'system.pireps.status.takeoff', - PirepStatus::INIT_CLIM => 'system.pireps.status.initial_clb', - PirepStatus::AIRBORNE => 'system.pireps.status.enroute', - PirepStatus::ENROUTE => 'system.pireps.status.enroute', - PirepStatus::DIVERTED => 'system.pireps.status.diverted', - PirepStatus::APPROACH => 'system.pireps.status.approach', - PirepStatus::APPROACH_ICAO => 'system.pireps.status.approach', - PirepStatus::ON_FINAL => 'system.pireps.status.final_appr', - PirepStatus::LANDING => 'system.pireps.status.landing', - PirepStatus::LANDED => 'system.pireps.status.landed', - PirepStatus::ARRIVED => 'system.pireps.status.arrived', - PirepStatus::CANCELLED => 'system.pireps.status.cancelled', - PirepStatus::EMERG_DECENT => 'system.pireps.status.emerg_decent', + PirepStatus::INITIATED => 'pireps.status.initialized', + PirepStatus::SCHEDULED => 'pireps.status.scheduled', + PirepStatus::BOARDING => 'pireps.status.boarding', + PirepStatus::RDY_START => 'pireps.status.ready_start', + PirepStatus::PUSHBACK_TOW => 'pireps.status.push_tow', + PirepStatus::DEPARTED => 'pireps.status.departed', + PirepStatus::RDY_DEICE => 'pireps.status.ready_deice', + PirepStatus::STRT_DEICE => 'pireps.status.deicing', + PirepStatus::GRND_RTRN => 'pireps.status.ground_ret', + PirepStatus::TAXI => 'pireps.status.taxi', + PirepStatus::TAKEOFF => 'pireps.status.takeoff', + PirepStatus::INIT_CLIM => 'pireps.status.initial_clb', + PirepStatus::AIRBORNE => 'pireps.status.enroute', + PirepStatus::ENROUTE => 'pireps.status.enroute', + PirepStatus::DIVERTED => 'pireps.status.diverted', + PirepStatus::APPROACH => 'pireps.status.approach', + PirepStatus::APPROACH_ICAO => 'pireps.status.approach', + PirepStatus::ON_FINAL => 'pireps.status.final_appr', + PirepStatus::LANDING => 'pireps.status.landing', + PirepStatus::LANDED => 'pireps.status.landed', + PirepStatus::ARRIVED => 'pireps.status.arrived', + PirepStatus::CANCELLED => 'pireps.status.cancelled', + PirepStatus::EMERG_DECENT => 'pireps.status.emerg_decent', ]; } diff --git a/app/Models/Enums/UserState.php b/app/Models/Enums/UserState.php index f1bd438f..416ed412 100644 --- a/app/Models/Enums/UserState.php +++ b/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::ACTIVE => 'system.users.state.active', - UserState::REJECTED => 'system.users.state.rejected', - UserState::ON_LEAVE => 'system.users.state.on_leave', - UserState::SUSPENDED => 'system.users.state.suspended', + UserState::PENDING => 'users.state.pending', + UserState::ACTIVE => 'users.state.active', + UserState::REJECTED => 'users.state.rejected', + UserState::ON_LEAVE => 'users.state.on_leave', + UserState::SUSPENDED => 'users.state.suspended', ]; } diff --git a/resources/lang/en/aircraft.php b/resources/lang/en/aircraft.php new file mode 100644 index 00000000..56027eb6 --- /dev/null +++ b/resources/lang/en/aircraft.php @@ -0,0 +1,14 @@ + [ + 'active' => 'Active', + 'stored' => 'Stored', + 'retired' => 'Retired', + 'scrapped' => 'Scrapped', + 'written' => 'Written Off', + ], +]; diff --git a/resources/lang/en/airports.php b/resources/lang/en/airports.php index 95654176..81d044fa 100644 --- a/resources/lang/en/airports.php +++ b/resources/lang/en/airports.php @@ -4,8 +4,9 @@ */ return [ - 'inboundflights' => 'Inbound Flights', - 'outboundflights' => 'Outbound Flights', - 'ident' => 'Identification', - 'noflightfound' => 'No Flight Found.', + 'ident' => 'Identification', + 'home' => 'Home Airport', + 'current' => 'Current Airport', + 'departure' => 'Departure Airport', + 'arrival' => 'Arrival Airport', ]; diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php index 5b963655..c2943855 100755 --- a/resources/lang/en/auth.php +++ b/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', diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php index 72349851..384575e6 100644 --- a/resources/lang/en/common.php +++ b/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', + ], ]; diff --git a/resources/lang/en/expenses.php b/resources/lang/en/expenses.php new file mode 100644 index 00000000..5cba3658 --- /dev/null +++ b/resources/lang/en/expenses.php @@ -0,0 +1,12 @@ + [ + 'flight' => 'Flight', + 'daily' => 'Daily', + 'monthly' => 'Monthly', + ], +]; diff --git a/resources/lang/en/flights.php b/resources/lang/en/flights.php index 1bf18aed..73b99f16 100644 --- a/resources/lang/en/flights.php +++ b/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', + ], ]; diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php index e5544d20..1c5f6b45 100755 --- a/resources/lang/en/passwords.php +++ b/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!', - 'sent' => 'We have e-mailed your password reset link!', - 'token' => 'This password reset token is invalid.', - 'user' => "We can't find a user with that e-mail address.", - + 'reset' => 'Your password has been reset!', + 'sent' => 'We have e-mailed your password reset link!', + 'token' => 'This password reset token is invalid.', + 'user' => "We can't find a user with that e-mail address.", + 'confirm' => 'Confirm Password', ]; diff --git a/resources/lang/en/pireps.php b/resources/lang/en/pireps.php index 36cfc164..98ac4867 100644 --- a/resources/lang/en/pireps.php +++ b/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', - 'aircraftinformations' => 'Aircraft Informations', + 'deparrinformations' => 'Departure/Arrival Information', + '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', + ] ]; diff --git a/resources/lang/en/profile.php b/resources/lang/en/profile.php index f2449bab..d64d2c04 100644 --- a/resources/lang/en/profile.php +++ b/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', diff --git a/resources/lang/en/system.php b/resources/lang/en/system.php deleted file mode 100644 index 556543c9..00000000 --- a/resources/lang/en/system.php +++ /dev/null @@ -1,106 +0,0 @@ - [ - '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', - ], - ], -]; diff --git a/resources/lang/en/user.php b/resources/lang/en/user.php index a2e72122..426a4046 100644 --- a/resources/lang/en/user.php +++ b/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', + ], ]; diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index b08f0383..bb1bf4b6 100755 --- a/resources/lang/en/validation.php +++ b/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.', ], ], diff --git a/resources/lang/en/widgets.php b/resources/lang/en/widgets.php index 1a55e44f..f03e2a26 100644 --- a/resources/lang/en/widgets.php +++ b/resources/lang/en/widgets.php @@ -18,18 +18,18 @@ return [ ], 'weather' => [ - 'metarnotretrieved' => 'METAR/TAF data could not be retrieved', - 'conditions' => 'Conditions', - 'visibility' => 'visibility', - 'humidity' => 'humidity', - 'dewpoint' => 'dew point', - 'barometer' => 'Barometer', - 'clouds' => 'Clouds', - 'wind' => 'Wind', - 'remarks' => 'Remarks', - 'guststo' => 'gusts to', - 'updated' => 'Updated', - 'hrago' => 'hr ago|hrs ago', - 'minago' => 'min ago|mins ago', + 'nometar' => 'METAR/TAF data could not be retrieved', + 'conditions' => 'Conditions', + 'visibility' => 'visibility', + 'humidity' => 'humidity', + 'dewpoint' => 'dew point', + 'barometer' => 'Barometer', + 'clouds' => 'Clouds', + 'wind' => 'Wind', + 'remarks' => 'Remarks', + 'guststo' => 'gusts to', + 'updated' => 'Updated', + 'hrago' => 'hr ago|hrs ago', + 'minago' => 'min ago|mins ago', ], ]; diff --git a/resources/lang/it/aircraft.php b/resources/lang/it/aircraft.php new file mode 100644 index 00000000..98b59741 --- /dev/null +++ b/resources/lang/it/aircraft.php @@ -0,0 +1,14 @@ + [ + 'active' => 'Attivo', + 'stored' => 'Immagazzinato', + 'retired' => 'Ritirato', + 'scrapped' => 'Rottamato', + 'written' => 'Stornato', + ], +]; diff --git a/resources/lang/it/airports.php b/resources/lang/it/airports.php index 493ed633..81635f4f 100644 --- a/resources/lang/it/airports.php +++ b/resources/lang/it/airports.php @@ -4,8 +4,9 @@ */ return [ - 'inboundflights' => 'Voli in Entrata', - 'outboundflights' => 'Voli in Uscita', - 'ident' => 'Identificativo', - 'noflightfound' => 'Nessun Volo Trovato.', + 'ident' => 'Identificativo', + 'home' => 'Aeroporto di Casa', + 'current' => 'Aeroporto Corrente', + 'departure' => 'Aeroporto di Partenza', + 'arrival' => 'Aeroporto d\'Arrivo', ]; diff --git a/resources/lang/it/auth.php b/resources/lang/it/auth.php index bef7b4e3..fcbc5a60 100644 --- a/resources/lang/it/auth.php +++ b/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', diff --git a/resources/lang/it/common.php b/resources/lang/it/common.php index 328c4688..9ee9aede 100644 --- a/resources/lang/it/common.php +++ b/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', + ], ]; diff --git a/resources/lang/it/expenses.php b/resources/lang/it/expenses.php new file mode 100644 index 00000000..cc5f015c --- /dev/null +++ b/resources/lang/it/expenses.php @@ -0,0 +1,12 @@ + [ + 'flight' => 'Volo', + 'daily' => 'Giornaliera', + 'monthly' => 'Mensile', + ], +]; diff --git a/resources/lang/it/flights.php b/resources/lang/it/flights.php index 6db4b0c9..5ebd3882 100644 --- a/resources/lang/it/flights.php +++ b/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', + ], ]; diff --git a/resources/lang/it/passwords.php b/resources/lang/it/passwords.php index 8e3d4ea4..0430199e 100644 --- a/resources/lang/it/passwords.php +++ b/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!', - 'sent' => 'Ti abbiamo inviato via email il link per resettare la password!', - 'token' => 'Questo token per resettare la password non è valido.', - 'user' => "Non ci è stato possibile trovare un utente con questo indirizzo email.", - + 'reset' => 'La tua password è stata resettata!', + 'sent' => 'Ti abbiamo inviato via email il link per resettare la password!', + 'token' => 'Questo token per resettare la password non è valido.', + 'user' => 'Non ci è stato possibile trovare un utente con questo indirizzo email.', + 'confirm' => 'Conferma Password', ]; diff --git a/resources/lang/it/pireps.php b/resources/lang/it/pireps.php index 3acb0cff..20279abb 100644 --- a/resources/lang/it/pireps.php +++ b/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', + ] ]; diff --git a/resources/lang/it/profile.php b/resources/lang/it/profile.php index 0dbe0def..66043313 100644 --- a/resources/lang/it/profile.php +++ b/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', diff --git a/resources/lang/it/system.php b/resources/lang/it/system.php deleted file mode 100644 index bcba939f..00000000 --- a/resources/lang/it/system.php +++ /dev/null @@ -1,106 +0,0 @@ - [ - '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', - ], - ], -]; diff --git a/resources/lang/it/user.php b/resources/lang/it/user.php index 30fd8e6a..60b59d98 100644 --- a/resources/lang/it/user.php +++ b/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', + ], ]; diff --git a/resources/lang/it/widgets.php b/resources/lang/it/widgets.php index b2f10c9f..27f978d5 100644 --- a/resources/lang/it/widgets.php +++ b/resources/lang/it/widgets.php @@ -18,18 +18,18 @@ return [ ], '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', + 'nometar' => '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/admin/flights/fields.blade.php b/resources/views/admin/flights/fields.blade.php index af28a7ac..322e6420 100644 --- a/resources/views/admin/flights/fields.blade.php +++ b/resources/views/admin/flights/fields.blade.php @@ -147,31 +147,31 @@ diff --git a/resources/views/layouts/default/airports/show.blade.php b/resources/views/layouts/default/airports/show.blade.php index e9783b57..72dcf916 100644 --- a/resources/views/layouts/default/airports/show.blade.php +++ b/resources/views/layouts/default/airports/show.blade.php @@ -36,10 +36,10 @@
-
@lang('airports.inboundflights')
+
@lang('flights.inbound')
@if(!$inbound_flights)
- @lang('airports.noflightfound') + @lang('flights.none')
@else @@ -71,10 +71,10 @@
-
@lang('airports.outboundflights')
+
@lang('flights.outbound')
@if(!$outbound_flights)
- @lang('airports.noflightfound') + @lang('flights.none')
@else
diff --git a/resources/views/layouts/default/auth/register.blade.php b/resources/views/layouts/default/auth/register.blade.php index 0398e44b..424a44af 100644 --- a/resources/views/layouts/default/auth/register.blade.php +++ b/resources/views/layouts/default/auth/register.blade.php @@ -35,7 +35,7 @@

{{ $errors->first('airline_id') }}

@endif - +
{{ Form::select('home_airport_id', $airports, null , ['class' => 'form-control select2']) }}
@@ -67,7 +67,7 @@

{{ $errors->first('password') }}

@endif - +
{{ Form::password('password_confirmation', ['class' => 'form-control']) }}
diff --git a/resources/views/layouts/default/dashboard/index.blade.php b/resources/views/layouts/default/dashboard/index.blade.php index 09944366..a38e1847 100644 --- a/resources/views/layouts/default/dashboard/index.blade.php +++ b/resources/views/layouts/default/dashboard/index.blade.php @@ -53,7 +53,7 @@ @else

{{ $user->home_airport_id }}

@endif -
@lang('common.currentairport')
+
@lang('airports.current')
diff --git a/resources/views/layouts/default/flights/search.blade.php b/resources/views/layouts/default/flights/search.blade.php index 909564d4..45e3149f 100644 --- a/resources/views/layouts/default/flights/search.blade.php +++ b/resources/views/layouts/default/flights/search.blade.php @@ -8,17 +8,17 @@ 'class'=>'form-inline' ]) }}
-

@lang('common.flightnumber')

+

@lang('flights.flightnumber')

{{ Form::text('flight_number', null, ['class' => 'form-control']) }}
-

@lang('common.departureairport')

+

@lang('airports.departure')

{{ Form::select('dep_icao', $airports, null , ['class' => 'form-control']) }}
-

@lang('common.arrivalairport')

+

@lang('airports.arrival')

{{ Form::select('arr_icao', $airports, null , ['class' => 'form-control']) }}
diff --git a/resources/views/layouts/default/flights/show.blade.php b/resources/views/layouts/default/flights/show.blade.php index 5b0efbee..222a73d5 100644 --- a/resources/views/layouts/default/flights/show.blade.php +++ b/resources/views/layouts/default/flights/show.blade.php @@ -45,7 +45,7 @@ @endif - + diff --git a/resources/views/layouts/default/flights/table.blade.php b/resources/views/layouts/default/flights/table.blade.php index 3c10fb25..003004a4 100644 --- a/resources/views/layouts/default/flights/table.blade.php +++ b/resources/views/layouts/default/flights/table.blade.php @@ -61,7 +61,7 @@
- {{ strtoupper(__('common.route')) }}  + {{ strtoupper(__('flights.route')) }}  {{ $flight->route }}
diff --git a/resources/views/layouts/default/pireps/fields.blade.php b/resources/views/layouts/default/pireps/fields.blade.php index 6538333a..6a5ffce1 100644 --- a/resources/views/layouts/default/pireps/fields.blade.php +++ b/resources/views/layouts/default/pireps/fields.blade.php @@ -52,7 +52,7 @@ flight reports that have been filed. You've been warned! @else
{{ 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
- {{ Form::label('flight_type', __('pireps.flighttype')) }} + {{ Form::label('flight_type', __('flights.flighttype')) }} @if(!empty($pirep) && $pirep->read_only)

{{ \App\Models\Enums\FlightType::label($pirep->flight_type) }}

{{ Form::hidden('flight_type') }} @@ -96,7 +96,7 @@ flight reports that have been filed. You've been warned!
- {{ Form::label('hours', __('common.flighttime')) }} + {{ Form::label('hours', __('flights.flighttime')) }} @if(!empty($pirep) && $pirep->read_only)

{{ $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!

- {{--{{ 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]) }}--}}
- {{--{{ 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]) }}--}}
@@ -163,7 +163,7 @@ flight reports that have been filed. You've been warned!
- {{ Form::label('dpt_airport_id', __('common.departureairport')) }} + {{ Form::label('dpt_airport_id', __('airports.departure')) }} @if(!empty($pirep) && $pirep->read_only) {{ $pirep->dpt_airport->name }} ( - {{ Form::label('arr_airport_id', __('common.arrivalairport')) }} + {{ Form::label('arr_airport_id', __('airports.arrival')) }} @if(!empty($pirep) && $pirep->read_only) {{ $pirep->arr_airport->name }} (
-  @lang('common.route') +  @lang('flights.route')
- {{ Form::textarea('route', null, ['class' => 'form-control', 'placeholder' => __('common.route')]) }} + {{ Form::textarea('route', null, ['class' => 'form-control', 'placeholder' => __('flights.route')]) }}

{{ $errors->first('route') }}

diff --git a/resources/views/layouts/default/pireps/show.blade.php b/resources/views/layouts/default/pireps/show.blade.php index 83be0f0b..12575a61 100644 --- a/resources/views/layouts/default/pireps/show.blade.php +++ b/resources/views/layouts/default/pireps/show.blade.php @@ -116,7 +116,7 @@
- + diff --git a/resources/views/layouts/default/pireps/table.blade.php b/resources/views/layouts/default/pireps/table.blade.php index 25272b9b..7e0b1734 100644 --- a/resources/views/layouts/default/pireps/table.blade.php +++ b/resources/views/layouts/default/pireps/table.blade.php @@ -7,7 +7,7 @@ - + diff --git a/resources/views/layouts/default/profile/fields.blade.php b/resources/views/layouts/default/profile/fields.blade.php index 00ba033a..829b8544 100644 --- a/resources/views/layouts/default/profile/fields.blade.php +++ b/resources/views/layouts/default/profile/fields.blade.php @@ -38,7 +38,7 @@ - +
@lang('common.route')@lang('flights.route') {{ $flight->route }}
@lang('pireps.flighttype')@lang('flights.flighttype') {{ \App\Models\Enums\FlightType::label($pirep->flight_type) }}
@lang('common.departure') @lang('common.arrival') @lang('common.aircraft')@lang('common.flighttime')@lang('flights.flighttime') @lang('common.status') @lang('pireps.submitted')
@lang('common.homeairport')@lang('airports.home')
{{ Form::select('home_airport_id', $airports, null , ['class' => 'form-control select2']) }} @@ -84,7 +84,7 @@

{{ $errors->first('password') }}

@endif -

@lang('common.confirmpassword'):

+

@lang('passwords.confirm'):

{{ Form::password('password_confirmation', ['class' => 'form-control']) }}
diff --git a/resources/views/layouts/default/profile/index.blade.php b/resources/views/layouts/default/profile/index.blade.php index 5a117591..37194856 100644 --- a/resources/views/layouts/default/profile/index.blade.php +++ b/resources/views/layouts/default/profile/index.blade.php @@ -28,20 +28,20 @@ @if($user->home_airport) @endif @if($user->current_airport) @endif diff --git a/resources/views/layouts/default/widgets/live_map.blade.php b/resources/views/layouts/default/widgets/live_map.blade.php index 0f02878a..a4583717 100644 --- a/resources/views/layouts/default/widgets/live_map.blade.php +++ b/resources/views/layouts/default/widgets/live_map.blade.php @@ -51,7 +51,7 @@

@lang('common.status'): { pirep.status_text }
- @lang('common.flighttime'): { pirep.flight_time | time_hm }
+ @lang('flights.flighttime'): { pirep.flight_time | time_hm }
@lang('common.distance'): { pirep.position.distance.{{setting('units.distance')}} } / { pirep.planned_distance.{{setting('units.distance')}} } diff --git a/resources/views/layouts/default/widgets/weather.blade.php b/resources/views/layouts/default/widgets/weather.blade.php index 5ee9875e..3da30262 100644 --- a/resources/views/layouts/default/widgets/weather.blade.php +++ b/resources/views/layouts/default/widgets/weather.blade.php @@ -5,7 +5,7 @@ https://api.checkwx.com/#metar-decoded --}} @if(!$metar) -

@lang('widgets.weather.metarnotretrieved')

+

@lang('widgets.weather.nometar')

@else