From 613f7899f016bc9ce1f48a684c458d5d3ea81fe1 Mon Sep 17 00:00:00 2001 From: Daniel Cho Date: Tue, 28 Nov 2023 16:59:49 -0500 Subject: [PATCH 01/20] fix: localize attributes properly --- app/Http/Requests/MeetingRequest.php | 3 +++ app/Http/Requests/UpdateEngagementRequest.php | 8 +++++++- app/Http/Requests/UpdateProjectRequest.php | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/Http/Requests/MeetingRequest.php b/app/Http/Requests/MeetingRequest.php index 519f019ec..0edf1f313 100644 --- a/app/Http/Requests/MeetingRequest.php +++ b/app/Http/Requests/MeetingRequest.php @@ -118,6 +118,9 @@ public function attributes(): array 'region' => __('province or territory'), 'meeting_url' => __('link to join the meeting'), 'meeting_phone' => __('phone number to join the meeting'), + 'meeting_software' => __('meeting software'), + 'street_address' => __('Street address'), + 'postal_code' => __('Postal code'), ]; } diff --git a/app/Http/Requests/UpdateEngagementRequest.php b/app/Http/Requests/UpdateEngagementRequest.php index 1cd5eb067..abeaa564c 100644 --- a/app/Http/Requests/UpdateEngagementRequest.php +++ b/app/Http/Requests/UpdateEngagementRequest.php @@ -287,10 +287,16 @@ public function attributes(): array 'region' => __('province or territory'), 'meeting_url' => __('link to join the meeting'), 'meeting_phone' => __('phone number to join the meeting'), + 'meeting_software' => __('meeting software'), 'materials_by_date' => __('date for materials to be sent by'), 'complete_by_date' => __('due date'), + 'postal_code' => __('Postal code'), 'signup_by_date' => __('sign up deadline'), - 'other_accepted_formats' => __('accepted formats'), + 'street_address' => __('Street address'), + 'accepted_formats' => __('accepted formats'), + 'other_accepted_formats' => __('other accepted formats'), + 'timezone' => __('Time zone'), + ]; } diff --git a/app/Http/Requests/UpdateProjectRequest.php b/app/Http/Requests/UpdateProjectRequest.php index 43fb090ec..0c5663e8a 100644 --- a/app/Http/Requests/UpdateProjectRequest.php +++ b/app/Http/Requests/UpdateProjectRequest.php @@ -61,6 +61,8 @@ public function attributes(): array return [ 'regions' => __('geographic areas'), 'impacts' => __('areas of impact'), + 'start_date' => __('start date'), + 'end_date' => __('end date'), ]; } From 7812dfc5a30b7dd942e7645c46604e4326a8e777 Mon Sep 17 00:00:00 2001 From: Daniel Cho Date: Tue, 28 Nov 2023 17:17:38 -0500 Subject: [PATCH 02/20] fix: decapitalize localization message keys --- app/Http/Requests/MeetingRequest.php | 4 ++-- app/Http/Requests/UpdateEngagementRequest.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Http/Requests/MeetingRequest.php b/app/Http/Requests/MeetingRequest.php index 0edf1f313..95275402a 100644 --- a/app/Http/Requests/MeetingRequest.php +++ b/app/Http/Requests/MeetingRequest.php @@ -119,8 +119,8 @@ public function attributes(): array 'meeting_url' => __('link to join the meeting'), 'meeting_phone' => __('phone number to join the meeting'), 'meeting_software' => __('meeting software'), - 'street_address' => __('Street address'), - 'postal_code' => __('Postal code'), + 'street_address' => __('street address'), + 'postal_code' => __('postal code'), ]; } diff --git a/app/Http/Requests/UpdateEngagementRequest.php b/app/Http/Requests/UpdateEngagementRequest.php index abeaa564c..42551cdad 100644 --- a/app/Http/Requests/UpdateEngagementRequest.php +++ b/app/Http/Requests/UpdateEngagementRequest.php @@ -290,12 +290,12 @@ public function attributes(): array 'meeting_software' => __('meeting software'), 'materials_by_date' => __('date for materials to be sent by'), 'complete_by_date' => __('due date'), - 'postal_code' => __('Postal code'), + 'postal_code' => __('postal code'), 'signup_by_date' => __('sign up deadline'), - 'street_address' => __('Street address'), + 'street_address' => __('street address'), 'accepted_formats' => __('accepted formats'), 'other_accepted_formats' => __('other accepted formats'), - 'timezone' => __('Time zone'), + 'timezone' => __('time zone'), ]; } From 9a8db06620872265cd29e483d59bae8dc108831e Mon Sep 17 00:00:00 2001 From: Daniel Cho Date: Tue, 28 Nov 2023 17:31:43 -0500 Subject: [PATCH 03/20] fix: update error messages --- app/Http/Requests/UpdateEngagementRequest.php | 2 +- tests/Datasets/UpdateEngagementRequestValidationErrors.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Requests/UpdateEngagementRequest.php b/app/Http/Requests/UpdateEngagementRequest.php index 42551cdad..43bc5e0aa 100644 --- a/app/Http/Requests/UpdateEngagementRequest.php +++ b/app/Http/Requests/UpdateEngagementRequest.php @@ -295,7 +295,7 @@ public function attributes(): array 'street_address' => __('street address'), 'accepted_formats' => __('accepted formats'), 'other_accepted_formats' => __('other accepted formats'), - 'timezone' => __('time zone'), + 'timezone' => __('timezone'), ]; } diff --git a/tests/Datasets/UpdateEngagementRequestValidationErrors.php b/tests/Datasets/UpdateEngagementRequestValidationErrors.php index 44bf07d51..69d7923a1 100644 --- a/tests/Datasets/UpdateEngagementRequestValidationErrors.php +++ b/tests/Datasets/UpdateEngagementRequestValidationErrors.php @@ -574,7 +574,7 @@ ], 'Other accepted formats is not a boolean' => [ ['other_accepted_formats' => 'false'], - fn () => ['other_accepted_formats' => __('validation.boolean', ['attribute' => __('accepted formats')])], + fn () => ['other_accepted_formats' => __('validation.boolean', ['attribute' => __('other accepted formats')])], [ 'format' => EngagementFormat::Interviews->value, 'meetingType' => MeetingType::InPerson->value, From e67e5cc3b74385945451cb887b74635bd9a2c0be Mon Sep 17 00:00:00 2001 From: Daniel Cho Date: Wed, 29 Nov 2023 12:04:00 -0500 Subject: [PATCH 04/20] fix: add attributes method to all requests --- .../Requests/AddNotificationableRequest.php | 8 ++++++ app/Http/Requests/AddTranslationRequest.php | 9 +++++++ app/Http/Requests/BlockRequest.php | 8 ++++++ .../Requests/DestroyIndividualRequest.php | 7 +++++ .../Requests/DestroyOrganizationRequest.php | 7 +++++ app/Http/Requests/DestroyProjectRequest.php | 7 +++++ .../DestroyRegulatedOrganizationRequest.php | 7 +++++ .../Requests/DestroyTranslationRequest.php | 9 +++++++ app/Http/Requests/DestroyUserRequest.php | 7 +++++ app/Http/Requests/MeetingRequest.php | 6 +++++ .../RemoveNotificationableRequest.php | 8 ++++++ .../Requests/SaveIndividualRolesRequest.php | 7 +++++ .../Requests/SaveOrganizationRolesRequest.php | 7 +++++ app/Http/Requests/SaveUserContextRequest.php | 7 +++++ app/Http/Requests/SaveUserDetailsRequest.php | 1 + .../Requests/SaveUserLanguagesRequest.php | 11 ++++++++ app/Http/Requests/StoreDefinedTermRequest.php | 8 ++++++ .../Requests/StoreEngagementFormatRequest.php | 7 +++++ .../StoreEngagementLanguagesRequest.php | 7 +++++ .../StoreEngagementRecruitmentRequest.php | 7 +++++ app/Http/Requests/StoreEngagementRequest.php | 9 +++++++ app/Http/Requests/StoreInvitationRequest.php | 8 ++++++ .../StoreOrganizationLanguagesRequest.php | 7 +++++ .../Requests/StoreOrganizationRequest.php | 7 +++++ .../Requests/StoreOrganizationTypeRequest.php | 7 +++++ .../Requests/StoreProjectContextRequest.php | 8 ++++++ .../Requests/StoreProjectLanguagesRequest.php | 7 +++++ app/Http/Requests/StoreProjectRequest.php | 10 +++++++ app/Http/Requests/StoreQuizResultRequest.php | 7 +++++ ...eRegulatedOrganizationLanguagesRequest.php | 7 +++++ .../StoreRegulatedOrganizationRequest.php | 8 ++++++ .../StoreRegulatedOrganizationTypeRequest.php | 7 +++++ app/Http/Requests/UnblockRequest.php | 8 ++++++ .../Requests/UpdateAccessNeedsRequest.php | 23 ++++++++++++++++ .../Requests/UpdateAreasOfInterestRequest.php | 8 ++++++ ...ationAndConsultationPreferencesRequest.php | 17 ++++++++++++ .../Requests/UpdateDefinedTermRequest.php | 8 ++++++ .../UpdateEngagementLanguagesRequest.php | 7 +++++ app/Http/Requests/UpdateEngagementRequest.php | 11 +++++++- ...dateEngagementSelectionCriteriaRequest.php | 6 +++++ ...ationAndConsultationPreferencesRequest.php | 16 +++++++++++ .../UpdateIndividualConstituenciesRequest.php | 27 +++++++++++++++++++ .../UpdateIndividualExperiencesRequest.php | 2 ++ .../UpdateIndividualInterestsRequest.php | 8 ++++++ app/Http/Requests/UpdateIndividualRequest.php | 8 ++++++ .../UpdateLanguagePreferencesRequest.php | 9 +++++++ app/Http/Requests/UpdateMembershipRequest.php | 7 +++++ .../UpdateNotificationPreferencesRequest.php | 15 +++++++++++ ...pdateOrganizationConstituenciesRequest.php | 27 +++++++++++++++++++ ...eOrganizationContactInformationRequest.php | 19 +++++++------ .../UpdateOrganizationInterestsRequest.php | 8 ++++++ .../Requests/UpdateOrganizationRequest.php | 5 ++++ .../UpdatePaymentInformationRequest.php | 9 +++++++ app/Http/Requests/UpdateProjectRequest.php | 7 +++++ .../Requests/UpdateProjectTeamRequest.php | 8 ++++++ .../UpdateRegulatedOrganizationRequest.php | 11 +++++++- .../UpdateUserIntroductionStatusRequest.php | 7 +++++ ...WebsiteAccessibilityPreferencesRequest.php | 8 ++++++ 58 files changed, 516 insertions(+), 10 deletions(-) diff --git a/app/Http/Requests/AddNotificationableRequest.php b/app/Http/Requests/AddNotificationableRequest.php index 519b8d85a..c569a2a17 100644 --- a/app/Http/Requests/AddNotificationableRequest.php +++ b/app/Http/Requests/AddNotificationableRequest.php @@ -24,4 +24,12 @@ public function rules(): array 'notificationable_id' => 'required|integer|exists:'.$this->input('notificationable_type').',id', ]; } + + public function attributes(): array + { + return [ + 'notificationable_type' => __('notificationable type'), + 'notificationable_id' => __('notificationable id'), + ]; + } } diff --git a/app/Http/Requests/AddTranslationRequest.php b/app/Http/Requests/AddTranslationRequest.php index fcac8ee4f..cb72562bf 100644 --- a/app/Http/Requests/AddTranslationRequest.php +++ b/app/Http/Requests/AddTranslationRequest.php @@ -37,6 +37,15 @@ public function rules(): array ]; } + public function attributes(): array + { + return [ + 'translatable_type' => __('translatable type'), + 'translatable_id' => __('translatable id'), + 'new_language' => __('new language'), + ]; + } + /** * Get the error messages for the defined validation rules. */ diff --git a/app/Http/Requests/BlockRequest.php b/app/Http/Requests/BlockRequest.php index 7a3423083..8cac9178e 100644 --- a/app/Http/Requests/BlockRequest.php +++ b/app/Http/Requests/BlockRequest.php @@ -20,4 +20,12 @@ public function rules(): array 'blockable_id' => 'required|integer|exists:'.$this->input('blockable_type').',id', ]; } + + public function attributes(): array + { + return [ + 'blockable_type' => __('blockable type'), + 'blockable_id' => __('blockable id'), + ]; + } } diff --git a/app/Http/Requests/DestroyIndividualRequest.php b/app/Http/Requests/DestroyIndividualRequest.php index 579dd71e4..e5c5a1e2d 100644 --- a/app/Http/Requests/DestroyIndividualRequest.php +++ b/app/Http/Requests/DestroyIndividualRequest.php @@ -29,6 +29,13 @@ public function rules() ]; } + public function attributes(): array + { + return [ + 'current_password' => __('current password'), + ]; + } + /** * Configure the validator instance. * diff --git a/app/Http/Requests/DestroyOrganizationRequest.php b/app/Http/Requests/DestroyOrganizationRequest.php index ff81fb184..ee8c9ddae 100644 --- a/app/Http/Requests/DestroyOrganizationRequest.php +++ b/app/Http/Requests/DestroyOrganizationRequest.php @@ -29,6 +29,13 @@ public function rules() ]; } + public function attributes(): array + { + return [ + 'current_password' => __('current password'), + ]; + } + /** * Configure the validator instance. * diff --git a/app/Http/Requests/DestroyProjectRequest.php b/app/Http/Requests/DestroyProjectRequest.php index cc6b341bd..acc67effe 100644 --- a/app/Http/Requests/DestroyProjectRequest.php +++ b/app/Http/Requests/DestroyProjectRequest.php @@ -29,6 +29,13 @@ public function rules() ]; } + public function attributes(): array + { + return [ + 'current_password' => __('current password'), + ]; + } + /** * Configure the validator instance. * diff --git a/app/Http/Requests/DestroyRegulatedOrganizationRequest.php b/app/Http/Requests/DestroyRegulatedOrganizationRequest.php index dadd8fce9..4a6a25ecf 100644 --- a/app/Http/Requests/DestroyRegulatedOrganizationRequest.php +++ b/app/Http/Requests/DestroyRegulatedOrganizationRequest.php @@ -29,6 +29,13 @@ public function rules() ]; } + public function attributes(): array + { + return [ + 'current_password' => __('current password'), + ]; + } + /** * Configure the validator instance. * diff --git a/app/Http/Requests/DestroyTranslationRequest.php b/app/Http/Requests/DestroyTranslationRequest.php index 09865532f..751ec389f 100644 --- a/app/Http/Requests/DestroyTranslationRequest.php +++ b/app/Http/Requests/DestroyTranslationRequest.php @@ -37,6 +37,15 @@ public function rules(): array ]; } + public function attributes(): array + { + return [ + 'translatable_type' => __('translatable type'), + 'translatable_id' => __('translatable id'), + 'language' => __('language'), + ]; + } + /** * Get the error messages for the defined validation rules. */ diff --git a/app/Http/Requests/DestroyUserRequest.php b/app/Http/Requests/DestroyUserRequest.php index 4ca8674f5..406c1b43b 100644 --- a/app/Http/Requests/DestroyUserRequest.php +++ b/app/Http/Requests/DestroyUserRequest.php @@ -26,6 +26,13 @@ public function rules(): array ]; } + public function attributes(): array + { + return [ + 'current_password' => __('current password'), + ]; + } + /** * Configure the validator instance. * diff --git a/app/Http/Requests/MeetingRequest.php b/app/Http/Requests/MeetingRequest.php index 95275402a..338823da1 100644 --- a/app/Http/Requests/MeetingRequest.php +++ b/app/Http/Requests/MeetingRequest.php @@ -113,14 +113,20 @@ public function attributes(): array 'start_time' => __('meeting start time'), 'end_time' => __('meeting end time'), 'date' => __('meeting date'), + 'directions' => __('directions'), 'timezone' => __('meeting time zone'), 'locality' => __('city or town'), 'region' => __('province or territory'), 'meeting_url' => __('link to join the meeting'), 'meeting_phone' => __('phone number to join the meeting'), 'meeting_software' => __('meeting software'), + 'alternative_meeting_software' => __('alternative meeting software'), + 'additional_video_information' => __('additional video information'), + 'additional_phone_information' => __('additional phone information'), + 'meeting_types' => __('meeting types'), 'street_address' => __('street address'), 'postal_code' => __('postal code'), + 'unit_suite_floor' => __('Unit, suite, or floor'), ]; } diff --git a/app/Http/Requests/RemoveNotificationableRequest.php b/app/Http/Requests/RemoveNotificationableRequest.php index b045c421d..cb154015c 100644 --- a/app/Http/Requests/RemoveNotificationableRequest.php +++ b/app/Http/Requests/RemoveNotificationableRequest.php @@ -20,6 +20,14 @@ public function rules(): array ]; } + public function attributes(): array + { + return [ + 'notificationable_type' => __('notificationable type'), + 'notificationable_id' => __('notificationable id'), + ]; + } + public function withValidator(Validator $validator) { $validator->sometimes('notificationable_id', 'exists:'.$this->input('notificationable_type').',id', function ($input) { diff --git a/app/Http/Requests/SaveIndividualRolesRequest.php b/app/Http/Requests/SaveIndividualRolesRequest.php index c2d140d54..1f51da442 100644 --- a/app/Http/Requests/SaveIndividualRolesRequest.php +++ b/app/Http/Requests/SaveIndividualRolesRequest.php @@ -34,6 +34,13 @@ public function prepareForValidation() request()->mergeIfMissing($fallbacks); } + public function attributes(): array + { + return [ + 'roles' => __('roles'), + ]; + } + /** * Get the error messages for the defined validation rules. */ diff --git a/app/Http/Requests/SaveOrganizationRolesRequest.php b/app/Http/Requests/SaveOrganizationRolesRequest.php index 0f6372242..a57f7fc9a 100644 --- a/app/Http/Requests/SaveOrganizationRolesRequest.php +++ b/app/Http/Requests/SaveOrganizationRolesRequest.php @@ -21,6 +21,13 @@ public function rules(): array ]; } + public function attributes(): array + { + return [ + 'roles' => __('roles'), + ]; + } + public function prepareForValidation() { $fallbacks = [ diff --git a/app/Http/Requests/SaveUserContextRequest.php b/app/Http/Requests/SaveUserContextRequest.php index e5a7d3a81..22a85284c 100644 --- a/app/Http/Requests/SaveUserContextRequest.php +++ b/app/Http/Requests/SaveUserContextRequest.php @@ -26,6 +26,13 @@ public function rules(): array ]; } + public function attributes(): array + { + return [ + 'context' => __('context'), + ]; + } + public function messages(): array { return [ diff --git a/app/Http/Requests/SaveUserDetailsRequest.php b/app/Http/Requests/SaveUserDetailsRequest.php index 2628992e9..3ef882919 100644 --- a/app/Http/Requests/SaveUserDetailsRequest.php +++ b/app/Http/Requests/SaveUserDetailsRequest.php @@ -39,6 +39,7 @@ public function attributes(): array { return [ 'name' => __('full name'), + 'email' => __('email'), ]; } } diff --git a/app/Http/Requests/SaveUserLanguagesRequest.php b/app/Http/Requests/SaveUserLanguagesRequest.php index 36dc17c26..1df7b0d4f 100644 --- a/app/Http/Requests/SaveUserLanguagesRequest.php +++ b/app/Http/Requests/SaveUserLanguagesRequest.php @@ -30,6 +30,17 @@ public function rules(): array ]; } + public function attributes(): array + { + return [ + 'locale' => __('locale'), + 'invitation' => __('invitation'), + 'context' => __('context'), + 'role' => __('role'), + 'email' => __('email'), + ]; + } + public function authorize(): bool { return true; diff --git a/app/Http/Requests/StoreDefinedTermRequest.php b/app/Http/Requests/StoreDefinedTermRequest.php index fbd92afed..7ba66ef2a 100644 --- a/app/Http/Requests/StoreDefinedTermRequest.php +++ b/app/Http/Requests/StoreDefinedTermRequest.php @@ -28,4 +28,12 @@ public function rules() 'definition.*' => 'nullable|string', ]; } + + public function attributes(): array + { + return [ + 'term' => __('term'), + 'definition' => __('definition'), + ]; + } } diff --git a/app/Http/Requests/StoreEngagementFormatRequest.php b/app/Http/Requests/StoreEngagementFormatRequest.php index be364dd2d..06f407467 100644 --- a/app/Http/Requests/StoreEngagementFormatRequest.php +++ b/app/Http/Requests/StoreEngagementFormatRequest.php @@ -22,4 +22,11 @@ public function rules(): array ], ]; } + + public function attributes(): array + { + return [ + 'format' => __('engagement format'), + ]; + } } diff --git a/app/Http/Requests/StoreEngagementLanguagesRequest.php b/app/Http/Requests/StoreEngagementLanguagesRequest.php index f8cd5c02b..905f0e76d 100644 --- a/app/Http/Requests/StoreEngagementLanguagesRequest.php +++ b/app/Http/Requests/StoreEngagementLanguagesRequest.php @@ -21,4 +21,11 @@ public function rules(): array ], ]; } + + public function attributes(): array + { + return [ + 'languages' => __('languages'), + ]; + } } diff --git a/app/Http/Requests/StoreEngagementRecruitmentRequest.php b/app/Http/Requests/StoreEngagementRecruitmentRequest.php index a72bcdc32..bd1b5d6eb 100644 --- a/app/Http/Requests/StoreEngagementRecruitmentRequest.php +++ b/app/Http/Requests/StoreEngagementRecruitmentRequest.php @@ -22,4 +22,11 @@ public function rules(): array ], ]; } + + public function attributes(): array + { + return [ + 'recruitment' => __('recruitment'), + ]; + } } diff --git a/app/Http/Requests/StoreEngagementRequest.php b/app/Http/Requests/StoreEngagementRequest.php index a3ad4f009..27c7fc746 100644 --- a/app/Http/Requests/StoreEngagementRequest.php +++ b/app/Http/Requests/StoreEngagementRequest.php @@ -25,6 +25,15 @@ public function rules(): array ]; } + public function attributes(): array + { + return [ + 'project_id' => __('project id'), + 'name' => __('name'), + 'who' => __('who'), + ]; + } + public function messages(): array { return [ diff --git a/app/Http/Requests/StoreInvitationRequest.php b/app/Http/Requests/StoreInvitationRequest.php index 564c30fe0..b4bf6b1a8 100644 --- a/app/Http/Requests/StoreInvitationRequest.php +++ b/app/Http/Requests/StoreInvitationRequest.php @@ -35,6 +35,14 @@ public function rules(): array ]; } + public function attributes(): array + { + return [ + 'email' => __('email'), + 'role' => __('role'), + ]; + } + public function messages(): array { return [ diff --git a/app/Http/Requests/StoreOrganizationLanguagesRequest.php b/app/Http/Requests/StoreOrganizationLanguagesRequest.php index 296aba442..91a2f6ff5 100644 --- a/app/Http/Requests/StoreOrganizationLanguagesRequest.php +++ b/app/Http/Requests/StoreOrganizationLanguagesRequest.php @@ -25,4 +25,11 @@ public function rules(): array 'languages' => 'required|array|min:1', ]; } + + public function attributes(): array + { + return [ + 'languages' => __('languages'), + ]; + } } diff --git a/app/Http/Requests/StoreOrganizationRequest.php b/app/Http/Requests/StoreOrganizationRequest.php index 2df6221be..20daf8925 100644 --- a/app/Http/Requests/StoreOrganizationRequest.php +++ b/app/Http/Requests/StoreOrganizationRequest.php @@ -22,6 +22,13 @@ public function rules(): array ]; } + public function attributes(): array + { + return [ + 'type' => __('organization type'), + ]; + } + public function messages(): array { return [ diff --git a/app/Http/Requests/StoreOrganizationTypeRequest.php b/app/Http/Requests/StoreOrganizationTypeRequest.php index 8eb37ec49..a47463cef 100644 --- a/app/Http/Requests/StoreOrganizationTypeRequest.php +++ b/app/Http/Requests/StoreOrganizationTypeRequest.php @@ -28,6 +28,13 @@ public function rules(): array ]; } + public function attributes(): array + { + return [ + 'type' => __('organization type'), + ]; + } + /** * Get the error messages for the defined validation rules. */ diff --git a/app/Http/Requests/StoreProjectContextRequest.php b/app/Http/Requests/StoreProjectContextRequest.php index ced168dab..a1ef347ef 100644 --- a/app/Http/Requests/StoreProjectContextRequest.php +++ b/app/Http/Requests/StoreProjectContextRequest.php @@ -19,6 +19,14 @@ public function rules(): array ]; } + public function attributes(): array + { + return [ + 'context' => __('project context'), + 'ancestor' => __('previous project'), + ]; + } + public function messages(): array { return [ diff --git a/app/Http/Requests/StoreProjectLanguagesRequest.php b/app/Http/Requests/StoreProjectLanguagesRequest.php index ace271ea2..2be0e7ee6 100644 --- a/app/Http/Requests/StoreProjectLanguagesRequest.php +++ b/app/Http/Requests/StoreProjectLanguagesRequest.php @@ -17,4 +17,11 @@ public function rules(): array 'languages' => 'required|array|min:1', ]; } + + public function attributes(): array + { + return [ + 'languages' => __('project languages'), + ]; + } } diff --git a/app/Http/Requests/StoreProjectRequest.php b/app/Http/Requests/StoreProjectRequest.php index 3f973b536..6e243d37a 100644 --- a/app/Http/Requests/StoreProjectRequest.php +++ b/app/Http/Requests/StoreProjectRequest.php @@ -44,6 +44,16 @@ public function rules() ]; } + public function attributes(): array + { + return [ + 'projectable_type' => __('projectable type'), + 'projectable_id' => __('projectable id'), + 'ancestor_id' => __('previous project id'), + 'name' => __('project name'), + ]; + } + /** * Get the error messages for the defined validation rules. * diff --git a/app/Http/Requests/StoreQuizResultRequest.php b/app/Http/Requests/StoreQuizResultRequest.php index d9979ae47..f4e47d0aa 100644 --- a/app/Http/Requests/StoreQuizResultRequest.php +++ b/app/Http/Requests/StoreQuizResultRequest.php @@ -31,6 +31,13 @@ public function rules() return $rules; } + public function attributes(): array + { + return [ + 'questions' => __('questions'), + ]; + } + public function messages() { return [ diff --git a/app/Http/Requests/StoreRegulatedOrganizationLanguagesRequest.php b/app/Http/Requests/StoreRegulatedOrganizationLanguagesRequest.php index 65f690199..d06f16fe6 100644 --- a/app/Http/Requests/StoreRegulatedOrganizationLanguagesRequest.php +++ b/app/Http/Requests/StoreRegulatedOrganizationLanguagesRequest.php @@ -25,4 +25,11 @@ public function rules(): array 'languages' => 'required|array|min:1', ]; } + + public function attributes(): array + { + return [ + 'languages' => __('languages'), + ]; + } } diff --git a/app/Http/Requests/StoreRegulatedOrganizationRequest.php b/app/Http/Requests/StoreRegulatedOrganizationRequest.php index b44bad3e2..ac08aeee4 100644 --- a/app/Http/Requests/StoreRegulatedOrganizationRequest.php +++ b/app/Http/Requests/StoreRegulatedOrganizationRequest.php @@ -20,6 +20,14 @@ public function rules(): array ]; } + public function attributes(): array + { + return [ + 'type' => __('organization type'), + 'name' => __('organization name'), + ]; + } + public function messages(): array { return [ diff --git a/app/Http/Requests/StoreRegulatedOrganizationTypeRequest.php b/app/Http/Requests/StoreRegulatedOrganizationTypeRequest.php index b5a3dee0f..e9160abb7 100644 --- a/app/Http/Requests/StoreRegulatedOrganizationTypeRequest.php +++ b/app/Http/Requests/StoreRegulatedOrganizationTypeRequest.php @@ -26,6 +26,13 @@ public function rules(): array ]; } + public function attributes(): array + { + return [ + 'type' => __('organization type'), + ]; + } + /** * Get the error messages for the defined validation rules. */ diff --git a/app/Http/Requests/UnblockRequest.php b/app/Http/Requests/UnblockRequest.php index a7c212317..aaf23ec9b 100644 --- a/app/Http/Requests/UnblockRequest.php +++ b/app/Http/Requests/UnblockRequest.php @@ -18,4 +18,12 @@ public function rules(): array 'blockable_id' => 'required|integer|exists:'.$this->input('blockable_type').',id', ]; } + + public function attributes(): array + { + return [ + 'blockable_type' => __('blockable type'), + 'blockable_id' => __('blockable id'), + ]; + } } diff --git a/app/Http/Requests/UpdateAccessNeedsRequest.php b/app/Http/Requests/UpdateAccessNeedsRequest.php index a239cc553..ed0893222 100644 --- a/app/Http/Requests/UpdateAccessNeedsRequest.php +++ b/app/Http/Requests/UpdateAccessNeedsRequest.php @@ -160,6 +160,29 @@ public function withValidator(Validator $validator) } } + public function attributes(): array + { + return [ + 'general_access_needs' => __('General access needs'), + 'other' => __('other'), + 'other_access_need' => __('other access need'), + 'meeting_access_needs' => __('meeting access needs'), + 'signed_language_for_interpretation' => __('Signed language for interpretation'), + 'spoken_language_for_interpretation' => __('Spoken language interpretation'), + 'in_person_access_needs' => __('in person access needs'), + 'document_access_needs' => __('document access needs'), + 'signed_language_for_translation' => __('signed language for translation'), + 'written_language_for_translation' => __('written language for translation'), + 'street_address' => __('Street address'), + 'unit_apartment_suite' => __('Unit, apartment, or suite'), + 'locality' => __('city or town'), + 'region' => __('province or territory'), + 'postal_code' => __('Postal code'), + 'additional_needs_or_concerns' => __('Additional needs or concerns'), + 'return_to_engagement' => __('return to engagement'), + ]; + } + public function messages(): array { return [ diff --git a/app/Http/Requests/UpdateAreasOfInterestRequest.php b/app/Http/Requests/UpdateAreasOfInterestRequest.php index 4fd5fee0d..958e58e1b 100644 --- a/app/Http/Requests/UpdateAreasOfInterestRequest.php +++ b/app/Http/Requests/UpdateAreasOfInterestRequest.php @@ -21,6 +21,14 @@ public function rules(): array ]; } + public function attributes(): array + { + return [ + 'sectors' => __('Sectors'), + 'impacts' => __('areas of impact'), + ]; + } + public function prepareForValidation() { $fallbacks = [ diff --git a/app/Http/Requests/UpdateCommunicationAndConsultationPreferencesRequest.php b/app/Http/Requests/UpdateCommunicationAndConsultationPreferencesRequest.php index 7c27f5bf0..0b7421f2d 100644 --- a/app/Http/Requests/UpdateCommunicationAndConsultationPreferencesRequest.php +++ b/app/Http/Requests/UpdateCommunicationAndConsultationPreferencesRequest.php @@ -53,6 +53,23 @@ public function rules(): array ]; } + public function attributes(): array + { + return [ + 'preferred_contact_person' => __('preferred contact person'), + 'email' => __('email'), + 'phone' => __('phone'), + 'vrs' => __('vrs'), + 'support_person_name' => __('My support person’s name'), + 'support_person_email' => __('My support person’s email'), + 'support_person_phone' => __('My support person’s phone number'), + 'support_person_vrs' => __('My support person requires Video Relay Service (VRS) for phone calls'), + 'preferred_contact_method' => __('preferred contact method'), + 'consulting_methods' => __('consulting methods'), + 'meeting_types' => __('meeting types'), + ]; + } + public function withValidator(Validator $validator) { $this->conditionallyRequireContactMethods($validator); diff --git a/app/Http/Requests/UpdateDefinedTermRequest.php b/app/Http/Requests/UpdateDefinedTermRequest.php index 53a598c36..676806c6a 100644 --- a/app/Http/Requests/UpdateDefinedTermRequest.php +++ b/app/Http/Requests/UpdateDefinedTermRequest.php @@ -28,4 +28,12 @@ public function rules() 'definition.*' => 'nullable|string', ]; } + + public function attributes(): array + { + return [ + 'term' => __('term'), + 'definition' => __('definition'), + ]; + } } diff --git a/app/Http/Requests/UpdateEngagementLanguagesRequest.php b/app/Http/Requests/UpdateEngagementLanguagesRequest.php index d0fc63d89..24b1e6238 100644 --- a/app/Http/Requests/UpdateEngagementLanguagesRequest.php +++ b/app/Http/Requests/UpdateEngagementLanguagesRequest.php @@ -21,4 +21,11 @@ public function rules(): array ], ]; } + + public function attributes(): array + { + return [ + 'languages' => __('languages'), + ]; + } } diff --git a/app/Http/Requests/UpdateEngagementRequest.php b/app/Http/Requests/UpdateEngagementRequest.php index 43bc5e0aa..0f98eb907 100644 --- a/app/Http/Requests/UpdateEngagementRequest.php +++ b/app/Http/Requests/UpdateEngagementRequest.php @@ -276,6 +276,7 @@ public function attributes(): array 'window_end_date' => __('end date'), 'window_start_time' => __('start time'), 'window_end_time' => __('end time'), + 'window_flexibility' => __('window flexibility'), 'weekday_availabilities.monday' => __('availability for Monday'), 'weekday_availabilities.tuesday' => __('availability for Tuesday'), 'weekday_availabilities.wednesday' => __('availability for Wednesday'), @@ -288,6 +289,7 @@ public function attributes(): array 'meeting_url' => __('link to join the meeting'), 'meeting_phone' => __('phone number to join the meeting'), 'meeting_software' => __('meeting software'), + 'meeting_types' => __('meeting types'), 'materials_by_date' => __('date for materials to be sent by'), 'complete_by_date' => __('due date'), 'postal_code' => __('postal code'), @@ -296,7 +298,14 @@ public function attributes(): array 'accepted_formats' => __('accepted formats'), 'other_accepted_formats' => __('other accepted formats'), 'timezone' => __('timezone'), - + 'unit_suite_floor' => __('Unit, suite, or floor'), + 'directions' => __('directions'), + 'alternative_meeting_software' => __('alternative meeting software'), + 'additional_video_information' => __('additional video information'), + 'additional_phone_information' => __('additional phone information'), + 'document_languages' => __('document languages'), + 'open_to_other_formats' => __('open to other formats'), + 'paid' => __('paid'), ]; } diff --git a/app/Http/Requests/UpdateEngagementSelectionCriteriaRequest.php b/app/Http/Requests/UpdateEngagementSelectionCriteriaRequest.php index 2f12bfc8a..9e1e77ba2 100644 --- a/app/Http/Requests/UpdateEngagementSelectionCriteriaRequest.php +++ b/app/Http/Requests/UpdateEngagementSelectionCriteriaRequest.php @@ -76,6 +76,12 @@ public function rules(): array public function attributes(): array { return [ + 'location_type' => __('location type'), + 'regions' => __('province or territory'), + 'locations' => __('Location'), + 'cross_disability_and_deaf' => __('Cross disability (includes people with disabilities, Deaf people, and supporters)'), + 'intersectional' => __('intersectional'), + 'other_identity_type' => __('other identity type'), 'age_brackets' => __('age group'), 'age_brackets.*' => __('age group'), 'area_types' => __('area type'), diff --git a/app/Http/Requests/UpdateIndividualCommunicationAndConsultationPreferencesRequest.php b/app/Http/Requests/UpdateIndividualCommunicationAndConsultationPreferencesRequest.php index b5874d88e..5987e3ee0 100644 --- a/app/Http/Requests/UpdateIndividualCommunicationAndConsultationPreferencesRequest.php +++ b/app/Http/Requests/UpdateIndividualCommunicationAndConsultationPreferencesRequest.php @@ -45,6 +45,22 @@ public function rules(): array ]; } + public function attributes(): array + { + return [ + 'preferred_contact_person' => __('preferred contact person'), + 'email' => __('email'), + 'phone' => __('phone'), + 'vrs' => __('vrs'), + 'support_person_name' => __('My support person’s name'), + 'support_person_email' => __('My support person’s email'), + 'support_person_phone' => __('My support person’s phone number'), + 'support_person_vrs' => __('My support person requires Video Relay Service (VRS) for phone calls'), + 'preferred_contact_method' => __('preferred contact method'), + 'meeting_types' => __('meeting types'), + ]; + } + public function prepareForValidation() { $fallbacks = [ diff --git a/app/Http/Requests/UpdateIndividualConstituenciesRequest.php b/app/Http/Requests/UpdateIndividualConstituenciesRequest.php index 6d3f0d7a8..cb61af0ef 100644 --- a/app/Http/Requests/UpdateIndividualConstituenciesRequest.php +++ b/app/Http/Requests/UpdateIndividualConstituenciesRequest.php @@ -95,6 +95,33 @@ public function rules(): array ]; } + public function attributes(): array + { + return [ + 'disability_and_deaf' => __('Disability and/or Deaf identity'), + 'lived_experience_connections' => __('lived experience connections'), + 'base_disability_type' => __('disability type'), + 'disability_and_deaf_connections' => __('disability and deaf connections'), + 'has_other_disability_connection' => __('has other disability connection'), + 'other_disability_connection' => __('other disability connection'), + 'area_type_connections' => __('area type connections'), + 'has_indigenous_connections' => __('has indigenous connections'), + 'indigenous_connections' => __('indigenous connections'), + 'refugees_and_immigrants' => __('Refugees and/or immigrants'), + 'has_gender_and_sexuality_connections' => __('has gender and sexuality connections'), + 'gender_and_sexuality_connections' => __('gender and sexuality connections'), + 'nb_gnc_fluid_identity' => __('Non-binary/Gender non-conforming/Gender fluid identity'), + 'has_age_bracket_connections' => __('has age bracket connections'), + 'age_bracket_connections' => __('age bracket connections'), + 'has_ethnoracial_identity_connections' => __('has ethnoracial identity connections'), + 'ethnoracial_identity_connections' => __('ethnoracial identity connections'), + 'has_other_ethnoracial_identity_connection' => __('has other ethnoracial identity connection'), + 'other_ethnoracial_identity_connection' => __('other ethnoracial identity connection'), + 'language_connections' => __('language connections'), + 'connection_lived_experience' => __('connection lived experience'), + ]; + } + public function prepareForValidation() { $fallbacks = [ diff --git a/app/Http/Requests/UpdateIndividualExperiencesRequest.php b/app/Http/Requests/UpdateIndividualExperiencesRequest.php index 4e8c373ab..ad27b9d5a 100644 --- a/app/Http/Requests/UpdateIndividualExperiencesRequest.php +++ b/app/Http/Requests/UpdateIndividualExperiencesRequest.php @@ -33,6 +33,8 @@ public function rules(): array public function attributes(): array { return [ + 'lived_experience' => __('Lived experience'), + 'skills_and_strengths' => __('Skills and strengths'), 'relevant_experiences.*.title' => __('Title of Role'), 'relevant_experiences.*.organization' => __('Name of Organization'), 'relevant_experiences.*.start_year' => __('Start Year'), diff --git a/app/Http/Requests/UpdateIndividualInterestsRequest.php b/app/Http/Requests/UpdateIndividualInterestsRequest.php index 201439527..b82cdba4c 100644 --- a/app/Http/Requests/UpdateIndividualInterestsRequest.php +++ b/app/Http/Requests/UpdateIndividualInterestsRequest.php @@ -40,6 +40,14 @@ public function rules() ]; } + public function attributes(): array + { + return [ + 'sectors' => __('Sectors'), + 'impacts' => __('areas of impact'), + ]; + } + /** * Get the error messages for the defined validation rules. * diff --git a/app/Http/Requests/UpdateIndividualRequest.php b/app/Http/Requests/UpdateIndividualRequest.php index 4d52db458..b31fa13cf 100644 --- a/app/Http/Requests/UpdateIndividualRequest.php +++ b/app/Http/Requests/UpdateIndividualRequest.php @@ -67,7 +67,15 @@ public function prepareForValidation() public function attributes(): array { return [ + 'name' => __('full name'), + 'locality' => __('city or town'), 'region' => __('province or territory'), + 'pronouns' => __('pronouns'), + 'bio' => __('bio'), + 'working_languages' => __('Working languages'), + 'consulting_services' => __('Consulting services'), + 'social_links' => __('Social media links'), + 'website_link' => __('Website link'), ]; } diff --git a/app/Http/Requests/UpdateLanguagePreferencesRequest.php b/app/Http/Requests/UpdateLanguagePreferencesRequest.php index 6976f57fd..4b1cf9d5f 100644 --- a/app/Http/Requests/UpdateLanguagePreferencesRequest.php +++ b/app/Http/Requests/UpdateLanguagePreferencesRequest.php @@ -36,6 +36,15 @@ public function rules(): array ]; } + public function attributes(): array + { + return [ + 'locale' => __('locale'), + 'first_language' => __('first language'), + 'working_languages' => __('Working languages'), + ]; + } + public function messages(): array { return [ diff --git a/app/Http/Requests/UpdateMembershipRequest.php b/app/Http/Requests/UpdateMembershipRequest.php index b9e3ebd3c..e223c42bb 100644 --- a/app/Http/Requests/UpdateMembershipRequest.php +++ b/app/Http/Requests/UpdateMembershipRequest.php @@ -34,6 +34,13 @@ public function rules(): array ]; } + public function attributes(): array + { + return [ + 'role' => __('role'), + ]; + } + /** * Configure the validator instance. * diff --git a/app/Http/Requests/UpdateNotificationPreferencesRequest.php b/app/Http/Requests/UpdateNotificationPreferencesRequest.php index 4350d5249..2a8d87de3 100644 --- a/app/Http/Requests/UpdateNotificationPreferencesRequest.php +++ b/app/Http/Requests/UpdateNotificationPreferencesRequest.php @@ -84,6 +84,21 @@ public function rules(): array ]; } + public function attributes(): array + { + return [ + 'preferred_notification_method' => __('Preferred notification method'), + 'notification_settings.consultants.channels' => __('notification settings consultants'), + 'notification_settings.connectors.channels' => __('notification settings connectors'), + 'notification_settings.reports.channels' => __('notification settings reports'), + 'notification_settings.projects.channels' => __('notification settings projects'), + 'notification_settings.projects.creators' => __('notification settings projects creators'), + 'notification_settings.projects.types' => __('notification settings projects types'), + 'notification_settings.projects.engagements' => __('notification settings projects engagements'), + 'notification_settings.updates.channels' => __('notification settings updates'), + ]; + } + public function prepareForValidation() { $fallbacks = [ diff --git a/app/Http/Requests/UpdateOrganizationConstituenciesRequest.php b/app/Http/Requests/UpdateOrganizationConstituenciesRequest.php index 81ff5f735..3bdba42b0 100644 --- a/app/Http/Requests/UpdateOrganizationConstituenciesRequest.php +++ b/app/Http/Requests/UpdateOrganizationConstituenciesRequest.php @@ -92,6 +92,33 @@ public function rules(): array ]; } + public function attributes(): array + { + return [ + 'disability_and_deaf' => __('Disability and/or Deaf identity'), + 'lived_experience_constituencies' => __('lived experience constituencies'), + 'base_disability_type' => __('disability type'), + 'disability_and_deaf_constituencies' => __('disability and deaf constituencies'), + 'has_other_disability_constituency' => __('has other disability constituency'), + 'other_disability_constituency' => __('other disability constituency'), + 'area_type_constituencies' => __('area type constituencies'), + 'has_indigenous_constituencies' => __('has indigenous constituencies'), + 'indigenous_constituencies' => __('indigenous constituencies'), + 'refugees_and_immigrants' => __('Refugees and/or immigrants'), + 'has_gender_and_sexuality_constituencies' => __('has gender and sexuality constituencies'), + 'gender_and_sexuality_constituencies' => __('gender and sexuality constituencies'), + 'nb_gnc_fluid_identity' => __('Non-binary/Gender non-conforming/Gender fluid identity'), + 'has_age_bracket_constituencies' => __('has age bracket constituencies'), + 'age_bracket_constituencies' => __('age bracket constituencies'), + 'has_ethnoracial_identity_constituencies' => __('has ethnoracial identity constituencies'), + 'ethnoracial_identity_constituencies' => __('ethnoracial identity constituencies'), + 'has_other_ethnoracial_identity_constituency' => __('has other ethnoracial identity constituency'), + 'other_ethnoracial_identity_constituency' => __('other ethnoracial identity constituency'), + 'language_constituencies' => __('language constituencies'), + 'staff_lived_experience' => __('Staff lived experience'), + ]; + } + public function prepareForValidation() { $fallbacks = [ diff --git a/app/Http/Requests/UpdateOrganizationContactInformationRequest.php b/app/Http/Requests/UpdateOrganizationContactInformationRequest.php index 081085e14..2e212068d 100644 --- a/app/Http/Requests/UpdateOrganizationContactInformationRequest.php +++ b/app/Http/Requests/UpdateOrganizationContactInformationRequest.php @@ -22,6 +22,17 @@ public function rules(): array ]; } + public function attributes(): array + { + return [ + 'contact_person_name' => __('Contact person'), + 'contact_person_email' => __('Contact person’s email'), + 'contact_person_phone' => __('Contact person’s phone number'), + 'contact_person_vrs' => __('Contact person’s vrs'), + 'preferred_contact_method' => __('preferred contact method'), + ]; + } + public function withValidator($validator) { $validator->after(function ($validator) { @@ -46,12 +57,4 @@ public function prepareForValidation() // Prepare old input in case of validation failure request()->mergeIfMissing($fallbacks); } - - public function attributes(): array - { - return [ - 'contact_person_email' => 'email address', - 'contact_person_phone' => 'phone number', - ]; - } } diff --git a/app/Http/Requests/UpdateOrganizationInterestsRequest.php b/app/Http/Requests/UpdateOrganizationInterestsRequest.php index 52ce48aaa..4b5ca20f2 100644 --- a/app/Http/Requests/UpdateOrganizationInterestsRequest.php +++ b/app/Http/Requests/UpdateOrganizationInterestsRequest.php @@ -20,4 +20,12 @@ public function rules(): array 'sectors.*' => 'exists:sectors,id', ]; } + + public function attributes(): array + { + return [ + 'impacts' => __('areas of impact'), + 'sectors' => __('Sectors'), + ]; + } } diff --git a/app/Http/Requests/UpdateOrganizationRequest.php b/app/Http/Requests/UpdateOrganizationRequest.php index e0c00cb21..a56f6a7bb 100644 --- a/app/Http/Requests/UpdateOrganizationRequest.php +++ b/app/Http/Requests/UpdateOrganizationRequest.php @@ -82,6 +82,11 @@ public function attributes(): array 'about.en' => __('"About your organization" (English)'), 'locality' => __('city or town'), 'region' => __('province or territory'), + 'service_areas' => __('Service areas'), + 'working_languages' => __('Working languages'), + 'consulting_services' => __('Consulting services'), + 'social_links' => __('Social media links'), + 'website_link' => __('Website link'), ]; } diff --git a/app/Http/Requests/UpdatePaymentInformationRequest.php b/app/Http/Requests/UpdatePaymentInformationRequest.php index 971c3b47c..96606333c 100644 --- a/app/Http/Requests/UpdatePaymentInformationRequest.php +++ b/app/Http/Requests/UpdatePaymentInformationRequest.php @@ -21,6 +21,15 @@ public function rules(): array ]; } + public function attributes(): array + { + return [ + 'payment_types' => __('Payment type'), + 'other' => __('Other'), + 'other_payment_type' => __('other payment type'), + ]; + } + public function prepareForValidation() { $fallbacks = [ diff --git a/app/Http/Requests/UpdateProjectRequest.php b/app/Http/Requests/UpdateProjectRequest.php index 0c5663e8a..9e2ba3210 100644 --- a/app/Http/Requests/UpdateProjectRequest.php +++ b/app/Http/Requests/UpdateProjectRequest.php @@ -59,10 +59,17 @@ public function rules(): array public function attributes(): array { return [ + 'name' => __('Project name'), + 'goals' => __('Project goals'), + 'scope' => __('Project scope'), 'regions' => __('geographic areas'), 'impacts' => __('areas of impact'), + 'out_of_scope' => __('out of scope'), 'start_date' => __('start date'), 'end_date' => __('end date'), + 'outcome_analysis' => __('Outcomes and reports'), + 'outcomes' => __('Project outcome'), + 'public_outcomes' => __('public outcomes'), ]; } diff --git a/app/Http/Requests/UpdateProjectTeamRequest.php b/app/Http/Requests/UpdateProjectTeamRequest.php index 2ddcef9b3..f0d60a675 100644 --- a/app/Http/Requests/UpdateProjectTeamRequest.php +++ b/app/Http/Requests/UpdateProjectTeamRequest.php @@ -36,10 +36,18 @@ public function rules(): array public function attributes(): array { return [ + 'team_size' => __('team size'), + 'team_has_disability_or_deaf_lived_experience' => __('Our team has people with lived and living experiences of disability or being Deaf.'), 'team_trainings.*.name' => __('training name'), 'team_trainings.*.date' => __('training date'), 'team_trainings.*.trainer_name' => __('training organization or trainer name'), 'team_trainings.*.trainer_url' => __('training organization or trainer website address'), + 'contact_person_name' => __('Contact person'), + 'contact_person_email' => __('Contact person’s email'), + 'contact_person_phone' => __('Contact person’s phone number'), + 'contact_person_vrs' => __('Contact person’s vrs'), + 'preferred_contact_method' => __('preferred contact method'), + 'contact_person_response_time' => __('Approximate response time'), ]; } diff --git a/app/Http/Requests/UpdateRegulatedOrganizationRequest.php b/app/Http/Requests/UpdateRegulatedOrganizationRequest.php index d897551d4..0e4cb4ea2 100644 --- a/app/Http/Requests/UpdateRegulatedOrganizationRequest.php +++ b/app/Http/Requests/UpdateRegulatedOrganizationRequest.php @@ -117,15 +117,24 @@ public function withValidator($validator) public function attributes(): array { return [ + 'name' => __('organization name'), 'locality' => __('city or town'), 'region' => __('province or territory'), + 'service_areas' => __('Service areas'), + 'sectors' => __('Sectors'), 'contact_person_email' => __('email address'), 'contact_person_phone' => __('phone number'), 'about.fr' => __('"About your organization" (French)'), 'about.en' => __('"About your organization" (English)'), 'accessibility_and_inclusion_links.*.title' => __('accessibility and inclusion link title'), 'accessibility_and_inclusion_links.*.url' => __('accessibility and inclusion link'), - 'social_links.*.active_url' => __(''), + 'social_links' => __('Social media links'), + 'website_link' => __('Website link'), + 'contact_person_name' => __('Contact person'), + 'contact_person_email' => __('Contact person’s email'), + 'contact_person_phone' => __('Contact person’s phone number'), + 'contact_person_vrs' => __('Contact person’s vrs'), + 'preferred_contact_method' => __('preferred contact method'), ]; } diff --git a/app/Http/Requests/UpdateUserIntroductionStatusRequest.php b/app/Http/Requests/UpdateUserIntroductionStatusRequest.php index 3f5892518..98179172d 100644 --- a/app/Http/Requests/UpdateUserIntroductionStatusRequest.php +++ b/app/Http/Requests/UpdateUserIntroductionStatusRequest.php @@ -27,4 +27,11 @@ public function rules() 'finished_introduction' => 'nullable|boolean', ]; } + + public function attributes(): array + { + return [ + 'finished_introduction' => __('finished introduction'), + ]; + } } diff --git a/app/Http/Requests/UpdateWebsiteAccessibilityPreferencesRequest.php b/app/Http/Requests/UpdateWebsiteAccessibilityPreferencesRequest.php index 22d1207be..0fe56360e 100644 --- a/app/Http/Requests/UpdateWebsiteAccessibilityPreferencesRequest.php +++ b/app/Http/Requests/UpdateWebsiteAccessibilityPreferencesRequest.php @@ -20,4 +20,12 @@ public function rules(): array 'text_to_speech' => 'required|boolean', ]; } + + public function attributes(): array + { + return [ + 'theme' => __('Theme'), + 'text_to_speech' => __('Text to speech'), + ]; + } } From 8d023c500e7e9e1388ff742eb05b6ddc470d4b32 Mon Sep 17 00:00:00 2001 From: Daniel Cho Date: Wed, 29 Nov 2023 12:06:54 -0500 Subject: [PATCH 05/20] fix: analyze issues --- app/Http/Requests/UpdateRegulatedOrganizationRequest.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Http/Requests/UpdateRegulatedOrganizationRequest.php b/app/Http/Requests/UpdateRegulatedOrganizationRequest.php index 0e4cb4ea2..fb5815933 100644 --- a/app/Http/Requests/UpdateRegulatedOrganizationRequest.php +++ b/app/Http/Requests/UpdateRegulatedOrganizationRequest.php @@ -122,8 +122,6 @@ public function attributes(): array 'region' => __('province or territory'), 'service_areas' => __('Service areas'), 'sectors' => __('Sectors'), - 'contact_person_email' => __('email address'), - 'contact_person_phone' => __('phone number'), 'about.fr' => __('"About your organization" (French)'), 'about.en' => __('"About your organization" (English)'), 'accessibility_and_inclusion_links.*.title' => __('accessibility and inclusion link title'), From 501dc17f2bf82ab906c7f5957c45c7cffd8efac2 Mon Sep 17 00:00:00 2001 From: Daniel Cho Date: Wed, 29 Nov 2023 13:55:01 -0500 Subject: [PATCH 06/20] fix: update tests --- app/Http/Requests/MeetingRequest.php | 4 +- .../Requests/SaveIndividualRolesRequest.php | 2 +- app/Http/Requests/StoreEngagementRequest.php | 2 +- app/Http/Requests/UpdateEngagementRequest.php | 4 +- .../MeetingRequestValidationErrors.php | 24 +++++------ ...pdateEngagementRequestValidationErrors.php | 42 +++++++++---------- ...lectionCriteriaRequestValidationErrors.php | 8 ++-- ...pdateIndividualRequestValidationErrors.php | 12 +++--- 8 files changed, 49 insertions(+), 49 deletions(-) diff --git a/app/Http/Requests/MeetingRequest.php b/app/Http/Requests/MeetingRequest.php index 338823da1..f811117c9 100644 --- a/app/Http/Requests/MeetingRequest.php +++ b/app/Http/Requests/MeetingRequest.php @@ -124,8 +124,8 @@ public function attributes(): array 'additional_video_information' => __('additional video information'), 'additional_phone_information' => __('additional phone information'), 'meeting_types' => __('meeting types'), - 'street_address' => __('street address'), - 'postal_code' => __('postal code'), + 'street_address' => __('Street address'), + 'postal_code' => __('Postal code'), 'unit_suite_floor' => __('Unit, suite, or floor'), ]; } diff --git a/app/Http/Requests/SaveIndividualRolesRequest.php b/app/Http/Requests/SaveIndividualRolesRequest.php index 1f51da442..a02cc09d1 100644 --- a/app/Http/Requests/SaveIndividualRolesRequest.php +++ b/app/Http/Requests/SaveIndividualRolesRequest.php @@ -37,7 +37,7 @@ public function prepareForValidation() public function attributes(): array { return [ - 'roles' => __('roles'), + 'roles' => __('You must select what you would like to do on the website.'), ]; } diff --git a/app/Http/Requests/StoreEngagementRequest.php b/app/Http/Requests/StoreEngagementRequest.php index 27c7fc746..a42186b74 100644 --- a/app/Http/Requests/StoreEngagementRequest.php +++ b/app/Http/Requests/StoreEngagementRequest.php @@ -29,7 +29,7 @@ public function attributes(): array { return [ 'project_id' => __('project id'), - 'name' => __('name'), + 'name' => __('engagement name'), 'who' => __('who'), ]; } diff --git a/app/Http/Requests/UpdateEngagementRequest.php b/app/Http/Requests/UpdateEngagementRequest.php index 0f98eb907..123960bb2 100644 --- a/app/Http/Requests/UpdateEngagementRequest.php +++ b/app/Http/Requests/UpdateEngagementRequest.php @@ -292,9 +292,9 @@ public function attributes(): array 'meeting_types' => __('meeting types'), 'materials_by_date' => __('date for materials to be sent by'), 'complete_by_date' => __('due date'), - 'postal_code' => __('postal code'), + 'postal_code' => __('Postal code'), 'signup_by_date' => __('sign up deadline'), - 'street_address' => __('street address'), + 'street_address' => __('Street address'), 'accepted_formats' => __('accepted formats'), 'other_accepted_formats' => __('other accepted formats'), 'timezone' => __('timezone'), diff --git a/tests/Datasets/MeetingRequestValidationErrors.php b/tests/Datasets/MeetingRequestValidationErrors.php index 7c83c518e..df1211e01 100644 --- a/tests/Datasets/MeetingRequestValidationErrors.php +++ b/tests/Datasets/MeetingRequestValidationErrors.php @@ -77,7 +77,7 @@ ], 'Meeting types is not an array' => [ ['meeting_types' => MeetingType::InPerson->value], - fn () => ['meeting_types' => __('validation.array', ['attribute' => 'meeting types'])], + fn () => ['meeting_types' => __('validation.array', ['attribute' => __('meeting types')])], ], 'Meeting type is invalid' => [ ['meeting_types' => ['new_meeting_type']], @@ -85,7 +85,7 @@ ], 'Street address missing' => [ ['street_address' => null], - fn () => ['street_address' => __('You must enter a :attribute for the meeting location.', ['attribute' => 'street address'])], + fn () => ['street_address' => __('You must enter a :attribute for the meeting location.', ['attribute' => __('Street address')])], [ 'meetingType' => MeetingType::InPerson->value, 'without' => ['street_address'], @@ -93,12 +93,12 @@ ], 'Street address is not a string' => [ ['street_address' => 1234], - fn () => ['street_address' => __('validation.string', ['attribute' => 'street address'])], + fn () => ['street_address' => __('validation.string', ['attribute' => __('Street address')])], ['meetingType' => MeetingType::InPerson->value], ], 'Unit/Suite/Floor is not a string' => [ ['unit_suite_floor' => 1234], - fn () => ['unit_suite_floor' => __('validation.string', ['attribute' => 'unit suite floor'])], + fn () => ['unit_suite_floor' => __('validation.string', ['attribute' => __('Unit, suite, or floor')])], ['meetingType' => MeetingType::InPerson->value], ], 'Locality missing' => [ @@ -129,7 +129,7 @@ ], 'Postal code missing' => [ ['postal_code' => null], - fn () => ['postal_code' => __('You must enter a :attribute for the meeting location.', ['attribute' => 'postal code'])], + fn () => ['postal_code' => __('You must enter a :attribute for the meeting location.', ['attribute' => __('Postal code')])], [ 'meetingType' => MeetingType::InPerson->value, 'without' => ['postal_code'], @@ -137,17 +137,17 @@ ], 'Postal code is not a string' => [ ['postal_code' => 'XX'], - fn () => ['postal_code' => __('validation.postal_code', ['attribute' => 'postal code'])], + fn () => ['postal_code' => __('validation.postal_code', ['attribute' => __('Postal code')])], ['meetingType' => MeetingType::InPerson->value], ], 'Directions is not an array' => [ ['directions' => 'Take first elevator to the second floor.'], - fn () => ['directions' => __('validation.array', ['attribute' => 'directions'])], + fn () => ['directions' => __('validation.array', ['attribute' => __('directions')])], ['meetingType' => MeetingType::InPerson->value], ], 'Meeting software missing' => [ ['meeting_software' => null], - fn () => ['meeting_software' => __('You must indicate the :attribute.', ['attribute' => 'meeting software'])], + fn () => ['meeting_software' => __('You must indicate the :attribute.', ['attribute' => __('meeting software')])], [ 'meetingType' => MeetingType::WebConference->value, 'without' => ['meeting_software'], @@ -155,12 +155,12 @@ ], 'Meeting software is not a string' => [ ['meeting_software' => 1234], - fn () => ['meeting_software' => __('validation.string', ['attribute' => 'meeting software'])], + fn () => ['meeting_software' => __('validation.string', ['attribute' => __('meeting software')])], ['meetingType' => MeetingType::WebConference->value], ], 'Alternative meeting software is not a boolean' => [ ['alternative_meeting_software' => 'false'], - fn () => ['alternative_meeting_software' => __('validation.boolean', ['attribute' => 'alternative meeting software'])], + fn () => ['alternative_meeting_software' => __('validation.boolean', ['attribute' => __('alternative meeting software')])], ['meetingType' => MeetingType::WebConference->value], ], 'Meeting url missing' => [ @@ -178,7 +178,7 @@ ], 'Additional video information is not an array' => [ ['additional_video_information' => 'Wait for host to accept you to the room.'], - fn () => ['additional_video_information' => __('validation.array', ['attribute' => 'additional video information'])], + fn () => ['additional_video_information' => __('validation.array', ['attribute' => __('additional video information')])], ['meetingType' => MeetingType::WebConference->value], ], 'Meeting phone missing' => [ @@ -196,7 +196,7 @@ ], 'Additional phone information is not an array' => [ ['additional_phone_information' => 'Press option 1.'], - fn () => ['additional_phone_information' => __('validation.array', ['attribute' => 'additional phone information'])], + fn () => ['additional_phone_information' => __('validation.array', ['attribute' => __('additional phone information')])], ['meetingType' => MeetingType::Phone->value], ], ]; diff --git a/tests/Datasets/UpdateEngagementRequestValidationErrors.php b/tests/Datasets/UpdateEngagementRequestValidationErrors.php index 69d7923a1..c2f17ce1e 100644 --- a/tests/Datasets/UpdateEngagementRequestValidationErrors.php +++ b/tests/Datasets/UpdateEngagementRequestValidationErrors.php @@ -139,7 +139,7 @@ ], 'Timezone is missing' => [ ['timezone' => null], - fn () => ['timezone' => __('You must enter a :attribute', ['attribute' => 'timezone'])], + fn () => ['timezone' => __('You must enter a :attribute', ['attribute' => __('timezone')])], [ 'format' => EngagementFormat::Interviews->value, 'meetingType' => MeetingType::InPerson->value, @@ -147,7 +147,7 @@ ], 'Timezone is invalid' => [ ['timezone' => 'my timezone'], - fn () => ['timezone' => __('You must enter a :attribute', ['attribute' => 'timezone'])], + fn () => ['timezone' => __('You must enter a :attribute', ['attribute' => __('timezone')])], [ 'format' => EngagementFormat::Interviews->value, 'meetingType' => MeetingType::InPerson->value, @@ -155,7 +155,7 @@ ], 'Window flexibility is not a boolean value' => [ ['window_flexibility' => ['false']], - fn () => ['window_flexibility' => __('validation.boolean', ['attribute' => 'window flexibility'])], + fn () => ['window_flexibility' => __('validation.boolean', ['attribute' => __('window flexibility')])], [ 'format' => EngagementFormat::Interviews->value, 'meetingType' => MeetingType::InPerson->value, @@ -164,7 +164,7 @@ 'Weekday availabilities is not an array' => [ fn () => ['weekday_availabilities' => Availability::Available->value], fn () => [ - 'weekday_availabilities' => __('validation.array', ['attribute' => 'weekday availabilities']), + 'weekday_availabilities' => __('validation.array', ['attribute' => __('weekday availabilities')]), 'weekday_availabilities.monday' => __('validation.required', ['attribute' => __('availability for Monday')]), 'weekday_availabilities.tuesday' => __('validation.required', ['attribute' => __('availability for Tuesday')]), 'weekday_availabilities.wednesday' => __('validation.required', ['attribute' => __('availability for Wednesday')]), @@ -204,14 +204,14 @@ ], 'Meeting types is missing' => [ ['meeting_types' => null], - fn () => ['meeting_types' => __('You must select at least one way to attend the meeting.', ['attribute' => 'meeting types'])], + fn () => ['meeting_types' => __('You must select at least one way to attend the meeting.', ['attribute' => __('meeting types')])], [ 'format' => EngagementFormat::Interviews->value, ], ], 'Meeting types is not an array' => [ ['meeting_types' => MeetingType::InPerson->value], - fn () => ['meeting_types' => __('validation.array', ['attribute' => 'meeting types'])], + fn () => ['meeting_types' => __('validation.array', ['attribute' => __('meeting types')])], [ 'format' => EngagementFormat::Interviews->value, ], @@ -225,7 +225,7 @@ ], 'Street address is missing' => [ ['street_address' => null], - fn () => ['street_address' => __('You must enter a :attribute for the meeting location.', ['attribute' => 'street address'])], + fn () => ['street_address' => __('You must enter a :attribute for the meeting location.', ['attribute' => __('Street address')])], [ 'format' => EngagementFormat::Interviews->value, 'meetingType' => MeetingType::InPerson->value, @@ -233,7 +233,7 @@ ], 'Street address is invalid' => [ ['street_address' => false], - fn () => ['street_address' => __('validation.string', ['attribute' => 'street address'])], + fn () => ['street_address' => __('validation.string', ['attribute' => __('Street address')])], [ 'format' => EngagementFormat::Interviews->value, 'meetingType' => MeetingType::InPerson->value, @@ -241,7 +241,7 @@ ], 'Unit/suite/floor is invalid' => [ ['unit_suite_floor' => false], - fn () => ['unit_suite_floor' => __('validation.string', ['attribute' => 'unit suite floor'])], + fn () => ['unit_suite_floor' => __('validation.string', ['attribute' => __('Unit, suite, or floor')])], [ 'format' => EngagementFormat::Interviews->value, 'meetingType' => MeetingType::InPerson->value, @@ -281,7 +281,7 @@ ], 'Postal code is missing' => [ ['postal_code' => null], - fn () => ['postal_code' => __('You must enter a :attribute for the meeting location.', ['attribute' => 'postal code'])], + fn () => ['postal_code' => __('You must enter a :attribute for the meeting location.', ['attribute' => __('Postal code')])], [ 'format' => EngagementFormat::Interviews->value, 'meetingType' => MeetingType::InPerson->value, @@ -297,7 +297,7 @@ ], 'Directions is not an array' => [ ['directions' => 'Use the front elevator to go to the second floor.'], - fn () => ['directions' => __('validation.array', ['attribute' => 'directions'])], + fn () => ['directions' => __('validation.array', ['attribute' => __('directions')])], [ 'format' => EngagementFormat::Interviews->value, 'meetingType' => MeetingType::InPerson->value, @@ -305,7 +305,7 @@ ], 'Meeting software is missing' => [ ['meeting_software' => null], - fn () => ['meeting_software' => __('You must indicate the :attribute.', ['attribute' => 'meeting software'])], + fn () => ['meeting_software' => __('You must indicate the :attribute.', ['attribute' => __('meeting software')])], [ 'format' => EngagementFormat::Interviews->value, 'meetingType' => MeetingType::WebConference->value, @@ -313,7 +313,7 @@ ], 'Meeting software is invalid' => [ ['meeting_software' => false], - fn () => ['meeting_software' => __('validation.string', ['attribute' => 'meeting software'])], + fn () => ['meeting_software' => __('validation.string', ['attribute' => __('meeting software')])], [ 'format' => EngagementFormat::Interviews->value, 'meetingType' => MeetingType::WebConference->value, @@ -321,7 +321,7 @@ ], 'Alternative meeting software is invalid' => [ ['alternative_meeting_software' => ['false']], - fn () => ['alternative_meeting_software' => __('validation.boolean', ['attribute' => 'alternative meeting software'])], + fn () => ['alternative_meeting_software' => __('validation.boolean', ['attribute' => __('alternative meeting software')])], [ 'format' => EngagementFormat::Interviews->value, 'meetingType' => MeetingType::WebConference->value, @@ -345,7 +345,7 @@ ], 'Additional video information is not an array' => [ ['additional_video_information' => 'more info'], - fn () => ['additional_video_information' => __('validation.array', ['attribute' => 'additional video information'])], + fn () => ['additional_video_information' => __('validation.array', ['attribute' => __('additional video information')])], [ 'format' => EngagementFormat::Interviews->value, 'meetingType' => MeetingType::WebConference->value, @@ -369,7 +369,7 @@ ], 'Additional phone information is not an array' => [ ['additional_phone_information' => 'Press 1 after the beep.'], - fn () => ['additional_phone_information' => __('validation.array', ['attribute' => 'additional phone information'])], + fn () => ['additional_phone_information' => __('validation.array', ['attribute' => __('additional phone information')])], [ 'format' => EngagementFormat::Interviews->value, 'meetingType' => MeetingType::Phone->value, @@ -512,7 +512,7 @@ ], 'Document languages not an array - other-async' => [ ['document_languages' => 'en'], - fn () => ['document_languages' => __('validation.array', ['attribute' => 'document languages'])], + fn () => ['document_languages' => __('validation.array', ['attribute' => __('document languages')])], [ 'format' => EngagementFormat::OtherAsync->value, ], @@ -533,7 +533,7 @@ ], 'Document languages not an array - survey' => [ ['document_languages' => 'en'], - fn () => ['document_languages' => __('validation.array', ['attribute' => 'document languages'])], + fn () => ['document_languages' => __('validation.array', ['attribute' => __('document languages')])], [ 'format' => EngagementFormat::Survey->value, ], @@ -547,7 +547,7 @@ ], 'Accepted formats missing' => [ ['accepted_formats' => null], - fn () => ['accepted_formats' => __('You must indicate the :attribute.', ['attribute' => 'accepted formats'])], + fn () => ['accepted_formats' => __('You must indicate the :attribute.', ['attribute' => __('accepted formats')])], [ 'format' => EngagementFormat::Interviews->value, 'meetingType' => MeetingType::InPerson->value, @@ -556,7 +556,7 @@ ], 'Accepted formats is not an array' => [ ['accepted_formats' => AcceptedFormat::Writing->value], - fn () => ['accepted_formats' => __('validation.array', ['attribute' => 'accepted formats'])], + fn () => ['accepted_formats' => __('validation.array', ['attribute' => __('accepted formats')])], [ 'format' => EngagementFormat::Interviews->value, 'meetingType' => MeetingType::InPerson->value, @@ -616,7 +616,7 @@ ], 'Paid is not a boolean' => [ ['paid' => 'false'], - fn () => ['paid' => __('validation.boolean', ['attribute' => 'paid'])], + fn () => ['paid' => __('validation.boolean', ['attribute' => __('paid')])], ], 'Signup by date is missing' => [ ['signup_by_date' => null], diff --git a/tests/Datasets/UpdateEngagementSelectionCriteriaRequestValidationErrors.php b/tests/Datasets/UpdateEngagementSelectionCriteriaRequestValidationErrors.php index bb182d526..89f20dac6 100644 --- a/tests/Datasets/UpdateEngagementSelectionCriteriaRequestValidationErrors.php +++ b/tests/Datasets/UpdateEngagementSelectionCriteriaRequestValidationErrors.php @@ -24,7 +24,7 @@ 'location_type' => LocationType::Regions->value, 'regions' => ProvinceOrTerritory::Ontario->value, ], - fn () => ['regions' => __('validation.array', ['attribute' => 'regions'])], + fn () => ['regions' => __('validation.array', ['attribute' => __('province or territory')])], ], 'Region is invalid' => [ fn () => [ @@ -43,7 +43,7 @@ 'location_type' => LocationType::Localities->value, 'locations' => 'my location', ], - fn () => ['locations' => __('validation.array', ['attribute' => 'locations'])], + fn () => ['locations' => __('validation.array', ['attribute' => __('Location')])], ], 'Location region is missing' => [ fn () => [ @@ -85,11 +85,11 @@ ], 'Cross disability and deaf missing' => [ ['cross_disability_and_deaf' => null], - fn () => ['cross_disability_and_deaf' => __('validation.required', ['attribute' => 'cross disability and deaf'])], + fn () => ['cross_disability_and_deaf' => __('validation.required', ['attribute' => __('Cross disability (includes people with disabilities, Deaf people, and supporters)')])], ], 'Cross disability and deaf is not boolean' => [ ['cross_disability_and_deaf' => 'true'], - fn () => ['cross_disability_and_deaf' => __('validation.boolean', ['attribute' => 'cross disability and deaf'])], + fn () => ['cross_disability_and_deaf' => __('validation.boolean', ['attribute' => __('Cross disability (includes people with disabilities, Deaf people, and supporters)')])], ], 'Disability types missing' => [ [ diff --git a/tests/Datasets/UpdateIndividualRequestValidationErrors.php b/tests/Datasets/UpdateIndividualRequestValidationErrors.php index 82d62e036..d72e53738 100644 --- a/tests/Datasets/UpdateIndividualRequestValidationErrors.php +++ b/tests/Datasets/UpdateIndividualRequestValidationErrors.php @@ -4,16 +4,16 @@ return [ 'Missing name' => [ ['name' => null], - fn () => ['name' => __('validation.required', ['attribute' => 'name'])], + fn () => ['name' => __('validation.required', ['attribute' => __('full name')])], ['name'], ], 'Name not a string' => [ ['name' => false], - fn () => ['name' => __('validation.string', ['attribute' => 'name'])], + fn () => ['name' => __('validation.string', ['attribute' => __('full name')])], ], 'Name too long' => [ ['name' => '4wdjO$bfTeX4m7ya+WTGK10ywy=3tZhfrHnFkx3ZgC8Uyn1a441EjhDw0HqyFm*btGHQneD=q@+bcJEj$owvxR#bsnb+sdm5Xw+a4wdjO$bfTeX4m7ya+WTGK10ywy=3tZhfrHnFkx3ZgC8Uyn1a441EjhDw0HqyFm*btGHQneD=q@+bcJEj$owvxR#bsnb+sdm5Xw+a4wdjO$bfTeX4m7ya+WTGK10ywy=3tZhfrHnFkx3ZgC8Uyn1a441EjhDw0HqyFm*btGHQneD=q@+bcJEj$owvxR#bsnb+sdm5Xw+a'], - fn () => ['name' => __('validation.max.string', ['attribute' => 'name', 'max' => 255])], + fn () => ['name' => __('validation.max.string', ['attribute' => __('full name'), 'max' => 255])], ], 'Missing region' => [ ['region' => null], @@ -34,7 +34,7 @@ ], 'Bio missing' => [ ['bio' => null], - fn () => ['bio' => __('validation.required', ['attribute' => 'bio'])], + fn () => ['bio' => __('validation.required', ['attribute' => __('bio')])], ['bio'], ], 'Bio not an array' => [ @@ -60,11 +60,11 @@ ], 'Working languages not an array' => [ ['working_languages' => 'en'], - fn () => ['working_languages' => __('validation.array', ['attribute' => 'working languages'])], + fn () => ['working_languages' => __('validation.array', ['attribute' => __('Working languages')])], ], 'Consulting services not an array' => [ ['consulting_services' => 'analysis'], - fn () => ['consulting_services' => __('validation.array', ['attribute' => 'consulting services'])], + fn () => ['consulting_services' => __('validation.array', ['attribute' => __('Consulting services')])], ], 'Consulting service invalid' => [ ['consulting_services' => ['test-service']], From c35464ce087ba221827fe7e63eb78d825e83ed31 Mon Sep 17 00:00:00 2001 From: Daniel Cho Date: Wed, 29 Nov 2023 14:51:56 -0500 Subject: [PATCH 07/20] fix: update validation errors --- .../AddNotificaitonableRequestValidationErrors.php | 2 +- ...moveNotificaitonableRequestValidationErrors.php | 14 +++++++------- ...entSelectionCriteriaRequestValidationErrors.php | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/Datasets/AddNotificaitonableRequestValidationErrors.php b/tests/Datasets/AddNotificaitonableRequestValidationErrors.php index de4ad56df..20ad1c835 100644 --- a/tests/Datasets/AddNotificaitonableRequestValidationErrors.php +++ b/tests/Datasets/AddNotificaitonableRequestValidationErrors.php @@ -10,7 +10,7 @@ ], 'notificationable type is invalid' => [ [], - fn () => ['notificationable_type' => __('validation.in', ['attribute' => 'notificationable type'])], + fn () => ['notificationable_type' => __('validation.in', ['attribute' => __('notificationable type')])], ], 'missing notificationable id' => [ ['notificationable_id' => null], diff --git a/tests/Datasets/RemoveNotificaitonableRequestValidationErrors.php b/tests/Datasets/RemoveNotificaitonableRequestValidationErrors.php index b120584bf..8ac289985 100644 --- a/tests/Datasets/RemoveNotificaitonableRequestValidationErrors.php +++ b/tests/Datasets/RemoveNotificaitonableRequestValidationErrors.php @@ -4,33 +4,33 @@ return [ 'missing notificationable type' => [ ['notificationable_type' => null], - fn () => ['notificationable_type' => __('validation.required', ['attribute' => 'notificationable type'])], + fn () => ['notificationable_type' => __('validation.required', ['attribute' => __('notificationable type')])], ], 'notificationable type not a string' => [ ['notificationable_type' => false], fn () => [ - 'notificationable_type' => __('validation.string', ['attribute' => 'notificationable type']), - 'notificationable_type' => __('validation.in', ['attribute' => 'notificationable type']), + 'notificationable_type' => __('validation.string', ['attribute' => __('notificationable type')]), + 'notificationable_type' => __('validation.in', ['attribute' => __('notificationable type')]), ], ], 'notificationable type is invalid' => [ ['notificationable_type' => 'fakeClass'], - fn () => ['notificationable_type' => __('validation.in', ['attribute' => 'notificationable type'])], + fn () => ['notificationable_type' => __('validation.in', ['attribute' => __('notificationable type')])], ], 'missing notificationable id' => [ ['notificationable_id' => null], - fn () => ['notificationable_id' => __('validation.required', ['attribute' => 'notificationable id'])], + fn () => ['notificationable_id' => __('validation.required', ['attribute' => __('notificationable id')])], ], 'notificationable id not an integer' => [ ['notificationable_id' => 'test'], fn () => [ - 'notificationable_id' => __('validation.integer', ['attribute' => 'notificationable id']), + 'notificationable_id' => __('validation.integer', ['attribute' => __('notificationable id')]), ], ], 'notificationable id is invalid' => [ ['notificationable_id' => 10000000], fn () => [ - 'notificationable_id' => __('validation.in', ['attribute' => 'notificationable id']), + 'notificationable_id' => __('validation.in', ['attribute' => __('notificationable id')]), ], ], ]; diff --git a/tests/Datasets/UpdateEngagementSelectionCriteriaRequestValidationErrors.php b/tests/Datasets/UpdateEngagementSelectionCriteriaRequestValidationErrors.php index 89f20dac6..a59ac8526 100644 --- a/tests/Datasets/UpdateEngagementSelectionCriteriaRequestValidationErrors.php +++ b/tests/Datasets/UpdateEngagementSelectionCriteriaRequestValidationErrors.php @@ -8,11 +8,11 @@ return [ 'Location type missing' => [ ['location_type' => null], - fn () => ['location_type' => __('validation.required', ['attribute' => 'location type'])], + fn () => ['location_type' => __('validation.required', ['attribute' => __('location type')])], ], 'Location type is invalid' => [ ['location_type' => 'test location'], - fn () => ['location_type' => __('validation.in', ['attribute' => 'location type'])], + fn () => ['location_type' => __('validation.in', ['attribute' => __('location type')])], ], 'Regions is missing' => [ fn () => ['location_type' => LocationType::Regions->value], @@ -113,11 +113,11 @@ ], 'Intersectional missing' => [ ['intersectional' => null], - fn () => ['intersectional' => __('validation.required', ['attribute' => 'intersectional'])], + fn () => ['intersectional' => __('validation.required', ['attribute' => __('intersectional')])], ], 'Intersectional is not boolean' => [ ['intersectional' => 'false'], - fn () => ['intersectional' => __('validation.boolean', ['attribute' => 'intersectional'])], + fn () => ['intersectional' => __('validation.boolean', ['attribute' => __('intersectional')])], ], 'Other identity type missing' => [ ['intersectional' => false], @@ -129,7 +129,7 @@ 'intersectional' => false, 'other_identity_type' => 1234, ], - fn () => ['other_identity_type' => __('validation.string', ['attribute' => 'other identity type'])], + fn () => ['other_identity_type' => __('validation.string', ['attribute' => __('other identity type')])], ], 'Age brackets missing' => [ [ From c7db4481a359eba41f5a313e6bb65ef85e1a2e97 Mon Sep 17 00:00:00 2001 From: Daniel Cho Date: Thu, 30 Nov 2023 10:47:07 -0500 Subject: [PATCH 08/20] fix: run localize --- resources/lang/en.json | 104 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/resources/lang/en.json b/resources/lang/en.json index 376a7b222..42c60dc95 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -127,6 +127,8 @@ "Additional information to join": "Additional information to join", "additional information to join": "additional information to join", "Additional needs or concerns": "Additional needs or concerns", + "additional phone information": "additional phone information", + "additional video information": "additional video information", "Add language": "Add language", "Add link": "Add link", "Add meeting": "Add meeting", @@ -139,6 +141,8 @@ "A follow-up to a previous project (such as a progress report)": "A follow-up to a previous project (such as a progress report)", "African": "African", "Age": "Age", + "age bracket connections": "age bracket connections", + "age bracket constituencies": "age bracket constituencies", "Age group": "Age group", "age group": "age group", "Age groups": "Age groups", @@ -155,6 +159,7 @@ "All rights reserved.": "All rights reserved.", "Already on your block list": "Already on your block list", "Already on your notification list.": "Already on your notification list.", + "alternative meeting software": "alternative meeting software", "Alternative text for images": "Alternative text for images", "Although it is not compulsory, we highly recommend that you include English and French translations of your content.": "Although it is not compulsory, we highly recommend that you include English and French translations of your content.", "A meeting title must be provided in at least English or French.": "A meeting title must be provided in at least English or French.", @@ -193,6 +198,8 @@ "Areas of interest": "Areas of interest", "Areas of your organization this project will impact": "Areas of your organization this project will impact", "area type": "area type", + "area type connections": "area type connections", + "area type constituencies": "area type constituencies", "Are you looking for individuals in specific provinces or territories or specific cities or towns?": "Are you looking for individuals in specific provinces or territories or specific cities or towns?", "Are you sure you want to block :blockable?": "Are you sure you want to block :blockable?", "Are you sure you want to delete your account?": "Are you sure you want to delete your account?", @@ -253,6 +260,8 @@ "Black on yellow": "Black on yellow", "Block": "Block", "Block :blockable": "Block :blockable", + "blockable id": "blockable id", + "blockable type": "blockable type", "Blocked individuals and organizations": "Blocked individuals and organizations", "Body differences": "Body differences", "Booking accessibility service providers": "Booking accessibility service providers", @@ -366,6 +375,7 @@ "Congratulations, :name!": "Congratulations, :name!", "Connecting the disability and Deaf communities and their supporters with ": "Connecting the disability and Deaf communities and their supporters with ", "connecting to a Community Connector to help recruit Consultation Participants.": "connecting to a Community Connector to help recruit Consultation Participants.", + "connection lived experience": "connection lived experience", "Connect members of your community with governments and businesses who are looking for Consultation Participants. Help them learn how to best work with your community.": "Connect members of your community with governments and businesses who are looking for Consultation Participants. Help them learn how to best work with your community.", "Connect organizations with participants from my community": "Connect organizations with participants from my community", "Connects the disability and Deaf communities and supporters with organizations that are “regulated” or supervised and monitored by the federal government, so that together they can work on accessibility projects, as required by the Accessible Canada Act.": "Connects the disability and Deaf communities and supporters with organizations that are “regulated” or supervised and monitored by the federal government, so that together they can work on accessibility projects, as required by the Accessible Canada Act.", @@ -375,6 +385,7 @@ "Consultation Participants are required to share their province\/territory, their city\/town, and whether or not they identify as someone with a disability, Deaf or a supporter. All of the remaining questions are optional. For multiple choice questions, there is an option to select “prefer not to answer”.": "Consultation Participants are required to share their province\/territory, their city\/town, and whether or not they identify as someone with a disability, Deaf or a supporter. All of the remaining questions are optional. For multiple choice questions, there is an option to select “prefer not to answer”.", "Consultation Participants — Individual": "Consultation Participants — Individual", "Consultations": "Consultations", + "consulting methods": "consulting methods", "Consulting services": "Consulting services", "Consulting with a Community Organization": "Consulting with a Community Organization", "Contact": "Contact", @@ -389,12 +400,14 @@ "Contact person": "Contact person", "Contact person’s email": "Contact person’s email", "Contact person’s phone number": "Contact person’s phone number", + "Contact person’s vrs": "Contact person’s vrs", "Contact support": "Contact support", "Contact us": "Contact us", "Content": "Content", "Content added": "Content added", "Content added, unsaved changes": "Content added, unsaved changes", "Content types": "Content types", + "context": "context", "Continue": "Continue", "Contracted": "Contracted", "Contracts": "Contracts", @@ -434,6 +447,7 @@ "creating an open project, where anyone who matches their criteria can sign up. ": "creating an open project, where anyone who matches their criteria can sign up. ", "Cross disability (includes people with disabilities, Deaf people, and supporters)": "Cross disability (includes people with disabilities, Deaf people, and supporters)", "Current password": "Current password", + "current password": "current password", "Customize": "Customize", "Customize this website’s accessibility": "Customize this website’s accessibility", "Dark theme": "Dark theme", @@ -452,6 +466,7 @@ "Decline": "Decline", "Deepen understanding": "Deepen understanding", "Deepen understanding about the systemic barriers (laws, policies, practices, and culture) underlying the experiences that consultation participants report": "Deepen understanding about the systemic barriers (laws, policies, practices, and culture) underlying the experiences that consultation participants report", + "definition": "definition", "Delete account": "Delete account", "Delete my page": "Delete my page", "Delete regulated organization": "Delete regulated organization", @@ -467,7 +482,10 @@ "Developing an accessibility plan": "Developing an accessibility plan", "Developmental disabilities": "Developmental disabilities", "Did you know…": "Did you know…", + "directions": "directions", "Disability and\/or Deaf identity": "Disability and\/or Deaf identity", + "disability and deaf connections": "disability and deaf connections", + "disability and deaf constituencies": "disability and deaf constituencies", "Disability and Deaf groups they are looking for": "Disability and Deaf groups they are looking for", "Disability and Deaf representative organizations": "Disability and Deaf representative organizations", "Disability and Deaf support organizations": "Disability and Deaf support organizations", @@ -478,6 +496,8 @@ "disability type": "disability type", "Disconnected rooms for down-time": "Disconnected rooms for down-time", "Dismiss": "Dismiss", + "document access needs": "document access needs", + "document languages": "document languages", "Documents will be sent to participants by:": "Documents will be sent to participants by:", "Does :name have lived experience of the people they can connect to?": "Does :name have lived experience of the people they can connect to?", "Does your organization :represent_or_serve_and_support a specific age bracket or brackets?": "Does your organization :represent_or_serve_and_support a specific age bracket or brackets?", @@ -521,6 +541,7 @@ "Edit your project page": "Edit your project page", "Edit your role": "Edit your role", "Email": "Email", + "email": "email", "Email address": "Email address", "email address": "email address", "Email your certificate again": "Email your certificate again", @@ -536,6 +557,7 @@ "Engagement": "Engagement", "engagement": "engagement", "engagement description": "engagement description", + "engagement format": "engagement format", "Engagement materials": "Engagement materials", "Engagement meetings": "Engagement meetings", "engagement name": "engagement name", @@ -558,6 +580,8 @@ "ethnoracial group": "ethnoracial group", "Ethnoracial identity": "Ethnoracial identity", "ethnoracial identity": "ethnoracial identity", + "ethnoracial identity connections": "ethnoracial identity connections", + "ethnoracial identity constituencies": "ethnoracial identity constituencies", "Experiences": "Experiences", "experience working with organizations to create inclusive consultations, identify barriers, and create accessibility plans.": "experience working with organizations to create inclusive consultations, identify barriers, and create accessibility plans.", "External team": "External team", @@ -584,6 +608,7 @@ "Finding out about new projects": "Finding out about new projects", "Find learning materials, best practices, and variety of tools to help you throughout the consultation process.": "Find learning materials, best practices, and variety of tools to help you throughout the consultation process.", "Find people with disabilities, Deaf people and community organizations (for example, disability or other relevant civil society organizations, like Indigenous groups), to consult with on your accessibility project.": "Find people with disabilities, Deaf people and community organizations (for example, disability or other relevant civil society organizations, like Indigenous groups), to consult with on your accessibility project.", + "finished introduction": "finished introduction", "First language": "First language", "first language": "first language", "First Nations": "First Nations", @@ -623,6 +648,8 @@ "further directions": "further directions", "Gender and sexual identity": "Gender and sexual identity", "Gender and sexuality": "Gender and sexuality", + "gender and sexuality connections": "gender and sexuality connections", + "gender and sexuality constituencies": "gender and sexuality constituencies", "Gender diverse": "Gender diverse", "Gender fluid people": "Gender fluid people", "Gender identity": "Gender identity", @@ -653,6 +680,18 @@ "groups you can connect to": "groups you can connect to", "Guidelines and best practices": "Guidelines and best practices", "Hard-of-hearing": "Hard-of-hearing", + "has age bracket connections": "has age bracket connections", + "has age bracket constituencies": "has age bracket constituencies", + "has ethnoracial identity connections": "has ethnoracial identity connections", + "has ethnoracial identity constituencies": "has ethnoracial identity constituencies", + "has gender and sexuality connections": "has gender and sexuality connections", + "has gender and sexuality constituencies": "has gender and sexuality constituencies", + "has indigenous connections": "has indigenous connections", + "has indigenous constituencies": "has indigenous constituencies", + "has other disability connection": "has other disability connection", + "has other disability constituency": "has other disability constituency", + "has other ethnoracial identity connection": "has other ethnoracial identity connection", + "has other ethnoracial identity constituency": "has other ethnoracial identity constituency", "Have more questions?": "Have more questions?", "Have questions?": "Have questions?", "Have trouble meeting the access needs of your participants?": "Have trouble meeting the access needs of your participants?", @@ -713,6 +752,8 @@ "Including government departments, agencies and Crown Corporations": "Including government departments, agencies and Crown Corporations", "Incomplete": "Incomplete", "Indigenous": "Indigenous", + "indigenous connections": "indigenous connections", + "indigenous constituencies": "indigenous constituencies", "Indigenous group": "Indigenous group", "Indigenous identity": "Indigenous identity", "Individual": "Individual", @@ -727,10 +768,12 @@ "Initiated by": "Initiated by", "In order to create a successful exchange, we ask Consultation Participants to provide this information so that The Accessibility Exchange can match Consultation Participants with an engagement that is looking for someone with your experiences.": "In order to create a successful exchange, we ask Consultation Participants to provide this information so that The Accessibility Exchange can match Consultation Participants with an engagement that is looking for someone with your experiences.", "In person": "In person", + "in person access needs": "in person access needs", "In progress": "In progress", "In Progress": "In Progress", "Interests": "Interests", "Internal team": "Internal team", + "intersectional": "intersectional", "Intersectional - This engagement is looking for people who have all sorts of different identities and lived experiences, such as race, gender, age, sexual orientation, and more.": "Intersectional - This engagement is looking for people who have all sorts of different identities and lived experiences, such as race, gender, age, sexual orientation, and more.", "Intersectional outreach": "Intersectional outreach", "Intervenor": "Intervenor", @@ -740,6 +783,7 @@ "Interviews will take place between :start and :end.": "Interviews will take place between :start and :end.", "Introduction video": "Introduction video", "Inuit": "Inuit", + "invitation": "invitation", "Invite": "Invite", "Invite new member": "Invite new member", "Invite others to your organization": "Invite others to your organization", @@ -759,11 +803,14 @@ "Join our accessibility community": "Join our accessibility community", "Keeping my information up to date": "Keeping my information up to date", "Language": "Language", + "language": "language", "Language: :locale": "Language: :locale", "Language :language added.": "Language :language added.", "Language :language removed.": "Language :language removed.", "Language :number": "Language :number", "Language added.": "Language added.", + "language connections": "language connections", + "language constituencies": "language constituencies", "Language groups": "Language groups", "Language preferences": "Language preferences", "Language removed.": "Language removed.", @@ -798,13 +845,17 @@ "link to join the meeting": "link to join the meeting", "Lived and living experiences": "Lived and living experiences", "Lived experience": "Lived experience", + "lived experience connections": "lived experience connections", + "lived experience constituencies": "lived experience constituencies", "lived experience of disability, or of being Deaf, or both": "lived experience of disability, or of being Deaf, or both", "lived experience of disability or of being Deaf, or of both": "lived experience of disability or of being Deaf, or of both", "lived experiences": "lived experiences", "Lived or living experience": "Lived or living experience", "Living in urban, rural, or remote areas": "Living in urban, rural, or remote areas", + "locale": "locale", "Location": "Location", "Location :number": "Location :number", + "location type": "location type", "Mailing Address": "Mailing Address", "Mailing address": "Mailing address", "main menu": "main menu", @@ -832,13 +883,16 @@ "Materials will be provided in the following languages:": "Materials will be provided in the following languages:", "Me": "Me", "means that a field is required.": "means that a field is required.", + "meeting access needs": "meeting access needs", "meeting date": "meeting date", "Meeting dates": "Meeting dates", "meeting end time": "meeting end time", "Meetings": "Meetings", + "meeting software": "meeting software", "meeting start time": "meeting start time", "meeting time zone": "meeting time zone", "meeting title": "meeting title", + "meeting types": "meeting types", "Member": "Member", "Members of our team have received the following training:": "Members of our team have received the following training:", "Men": "Men", @@ -890,6 +944,7 @@ "New Estimate Request from :projectable": "New Estimate Request from :projectable", "Newfoundland and Labrador": "Newfoundland and Labrador", "Newfoundland Standard or Daylight Time": "Newfoundland Standard or Daylight Time", + "new language": "new language", "New password": "New password", "New project": "New project", "New reports uploaded": "New reports uploaded", @@ -928,10 +983,20 @@ "Notes": "Notes", "Not everyone has had access to paid or volunteer experiences, but there are a lot of experiences that build certain skills and strengths. You can share more about that here. If you have had paid or volunteer experiences, you can also include that.": "Not everyone has had access to paid or volunteer experiences, but there are a lot of experiences that build certain skills and strengths. You can share more about that here. If you have had paid or volunteer experiences, you can also include that.", "Nothing found.": "Nothing found.", + "notificationable id": "notificationable id", + "notificationable type": "notificationable type", "Notification list": "Notification list", "Notification List": "Notification List", "Notification preferences": "Notification preferences", "Notifications": "Notifications", + "notification settings connectors": "notification settings connectors", + "notification settings consultants": "notification settings consultants", + "notification settings projects": "notification settings projects", + "notification settings projects creators": "notification settings projects creators", + "notification settings projects engagements": "notification settings projects engagements", + "notification settings projects types": "notification settings projects types", + "notification settings reports": "notification settings reports", + "notification settings updates": "notification settings updates", "notifications navigation": "notifications navigation", "Notify me or my support person directly": "Notify me or my support person directly", "Notify your organization’s contact person directly": "Notify your organization’s contact person directly", @@ -974,6 +1039,7 @@ "Ontario": "Ontario", "Open call": "Open call", "Opens in new tab": "Opens in new tab", + "open to other formats": "open to other formats", "optional": "optional", "Organization details": "Organization details", "Organization information": "Organization information", @@ -987,21 +1053,32 @@ "Organizations that provide support “for” disability, Deaf, and family-based members. Not constituted primarily by people with disabilities.": "Organizations that provide support “for” disability, Deaf, and family-based members. Not constituted primarily by people with disabilities.", "Organizations which have some constituency of persons with disabilities, Deaf persons, or family members, but these groups are not their primary mandate. Groups served, for example, can include: Indigenous organizations, 2SLGBTQ+ organizations, immigrant and refugee groups, and women’s groups.": "Organizations which have some constituency of persons with disabilities, Deaf persons, or family members, but these groups are not their primary mandate. Groups served, for example, can include: Indigenous organizations, 2SLGBTQ+ organizations, immigrant and refugee groups, and women’s groups.", "Organizations “of” disability, Deaf, and family-based organizations. Constituted primarily by people with disabilities.": "Organizations “of” disability, Deaf, and family-based organizations. Constituted primarily by people with disabilities.", + "organization type": "organization type", "Organization website": "Organization website", "Other": "Other", + "other": "other", "Other (please describe)": "Other (please describe)", "Other (please specify)": "Other (please specify)", "Other accepted format": "Other accepted format", "other accepted format": "other accepted format", + "other accepted formats": "other accepted formats", + "other access need": "other access need", "Other civil society organizations relevant to people with disabilities, Deaf people, and supporters": "Other civil society organizations relevant to people with disabilities, Deaf people, and supporters", + "other disability connection": "other disability connection", + "other disability constituency": "other disability constituency", + "other ethnoracial identity connection": "other ethnoracial identity connection", + "other ethnoracial identity constituency": "other ethnoracial identity constituency", "Other identities": "Other identities", "Other identity groups": "Other identity groups", + "other identity type": "other identity type", + "other payment type": "other payment type", "Other public sector organization, which is regulated by the Accessible Canada Act": "Other public sector organization, which is regulated by the Accessible Canada Act", "Other – in-person or virtual meeting": "Other – in-person or virtual meeting", "Other – written or recorded response": "Other – written or recorded response", "Our team does not have people with lived and living experiences of disability or being Deaf.": "Our team does not have people with lived and living experiences of disability or being Deaf.", "Our team has people with lived and living experiences of disability or being Deaf.": "Our team has people with lived and living experiences of disability or being Deaf.", "Outcomes and reports": "Outcomes and reports", + "out of scope": "out of scope", "Pacific Standard or Daylight Time": "Pacific Standard or Daylight Time", "page": "page", "Page also available in:": "Page also available in:", @@ -1011,6 +1088,7 @@ "Page title": "Page title", "Page translations": "Page translations", "Paid": "Paid", + "paid": "paid", "Pain-related disabilities": "Pain-related disabilities", "Parliamentary entities": "Parliamentary entities", "Participant": "Participant", @@ -1042,6 +1120,7 @@ "Phase of consultation": "Phase of consultation", "Phases of consultation": "Phases of consultation", "Phone": "Phone", + "phone": "phone", "Phone call": "Phone call", "Phone calls": "Phone calls", "Phone number": "Phone number", @@ -1148,9 +1227,13 @@ "Prefer not to answer": "Prefer not to answer", "preferred": "preferred", "Preferred contact method": "Preferred contact method", + "preferred contact method": "preferred contact method", + "preferred contact person": "preferred contact person", "Preferred notification method": "Preferred notification method", "present": "present", "Preview page": "Preview page", + "previous project": "previous project", + "previous project id": "previous project id", "Pricing": "Pricing", "Prince Edward Island": "Prince Edward Island", "Printed version of engagement documents": "Printed version of engagement documents", @@ -1159,14 +1242,19 @@ "Privacy Policy": "Privacy Policy", "Procurement": "Procurement", "project": "project", + "projectable id": "projectable id", + "projectable type": "projectable type", "Project by :projectable": "Project by :projectable", + "project context": "project context", "Project details": "Project details", "Project duration": "Project duration", "Project end date": "Project end date", "Project goals": "Project goals", "project goals": "project goals", "Project goals must be provided in at least one language.": "Project goals must be provided in at least one language.", + "project id": "project id", "Project impact": "Project impact", + "project languages": "project languages", "Project name": "Project name", "project name": "project name", "Project outcome": "Project outcome", @@ -1199,6 +1287,7 @@ "Providing this information will help us match you to projects that are working on areas of interest to you.": "Providing this information will help us match you to projects that are working on areas of interest to you.", "Province or territory": "Province or territory", "province or territory": "province or territory", + "public outcomes": "public outcomes", "Public profile": "Public profile", "Publish": "Publish", "Published": "Published", @@ -1206,6 +1295,7 @@ "Published on :date": "Published on :date", "Publish page": "Publish page", "Quebec": "Quebec", + "questions": "questions", "Questions are sent to participants by:": "Questions are sent to participants by:", "Quick exit": "Quick exit", "Quick links": "Quick links", @@ -1222,6 +1312,7 @@ "Recommended": "Recommended", "Recruit individuals who are Deaf or have disabilities to give input on your own projects.": "Recruit individuals who are Deaf or have disabilities to give input on your own projects.", "Recruitment": "Recruitment", + "recruitment": "recruitment", "Recruitment method": "Recruitment method", "Refugees": "Refugees", "Refugees and\/or immigrants": "Refugees and\/or immigrants", @@ -1279,6 +1370,7 @@ "Results": "Results", "Returned": "Returned", "Return to dashboard": "Return to dashboard", + "return to engagement": "return to engagement", "Review and publish engagement details": "Review and publish engagement details", "Review and publish your organization’s public page": "Review and publish your organization’s public page", "Review and publish your public page": "Review and publish your public page", @@ -1286,7 +1378,9 @@ "Review project": "Review project", "Review project details": "Review project details", "Role": "Role", + "role": "role", "Roles": "Roles", + "roles": "roles", "Roles:": "Roles:", "Roles and permissions": "Roles and permissions", "Run by": "Run by", @@ -1346,6 +1440,7 @@ "Show that you are looking for a Community Connector": "Show that you are looking for a Community Connector", "show up on search results for them": "show up on search results for them", "Signed language for interpretation": "Signed language for interpretation", + "signed language for translation": "signed language for translation", "Sign in": "Sign in", "Sign language interpretation": "Sign language interpretation", "Sign language interpretations": "Sign language interpretations", @@ -1432,12 +1527,14 @@ "Tap into our support network": "Tap into our support network", "Team contact": "Team contact", "Team Invitation": "Team Invitation", + "team size": "team size", "Tell us about who you are.": "Tell us about who you are.", "Tell us about your organization, its mission, and what you offer.": "Tell us about your organization, its mission, and what you offer.", "Tell us your business name": "Tell us your business name", "Tell us your organization’s name": "Tell us your organization’s name", "Templates and forms": "Templates and forms", "Temporary disabilities": "Temporary disabilities", + "term": "term", "terms of service": "terms of service", "Terms of Service": "Terms of Service", "Text": "Text", @@ -1561,6 +1658,7 @@ "Time and date": "Time and date", "Times during the day interviews will be happening": "Times during the day interviews will be happening", "Time zone": "Time zone", + "timezone": "timezone", "Title of meeting": "Title of meeting", "Title of role": "Title of role", "Title of Role": "Title of Role", @@ -1586,6 +1684,8 @@ "training organization or trainer website address": "training organization or trainer website address", "Training Participant": "Training Participant", "Training your team has received": "Training your team has received", + "translatable id": "translatable id", + "translatable type": "translatable type", "Translations": "Translations", "Trans people": "Trans people", "Tuesday": "Tuesday", @@ -1628,6 +1728,7 @@ "Voice recording": "Voice recording", "Volunteer": "Volunteer", "VRS": "VRS", + "vrs": "vrs", "Ways to attend": "Ways to attend", "Ways to participate": "Ways to participate", "We ask Accessibility Consultants for the following information:": "We ask Accessibility Consultants for the following information:", @@ -1713,6 +1814,7 @@ "Which of these areas can you help a regulated organization with?": "Which of these areas can you help a regulated organization with?", "White": "White", "White on black": "White on black", + "who": "who", "Who can be a :role?": "Who can be a :role?", "Who do you want to engage?": "Who do you want to engage?", "who is going through the results": "who is going through the results", @@ -1722,6 +1824,7 @@ "Who you’re joining as": "Who you’re joining as", "Who’s responsible for going through results and producing an outcome": "Who’s responsible for going through results and producing an outcome", "Why do we ask for this information?": "Why do we ask for this information?", + "window flexibility": "window flexibility", "Women": "Women", "Word document": "Word document", "Working age adults (15–64)": "Working age adults (15–64)", @@ -1732,6 +1835,7 @@ "Would you like to be notified directly when you are added to an engagement as a Community Connector?": "Would you like to be notified directly when you are added to an engagement as a Community Connector?", "Writing": "Writing", "Writing accessibility reports": "Writing accessibility reports", + "written language for translation": "written language for translation", "Written language translation": "Written language translation", "Written or recorded responses": "Written or recorded responses", "Wrong answer": "Wrong answer", From 08b6b78c74e4c84f7bc0868985ed6614fb9ad0af Mon Sep 17 00:00:00 2001 From: Daniel Cho Date: Thu, 30 Nov 2023 13:13:06 -0500 Subject: [PATCH 09/20] fix: update based on PR feedback --- app/Http/Requests/MeetingRequest.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Http/Requests/MeetingRequest.php b/app/Http/Requests/MeetingRequest.php index f811117c9..497d2b394 100644 --- a/app/Http/Requests/MeetingRequest.php +++ b/app/Http/Requests/MeetingRequest.php @@ -123,7 +123,11 @@ public function attributes(): array 'alternative_meeting_software' => __('alternative meeting software'), 'additional_video_information' => __('additional video information'), 'additional_phone_information' => __('additional phone information'), - 'meeting_types' => __('meeting types'), + 'title.en' => __('meeting title (English)'), + 'title.fr' => __('meeting title (French)'), + 'title.*' => __('meeting title'), + 'meeting_types.*' => __('ways to attend'), + 'meeting_types' => __('ways to attend'), 'street_address' => __('Street address'), 'postal_code' => __('Postal code'), 'unit_suite_floor' => __('Unit, suite, or floor'), From e5f47a5224f6ab2e995deacbf943166580961ed8 Mon Sep 17 00:00:00 2001 From: Daniel Cho Date: Fri, 1 Dec 2023 14:58:44 -0500 Subject: [PATCH 10/20] fix: update based on PR feedback --- app/Http/Requests/MeetingRequest.php | 6 ++--- .../Requests/SaveIndividualRolesRequest.php | 3 ++- .../Requests/SaveOrganizationRolesRequest.php | 1 + .../Requests/SaveUserLanguagesRequest.php | 2 +- .../StoreEngagementRecruitmentRequest.php | 2 +- app/Http/Requests/StoreEngagementRequest.php | 4 ++- .../Requests/StoreOrganizationTypeRequest.php | 2 ++ app/Http/Requests/StoreProjectRequest.php | 4 ++- app/Http/Requests/StoreQuizResultRequest.php | 2 +- .../StoreRegulatedOrganizationRequest.php | 4 ++- .../Requests/UpdateAccessNeedsRequest.php | 3 +++ .../Requests/UpdateAreasOfInterestRequest.php | 6 +++-- ...ationAndConsultationPreferencesRequest.php | 10 +++++--- .../UpdateEngagementLanguagesRequest.php | 1 + app/Http/Requests/UpdateEngagementRequest.php | 13 ++++++++++ ...dateEngagementSelectionCriteriaRequest.php | 3 +++ ...ationAndConsultationPreferencesRequest.php | 9 ++++--- .../UpdateIndividualConstituenciesRequest.php | 11 ++++++++ .../UpdateIndividualInterestsRequest.php | 6 +++-- app/Http/Requests/UpdateIndividualRequest.php | 6 ++++- .../UpdateLanguagePreferencesRequest.php | 3 ++- .../UpdateNotificationPreferencesRequest.php | 25 ++++++++++++------- ...pdateOrganizationConstituenciesRequest.php | 10 ++++++++ ...eOrganizationContactInformationRequest.php | 6 ++--- .../UpdateOrganizationInterestsRequest.php | 6 +++-- .../Requests/UpdateOrganizationRequest.php | 7 ++++++ .../UpdatePaymentInformationRequest.php | 1 + app/Http/Requests/UpdateProjectRequest.php | 20 ++++++++++++--- .../Requests/UpdateProjectTeamRequest.php | 6 ++++- .../UpdateRegulatedOrganizationRequest.php | 16 +++++++----- ...WebsiteAccessibilityPreferencesRequest.php | 2 +- 31 files changed, 151 insertions(+), 49 deletions(-) diff --git a/app/Http/Requests/MeetingRequest.php b/app/Http/Requests/MeetingRequest.php index 497d2b394..b877dfd56 100644 --- a/app/Http/Requests/MeetingRequest.php +++ b/app/Http/Requests/MeetingRequest.php @@ -110,6 +110,9 @@ public function rules(): array public function attributes(): array { return [ + 'title.en' => __('meeting title (English)'), + 'title.fr' => __('meeting title (French)'), + 'title.*' => __('meeting title'), 'start_time' => __('meeting start time'), 'end_time' => __('meeting end time'), 'date' => __('meeting date'), @@ -123,9 +126,6 @@ public function attributes(): array 'alternative_meeting_software' => __('alternative meeting software'), 'additional_video_information' => __('additional video information'), 'additional_phone_information' => __('additional phone information'), - 'title.en' => __('meeting title (English)'), - 'title.fr' => __('meeting title (French)'), - 'title.*' => __('meeting title'), 'meeting_types.*' => __('ways to attend'), 'meeting_types' => __('ways to attend'), 'street_address' => __('Street address'), diff --git a/app/Http/Requests/SaveIndividualRolesRequest.php b/app/Http/Requests/SaveIndividualRolesRequest.php index a02cc09d1..aa1b4cf3b 100644 --- a/app/Http/Requests/SaveIndividualRolesRequest.php +++ b/app/Http/Requests/SaveIndividualRolesRequest.php @@ -37,7 +37,8 @@ public function prepareForValidation() public function attributes(): array { return [ - 'roles' => __('You must select what you would like to do on the website.'), + 'roles' => __('roles'), + 'roles.*' => __('roles'), ]; } diff --git a/app/Http/Requests/SaveOrganizationRolesRequest.php b/app/Http/Requests/SaveOrganizationRolesRequest.php index a57f7fc9a..00866b8d4 100644 --- a/app/Http/Requests/SaveOrganizationRolesRequest.php +++ b/app/Http/Requests/SaveOrganizationRolesRequest.php @@ -25,6 +25,7 @@ public function attributes(): array { return [ 'roles' => __('roles'), + 'roles.*' => __('roles'), ]; } diff --git a/app/Http/Requests/SaveUserLanguagesRequest.php b/app/Http/Requests/SaveUserLanguagesRequest.php index 1df7b0d4f..fbbc3032f 100644 --- a/app/Http/Requests/SaveUserLanguagesRequest.php +++ b/app/Http/Requests/SaveUserLanguagesRequest.php @@ -33,7 +33,7 @@ public function rules(): array public function attributes(): array { return [ - 'locale' => __('locale'), + 'locale' => __('Website language'), 'invitation' => __('invitation'), 'context' => __('context'), 'role' => __('role'), diff --git a/app/Http/Requests/StoreEngagementRecruitmentRequest.php b/app/Http/Requests/StoreEngagementRecruitmentRequest.php index bd1b5d6eb..8c1fc0f43 100644 --- a/app/Http/Requests/StoreEngagementRecruitmentRequest.php +++ b/app/Http/Requests/StoreEngagementRecruitmentRequest.php @@ -26,7 +26,7 @@ public function rules(): array public function attributes(): array { return [ - 'recruitment' => __('recruitment'), + 'recruitment' => __('recruitment method'), ]; } } diff --git a/app/Http/Requests/StoreEngagementRequest.php b/app/Http/Requests/StoreEngagementRequest.php index a42186b74..8a7d8edb7 100644 --- a/app/Http/Requests/StoreEngagementRequest.php +++ b/app/Http/Requests/StoreEngagementRequest.php @@ -29,7 +29,9 @@ public function attributes(): array { return [ 'project_id' => __('project id'), - 'name' => __('engagement name'), + 'name.en' => __('engagement name (English)'), + 'name.fr' => __('engagement name (French)'), + 'name.*' => __('engagement name'), 'who' => __('who'), ]; } diff --git a/app/Http/Requests/StoreOrganizationTypeRequest.php b/app/Http/Requests/StoreOrganizationTypeRequest.php index a47463cef..760c132e7 100644 --- a/app/Http/Requests/StoreOrganizationTypeRequest.php +++ b/app/Http/Requests/StoreOrganizationTypeRequest.php @@ -32,6 +32,8 @@ public function attributes(): array { return [ 'type' => __('organization type'), + 'name.en' => __('organization name (English)'), + 'name.fr' => __('organization name (French)'), ]; } diff --git a/app/Http/Requests/StoreProjectRequest.php b/app/Http/Requests/StoreProjectRequest.php index 6e243d37a..2a877e5bb 100644 --- a/app/Http/Requests/StoreProjectRequest.php +++ b/app/Http/Requests/StoreProjectRequest.php @@ -50,7 +50,9 @@ public function attributes(): array 'projectable_type' => __('projectable type'), 'projectable_id' => __('projectable id'), 'ancestor_id' => __('previous project id'), - 'name' => __('project name'), + 'name.en' => __('project name (English)'), + 'name.fr' => __('project name (French)'), + 'name.*' => __('project name'), ]; } diff --git a/app/Http/Requests/StoreQuizResultRequest.php b/app/Http/Requests/StoreQuizResultRequest.php index f4e47d0aa..65fd3fca2 100644 --- a/app/Http/Requests/StoreQuizResultRequest.php +++ b/app/Http/Requests/StoreQuizResultRequest.php @@ -34,7 +34,7 @@ public function rules() public function attributes(): array { return [ - 'questions' => __('questions'), + 'questions.*' => __('questions'), ]; } diff --git a/app/Http/Requests/StoreRegulatedOrganizationRequest.php b/app/Http/Requests/StoreRegulatedOrganizationRequest.php index ac08aeee4..966faa61f 100644 --- a/app/Http/Requests/StoreRegulatedOrganizationRequest.php +++ b/app/Http/Requests/StoreRegulatedOrganizationRequest.php @@ -24,7 +24,9 @@ public function attributes(): array { return [ 'type' => __('organization type'), - 'name' => __('organization name'), + 'name.en' => __('organization name (English)'), + 'name.fr' => __('organization name (French)'), + 'name.*' => __('organization name'), ]; } diff --git a/app/Http/Requests/UpdateAccessNeedsRequest.php b/app/Http/Requests/UpdateAccessNeedsRequest.php index ed0893222..07a4616ef 100644 --- a/app/Http/Requests/UpdateAccessNeedsRequest.php +++ b/app/Http/Requests/UpdateAccessNeedsRequest.php @@ -164,13 +164,16 @@ public function attributes(): array { return [ 'general_access_needs' => __('General access needs'), + 'general_access_needs.*' => __('General access needs'), 'other' => __('other'), 'other_access_need' => __('other access need'), 'meeting_access_needs' => __('meeting access needs'), 'signed_language_for_interpretation' => __('Signed language for interpretation'), 'spoken_language_for_interpretation' => __('Spoken language interpretation'), 'in_person_access_needs' => __('in person access needs'), + 'in_person_access_needs.*' => __('in person access needs'), 'document_access_needs' => __('document access needs'), + 'document_access_needs.*' => __('document access needs'), 'signed_language_for_translation' => __('signed language for translation'), 'written_language_for_translation' => __('written language for translation'), 'street_address' => __('Street address'), diff --git a/app/Http/Requests/UpdateAreasOfInterestRequest.php b/app/Http/Requests/UpdateAreasOfInterestRequest.php index 958e58e1b..76566d334 100644 --- a/app/Http/Requests/UpdateAreasOfInterestRequest.php +++ b/app/Http/Requests/UpdateAreasOfInterestRequest.php @@ -24,8 +24,10 @@ public function rules(): array public function attributes(): array { return [ - 'sectors' => __('Sectors'), - 'impacts' => __('areas of impact'), + 'sectors' => __('Regulated Organization type'), + 'sectors.*' => __('Regulated Organization type'), + 'impacts' => __('area of accessibility planning and design'), + 'impacts.*' => __('area of accessibility planning and design'), ]; } diff --git a/app/Http/Requests/UpdateCommunicationAndConsultationPreferencesRequest.php b/app/Http/Requests/UpdateCommunicationAndConsultationPreferencesRequest.php index 0b7421f2d..7222447bd 100644 --- a/app/Http/Requests/UpdateCommunicationAndConsultationPreferencesRequest.php +++ b/app/Http/Requests/UpdateCommunicationAndConsultationPreferencesRequest.php @@ -60,13 +60,15 @@ public function attributes(): array 'email' => __('email'), 'phone' => __('phone'), 'vrs' => __('vrs'), - 'support_person_name' => __('My support person’s name'), - 'support_person_email' => __('My support person’s email'), - 'support_person_phone' => __('My support person’s phone number'), - 'support_person_vrs' => __('My support person requires Video Relay Service (VRS) for phone calls'), + 'support_person_name' => __('support person’s name'), + 'support_person_email' => __('support person’s email'), + 'support_person_phone' => __('support person’s phone number'), + 'support_person_vrs' => __('support person requires Video Relay Service (VRS) for phone calls'), 'preferred_contact_method' => __('preferred contact method'), 'consulting_methods' => __('consulting methods'), + 'consulting_methods.*' => __('consulting methods'), 'meeting_types' => __('meeting types'), + 'meeting_types.*' => __('meeting types'), ]; } diff --git a/app/Http/Requests/UpdateEngagementLanguagesRequest.php b/app/Http/Requests/UpdateEngagementLanguagesRequest.php index 24b1e6238..3d46f5198 100644 --- a/app/Http/Requests/UpdateEngagementLanguagesRequest.php +++ b/app/Http/Requests/UpdateEngagementLanguagesRequest.php @@ -26,6 +26,7 @@ public function attributes(): array { return [ 'languages' => __('languages'), + 'languages.*' => __('languages'), ]; } } diff --git a/app/Http/Requests/UpdateEngagementRequest.php b/app/Http/Requests/UpdateEngagementRequest.php index 123960bb2..2f0a357a3 100644 --- a/app/Http/Requests/UpdateEngagementRequest.php +++ b/app/Http/Requests/UpdateEngagementRequest.php @@ -277,6 +277,7 @@ public function attributes(): array 'window_start_time' => __('start time'), 'window_end_time' => __('end time'), 'window_flexibility' => __('window flexibility'), + 'weekday_availabilities' => __('availability'), 'weekday_availabilities.monday' => __('availability for Monday'), 'weekday_availabilities.tuesday' => __('availability for Tuesday'), 'weekday_availabilities.wednesday' => __('availability for Wednesday'), @@ -290,13 +291,18 @@ public function attributes(): array 'meeting_phone' => __('phone number to join the meeting'), 'meeting_software' => __('meeting software'), 'meeting_types' => __('meeting types'), + 'meeting_types.*' => __('meeting types'), 'materials_by_date' => __('date for materials to be sent by'), 'complete_by_date' => __('due date'), 'postal_code' => __('Postal code'), 'signup_by_date' => __('sign up deadline'), 'street_address' => __('Street address'), 'accepted_formats' => __('accepted formats'), + 'accepted_formats.*' => __('accepted formats'), 'other_accepted_formats' => __('other accepted formats'), + 'other_accepted_format' => __('other accepted format'), + 'other_accepted_format.en' => __('other accepted format (English)'), + 'other_accepted_format.fr' => __('other accepted format (French)'), 'timezone' => __('timezone'), 'unit_suite_floor' => __('Unit, suite, or floor'), 'directions' => __('directions'), @@ -304,8 +310,15 @@ public function attributes(): array 'additional_video_information' => __('additional video information'), 'additional_phone_information' => __('additional phone information'), 'document_languages' => __('document languages'), + 'document_languages.*' => __('document languages'), 'open_to_other_formats' => __('open to other formats'), 'paid' => __('paid'), + 'name.en' => __('engagement name (English)'), + 'name.fr' => __('engagement name (French)'), + 'name.*' => __('engagement name'), + 'description.en' => __('engagement description (English)'), + 'description.fr' => __('engagement description (French)'), + 'description.*' => __('engagement description'), ]; } diff --git a/app/Http/Requests/UpdateEngagementSelectionCriteriaRequest.php b/app/Http/Requests/UpdateEngagementSelectionCriteriaRequest.php index 9e1e77ba2..386a102b0 100644 --- a/app/Http/Requests/UpdateEngagementSelectionCriteriaRequest.php +++ b/app/Http/Requests/UpdateEngagementSelectionCriteriaRequest.php @@ -78,7 +78,10 @@ public function attributes(): array return [ 'location_type' => __('location type'), 'regions' => __('province or territory'), + 'regions.*' => __('province or territory'), 'locations' => __('Location'), + 'locations.*.region' => __('location province or territory'), + 'locations.*.locality' => __('location city or town'), 'cross_disability_and_deaf' => __('Cross disability (includes people with disabilities, Deaf people, and supporters)'), 'intersectional' => __('intersectional'), 'other_identity_type' => __('other identity type'), diff --git a/app/Http/Requests/UpdateIndividualCommunicationAndConsultationPreferencesRequest.php b/app/Http/Requests/UpdateIndividualCommunicationAndConsultationPreferencesRequest.php index 5987e3ee0..f768ff50c 100644 --- a/app/Http/Requests/UpdateIndividualCommunicationAndConsultationPreferencesRequest.php +++ b/app/Http/Requests/UpdateIndividualCommunicationAndConsultationPreferencesRequest.php @@ -52,12 +52,13 @@ public function attributes(): array 'email' => __('email'), 'phone' => __('phone'), 'vrs' => __('vrs'), - 'support_person_name' => __('My support person’s name'), - 'support_person_email' => __('My support person’s email'), - 'support_person_phone' => __('My support person’s phone number'), - 'support_person_vrs' => __('My support person requires Video Relay Service (VRS) for phone calls'), + 'support_person_name' => __('support person’s name'), + 'support_person_email' => __('support person’s email'), + 'support_person_phone' => __('support person’s phone number'), + 'support_person_vrs' => __('support person requires Video Relay Service (VRS) for phone calls'), 'preferred_contact_method' => __('preferred contact method'), 'meeting_types' => __('meeting types'), + 'meeting_types.*' => __('meeting types'), ]; } diff --git a/app/Http/Requests/UpdateIndividualConstituenciesRequest.php b/app/Http/Requests/UpdateIndividualConstituenciesRequest.php index cb61af0ef..fbbba45b2 100644 --- a/app/Http/Requests/UpdateIndividualConstituenciesRequest.php +++ b/app/Http/Requests/UpdateIndividualConstituenciesRequest.php @@ -100,24 +100,35 @@ public function attributes(): array return [ 'disability_and_deaf' => __('Disability and/or Deaf identity'), 'lived_experience_connections' => __('lived experience connections'), + 'lived_experience_connections.*' => __('lived experience connections'), 'base_disability_type' => __('disability type'), 'disability_and_deaf_connections' => __('disability and deaf connections'), + 'disability_and_deaf_connections.*' => __('disability and deaf connections'), 'has_other_disability_connection' => __('has other disability connection'), 'other_disability_connection' => __('other disability connection'), + 'other_disability_connection.*' => __('other disability connection'), + 'area_type_connections' => __('area type connections'), + 'area_type_connections.*' => __('area type connections'), 'area_type_connections' => __('area type connections'), 'has_indigenous_connections' => __('has indigenous connections'), 'indigenous_connections' => __('indigenous connections'), + 'indigenous_connections.*' => __('indigenous connections'), 'refugees_and_immigrants' => __('Refugees and/or immigrants'), 'has_gender_and_sexuality_connections' => __('has gender and sexuality connections'), 'gender_and_sexuality_connections' => __('gender and sexuality connections'), + 'gender_and_sexuality_connections.*' => __('gender and sexuality connections'), 'nb_gnc_fluid_identity' => __('Non-binary/Gender non-conforming/Gender fluid identity'), 'has_age_bracket_connections' => __('has age bracket connections'), 'age_bracket_connections' => __('age bracket connections'), + 'age_bracket_connections.*' => __('age bracket connections'), 'has_ethnoracial_identity_connections' => __('has ethnoracial identity connections'), 'ethnoracial_identity_connections' => __('ethnoracial identity connections'), + 'ethnoracial_identity_connections.*' => __('ethnoracial identity connections'), 'has_other_ethnoracial_identity_connection' => __('has other ethnoracial identity connection'), 'other_ethnoracial_identity_connection' => __('other ethnoracial identity connection'), + 'other_ethnoracial_identity_connection.*' => __('other ethnoracial identity connection'), 'language_connections' => __('language connections'), + 'language_connections.*' => __('language connections'), 'connection_lived_experience' => __('connection lived experience'), ]; } diff --git a/app/Http/Requests/UpdateIndividualInterestsRequest.php b/app/Http/Requests/UpdateIndividualInterestsRequest.php index b82cdba4c..a61b9f02d 100644 --- a/app/Http/Requests/UpdateIndividualInterestsRequest.php +++ b/app/Http/Requests/UpdateIndividualInterestsRequest.php @@ -43,8 +43,10 @@ public function rules() public function attributes(): array { return [ - 'sectors' => __('Sectors'), - 'impacts' => __('areas of impact'), + 'sectors' => __('Regulated Organization type'), + 'sectors.*' => __('Regulated Organization type'), + 'impacts' => __('area of accessibility planning and design'), + 'impacts.*' => __('area of accessibility planning and design'), ]; } diff --git a/app/Http/Requests/UpdateIndividualRequest.php b/app/Http/Requests/UpdateIndividualRequest.php index b31fa13cf..2cf7237fe 100644 --- a/app/Http/Requests/UpdateIndividualRequest.php +++ b/app/Http/Requests/UpdateIndividualRequest.php @@ -72,9 +72,13 @@ public function attributes(): array 'region' => __('province or territory'), 'pronouns' => __('pronouns'), 'bio' => __('bio'), + 'bio.en' => __('bio (English)'), + 'bio.fr' => __('bio (French)'), + 'bio.*' => __('bio'), 'working_languages' => __('Working languages'), 'consulting_services' => __('Consulting services'), - 'social_links' => __('Social media links'), + 'consulting_services.*' => __('Consulting services'), + 'social_links.*' => __('Social media links'), 'website_link' => __('Website link'), ]; } diff --git a/app/Http/Requests/UpdateLanguagePreferencesRequest.php b/app/Http/Requests/UpdateLanguagePreferencesRequest.php index 4b1cf9d5f..9c0fb7d2e 100644 --- a/app/Http/Requests/UpdateLanguagePreferencesRequest.php +++ b/app/Http/Requests/UpdateLanguagePreferencesRequest.php @@ -39,9 +39,10 @@ public function rules(): array public function attributes(): array { return [ - 'locale' => __('locale'), + 'locale' => __('Website language'), 'first_language' => __('first language'), 'working_languages' => __('Working languages'), + 'working_languages.*' => __('Working languages'), ]; } diff --git a/app/Http/Requests/UpdateNotificationPreferencesRequest.php b/app/Http/Requests/UpdateNotificationPreferencesRequest.php index 2a8d87de3..8663452cd 100644 --- a/app/Http/Requests/UpdateNotificationPreferencesRequest.php +++ b/app/Http/Requests/UpdateNotificationPreferencesRequest.php @@ -87,15 +87,22 @@ public function rules(): array public function attributes(): array { return [ - 'preferred_notification_method' => __('Preferred notification method'), - 'notification_settings.consultants.channels' => __('notification settings consultants'), - 'notification_settings.connectors.channels' => __('notification settings connectors'), - 'notification_settings.reports.channels' => __('notification settings reports'), - 'notification_settings.projects.channels' => __('notification settings projects'), - 'notification_settings.projects.creators' => __('notification settings projects creators'), - 'notification_settings.projects.types' => __('notification settings projects types'), - 'notification_settings.projects.engagements' => __('notification settings projects engagements'), - 'notification_settings.updates.channels' => __('notification settings updates'), + 'notification_settings.consultants.channels' => __('Accessibility Consultant notification setting'), + 'notification_settings.consultants.channels.*' => __('Accessibility Consultant notification setting'), + 'notification_settings.connectors.channels' => __('Community Connector notification setting'), + 'notification_settings.connectors.channels.*' => __('Community Connector notification setting'), + 'notification_settings.reports.channels' => __('report notification setting'), + 'notification_settings.reports.channels.*' => __('report notification setting'), + 'notification_settings.projects.channels' => __('projects notification setting'), + 'notification_settings.projects.channels.*' => __('projects notification setting'), + 'notification_settings.projects.creators' => __('project created by organization type notification setting'), + 'notification_settings.projects.creators.*' => __('project created by organization type notification setting'), + 'notification_settings.projects.types' => __('project type notification setting'), + 'notification_settings.projects.types.*' => __('project type notification setting'), + 'notification_settings.projects.engagements' => __('project engagement type notification setting'), + 'notification_settings.projects.engagements.*' => __('project engagement type notification setting'), + 'notification_settings.updates.channels' => __('review and updates notification settings'), + 'notification_settings.updates.channels.*' => __('review and updates notification settings'), ]; } diff --git a/app/Http/Requests/UpdateOrganizationConstituenciesRequest.php b/app/Http/Requests/UpdateOrganizationConstituenciesRequest.php index 3bdba42b0..9a161b07b 100644 --- a/app/Http/Requests/UpdateOrganizationConstituenciesRequest.php +++ b/app/Http/Requests/UpdateOrganizationConstituenciesRequest.php @@ -97,24 +97,34 @@ public function attributes(): array return [ 'disability_and_deaf' => __('Disability and/or Deaf identity'), 'lived_experience_constituencies' => __('lived experience constituencies'), + 'lived_experience_constituencies.*' => __('lived experience constituencies'), 'base_disability_type' => __('disability type'), 'disability_and_deaf_constituencies' => __('disability and deaf constituencies'), + 'disability_and_deaf_constituencies.*' => __('disability and deaf constituencies'), 'has_other_disability_constituency' => __('has other disability constituency'), 'other_disability_constituency' => __('other disability constituency'), + 'other_disability_constituency.*' => __('other disability constituency'), 'area_type_constituencies' => __('area type constituencies'), + 'area_type_constituencies.*' => __('area type constituencies'), 'has_indigenous_constituencies' => __('has indigenous constituencies'), 'indigenous_constituencies' => __('indigenous constituencies'), + 'indigenous_constituencies.*' => __('indigenous constituencies'), 'refugees_and_immigrants' => __('Refugees and/or immigrants'), 'has_gender_and_sexuality_constituencies' => __('has gender and sexuality constituencies'), 'gender_and_sexuality_constituencies' => __('gender and sexuality constituencies'), + 'gender_and_sexuality_constituencies.*' => __('gender and sexuality constituencies'), 'nb_gnc_fluid_identity' => __('Non-binary/Gender non-conforming/Gender fluid identity'), 'has_age_bracket_constituencies' => __('has age bracket constituencies'), 'age_bracket_constituencies' => __('age bracket constituencies'), + 'age_bracket_constituencies.*' => __('age bracket constituencies'), 'has_ethnoracial_identity_constituencies' => __('has ethnoracial identity constituencies'), 'ethnoracial_identity_constituencies' => __('ethnoracial identity constituencies'), + 'ethnoracial_identity_constituencies.*' => __('ethnoracial identity constituencies'), 'has_other_ethnoracial_identity_constituency' => __('has other ethnoracial identity constituency'), 'other_ethnoracial_identity_constituency' => __('other ethnoracial identity constituency'), + 'other_ethnoracial_identity_constituency.*' => __('other ethnoracial identity constituency'), 'language_constituencies' => __('language constituencies'), + 'language_constituencies.*' => __('language constituencies'), 'staff_lived_experience' => __('Staff lived experience'), ]; } diff --git a/app/Http/Requests/UpdateOrganizationContactInformationRequest.php b/app/Http/Requests/UpdateOrganizationContactInformationRequest.php index 2e212068d..839d71c25 100644 --- a/app/Http/Requests/UpdateOrganizationContactInformationRequest.php +++ b/app/Http/Requests/UpdateOrganizationContactInformationRequest.php @@ -26,9 +26,9 @@ public function attributes(): array { return [ 'contact_person_name' => __('Contact person'), - 'contact_person_email' => __('Contact person’s email'), - 'contact_person_phone' => __('Contact person’s phone number'), - 'contact_person_vrs' => __('Contact person’s vrs'), + 'contact_person_email' => __('email address'), + 'contact_person_phone' => __('phone number'), + 'contact_person_vrs' => __('Contact person requires Video Relay Service (VRS) for phone calls'), 'preferred_contact_method' => __('preferred contact method'), ]; } diff --git a/app/Http/Requests/UpdateOrganizationInterestsRequest.php b/app/Http/Requests/UpdateOrganizationInterestsRequest.php index 4b5ca20f2..a889cf1b0 100644 --- a/app/Http/Requests/UpdateOrganizationInterestsRequest.php +++ b/app/Http/Requests/UpdateOrganizationInterestsRequest.php @@ -24,8 +24,10 @@ public function rules(): array public function attributes(): array { return [ - 'impacts' => __('areas of impact'), - 'sectors' => __('Sectors'), + 'sectors' => __('Regulated Organization type'), + 'sectors.*' => __('Regulated Organization type'), + 'impacts' => __('area of accessibility planning and design'), + 'impacts.*' => __('area of accessibility planning and design'), ]; } } diff --git a/app/Http/Requests/UpdateOrganizationRequest.php b/app/Http/Requests/UpdateOrganizationRequest.php index a56f6a7bb..e8a01ccb5 100644 --- a/app/Http/Requests/UpdateOrganizationRequest.php +++ b/app/Http/Requests/UpdateOrganizationRequest.php @@ -80,12 +80,19 @@ public function attributes(): array return [ 'about.fr' => __('"About your organization" (French)'), 'about.en' => __('"About your organization" (English)'), + 'about.*' => __('"About your organization"'), + 'name.fr' => __('organization name (French)'), + 'name.en' => __('organization name (English)'), + 'name.*' => __('organization name'), 'locality' => __('city or town'), 'region' => __('province or territory'), 'service_areas' => __('Service areas'), + 'service_areas.*' => __('Service areas'), 'working_languages' => __('Working languages'), 'consulting_services' => __('Consulting services'), + 'consulting_services.*' => __('Consulting services'), 'social_links' => __('Social media links'), + 'social_links.*' => __('Social media links'), 'website_link' => __('Website link'), ]; } diff --git a/app/Http/Requests/UpdatePaymentInformationRequest.php b/app/Http/Requests/UpdatePaymentInformationRequest.php index 96606333c..def368d1f 100644 --- a/app/Http/Requests/UpdatePaymentInformationRequest.php +++ b/app/Http/Requests/UpdatePaymentInformationRequest.php @@ -25,6 +25,7 @@ public function attributes(): array { return [ 'payment_types' => __('Payment type'), + 'payment_types.*' => __('Payment type'), 'other' => __('Other'), 'other_payment_type' => __('other payment type'), ]; diff --git a/app/Http/Requests/UpdateProjectRequest.php b/app/Http/Requests/UpdateProjectRequest.php index 9e2ba3210..23b4742a8 100644 --- a/app/Http/Requests/UpdateProjectRequest.php +++ b/app/Http/Requests/UpdateProjectRequest.php @@ -59,16 +59,30 @@ public function rules(): array public function attributes(): array { return [ - 'name' => __('Project name'), - 'goals' => __('Project goals'), + 'name.en' => __('Project name (English)'), + 'name.fr' => __('Project name (French)'), + 'name.*' => __('Project name'), + 'goals.en' => __('Project goals (English)'), + 'goals.fr' => __('Project goals (French)'), + 'goals.*' => __('Project goals'), + 'scope.en' => __('Project scope (English)'), + 'scope.fr' => __('Project scope (French)'), 'scope' => __('Project scope'), 'regions' => __('geographic areas'), + 'regions.*' => __('geographic areas'), 'impacts' => __('areas of impact'), + 'impacts.*' => __('areas of impact'), 'out_of_scope' => __('out of scope'), + 'out_of_scope.*' => __('out of scope'), 'start_date' => __('start date'), 'end_date' => __('end date'), 'outcome_analysis' => __('Outcomes and reports'), - 'outcomes' => __('Project outcome'), + 'outcome_analysis.*' => __('Outcomes and reports'), + 'outcome_analysis_other' => __('Outcomes and reports other'), + 'outcome_analysis_other.*' => __('Outcomes and reports other'), + 'outcomes.en' => __('Project outcome (English)'), + 'outcomes.fr' => __('Project outcome (French)'), + 'outcomes.*' => __('Project outcome'), 'public_outcomes' => __('public outcomes'), ]; } diff --git a/app/Http/Requests/UpdateProjectTeamRequest.php b/app/Http/Requests/UpdateProjectTeamRequest.php index f0d60a675..dadc0dd58 100644 --- a/app/Http/Requests/UpdateProjectTeamRequest.php +++ b/app/Http/Requests/UpdateProjectTeamRequest.php @@ -37,7 +37,9 @@ public function attributes(): array { return [ 'team_size' => __('team size'), + 'team_size.*' => __('team size'), 'team_has_disability_or_deaf_lived_experience' => __('Our team has people with lived and living experiences of disability or being Deaf.'), + 'team_trainings' => __('training'), 'team_trainings.*.name' => __('training name'), 'team_trainings.*.date' => __('training date'), 'team_trainings.*.trainer_name' => __('training organization or trainer name'), @@ -45,9 +47,11 @@ public function attributes(): array 'contact_person_name' => __('Contact person'), 'contact_person_email' => __('Contact person’s email'), 'contact_person_phone' => __('Contact person’s phone number'), - 'contact_person_vrs' => __('Contact person’s vrs'), + 'contact_person_vrs' => __('Contact person requires Video Relay Service (VRS) for phone calls'), 'preferred_contact_method' => __('preferred contact method'), 'contact_person_response_time' => __('Approximate response time'), + 'contact_person_response_time.en' => __('Approximate response time (English)'), + 'contact_person_response_time.fr' => __('Approximate response time (French)'), ]; } diff --git a/app/Http/Requests/UpdateRegulatedOrganizationRequest.php b/app/Http/Requests/UpdateRegulatedOrganizationRequest.php index fb5815933..0cf70fdb8 100644 --- a/app/Http/Requests/UpdateRegulatedOrganizationRequest.php +++ b/app/Http/Requests/UpdateRegulatedOrganizationRequest.php @@ -117,21 +117,25 @@ public function withValidator($validator) public function attributes(): array { return [ - 'name' => __('organization name'), + 'name.en' => __('organization name (English)'), + 'name.fr' => __('organization name (French)'), + 'name.*' => __('organization name'), 'locality' => __('city or town'), 'region' => __('province or territory'), 'service_areas' => __('Service areas'), - 'sectors' => __('Sectors'), + 'service_areas.*' => __('Service areas'), + 'sectors' => __('type of Regulated Organization'), 'about.fr' => __('"About your organization" (French)'), 'about.en' => __('"About your organization" (English)'), + 'about.*' => __('"About your organization" (English)'), 'accessibility_and_inclusion_links.*.title' => __('accessibility and inclusion link title'), 'accessibility_and_inclusion_links.*.url' => __('accessibility and inclusion link'), - 'social_links' => __('Social media links'), + 'social_links.*' => __('Social media links'), 'website_link' => __('Website link'), 'contact_person_name' => __('Contact person'), - 'contact_person_email' => __('Contact person’s email'), - 'contact_person_phone' => __('Contact person’s phone number'), - 'contact_person_vrs' => __('Contact person’s vrs'), + 'contact_person_email' => __('email address'), + 'contact_person_phone' => __('phone number'), + 'contact_person_vrs' => __('Contact person requires Video Relay Service (VRS) for phone calls'), 'preferred_contact_method' => __('preferred contact method'), ]; } diff --git a/app/Http/Requests/UpdateWebsiteAccessibilityPreferencesRequest.php b/app/Http/Requests/UpdateWebsiteAccessibilityPreferencesRequest.php index 0fe56360e..dd1ce7f4b 100644 --- a/app/Http/Requests/UpdateWebsiteAccessibilityPreferencesRequest.php +++ b/app/Http/Requests/UpdateWebsiteAccessibilityPreferencesRequest.php @@ -24,7 +24,7 @@ public function rules(): array public function attributes(): array { return [ - 'theme' => __('Theme'), + 'theme' => __('Contrast adjustment'), 'text_to_speech' => __('Text to speech'), ]; } From 46a82ed59e268197004e0cbdaae2347c14e41d73 Mon Sep 17 00:00:00 2001 From: Daniel Cho Date: Fri, 1 Dec 2023 15:13:31 -0500 Subject: [PATCH 11/20] fix: analyze issue --- app/Http/Requests/UpdateIndividualConstituenciesRequest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Requests/UpdateIndividualConstituenciesRequest.php b/app/Http/Requests/UpdateIndividualConstituenciesRequest.php index fbbba45b2..9ab089c1e 100644 --- a/app/Http/Requests/UpdateIndividualConstituenciesRequest.php +++ b/app/Http/Requests/UpdateIndividualConstituenciesRequest.php @@ -109,7 +109,6 @@ public function attributes(): array 'other_disability_connection.*' => __('other disability connection'), 'area_type_connections' => __('area type connections'), 'area_type_connections.*' => __('area type connections'), - 'area_type_connections' => __('area type connections'), 'has_indigenous_connections' => __('has indigenous connections'), 'indigenous_connections' => __('indigenous connections'), 'indigenous_connections.*' => __('indigenous connections'), From ec40713848a5b4953c14819f2c3cf3a7bdd09fb2 Mon Sep 17 00:00:00 2001 From: Daniel Cho Date: Fri, 1 Dec 2023 15:39:35 -0500 Subject: [PATCH 12/20] fix: update validation errors --- tests/Datasets/MeetingRequestValidationErrors.php | 2 +- tests/Datasets/UpdateEngagementRequestValidationErrors.php | 4 ++-- tests/Datasets/UpdateIndividualRequestValidationErrors.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Datasets/MeetingRequestValidationErrors.php b/tests/Datasets/MeetingRequestValidationErrors.php index df1211e01..6504eac62 100644 --- a/tests/Datasets/MeetingRequestValidationErrors.php +++ b/tests/Datasets/MeetingRequestValidationErrors.php @@ -17,7 +17,7 @@ ], 'Title is not a string' => [ ['title' => ['en' => false]], - fn () => ['title.en' => __('validation.string', ['attribute' => 'title.en'])], + fn () => ['title.en' => __('validation.string', ['attribute' => __('meeting title (English)')])], ['meetingType' => MeetingType::InPerson->value], ], 'Date missing' => [ diff --git a/tests/Datasets/UpdateEngagementRequestValidationErrors.php b/tests/Datasets/UpdateEngagementRequestValidationErrors.php index c2f17ce1e..096eb2d57 100644 --- a/tests/Datasets/UpdateEngagementRequestValidationErrors.php +++ b/tests/Datasets/UpdateEngagementRequestValidationErrors.php @@ -24,7 +24,7 @@ ], 'Name translation is not a string' => [ 'state' => ['name.en' => false], - 'errors' => fn () => ['name.en' => __('validation.string', ['attribute' => 'name.en'])], + 'errors' => fn () => ['name.en' => __('validation.string', ['attribute' => __('engagement name (English)')])], ], 'Description is missing' => [ ['description' => null], @@ -43,7 +43,7 @@ ], 'Description translation is not a string' => [ 'state' => ['description.en' => false], - 'errors' => fn () => ['description.en' => __('validation.string', ['attribute' => 'description.en'])], + 'errors' => fn () => ['description.en' => __('validation.string', ['attribute' => __('engagement description (English)')])], ], 'Window start date is missing' => [ ['window_start_date' => null], diff --git a/tests/Datasets/UpdateIndividualRequestValidationErrors.php b/tests/Datasets/UpdateIndividualRequestValidationErrors.php index d72e53738..9a8ef967f 100644 --- a/tests/Datasets/UpdateIndividualRequestValidationErrors.php +++ b/tests/Datasets/UpdateIndividualRequestValidationErrors.php @@ -47,7 +47,7 @@ ], 'Bio translation not a string' => [ ['bio' => ['en' => [123]]], - fn () => ['bio.en' => __('validation.string', ['attribute' => 'bio.en'])], + fn () => ['bio.en' => __('validation.string', ['attribute' => __('bio (English)')])], ], 'Bio missing required translation' => [ ['bio' => ['es' => 'biografía']], From ebfe29593ce9c58183990acdff7480d5b9522579 Mon Sep 17 00:00:00 2001 From: Daniel Cho Date: Fri, 1 Dec 2023 15:58:57 -0500 Subject: [PATCH 13/20] fix: update validation errors --- tests/Datasets/MeetingRequestValidationErrors.php | 2 +- tests/Datasets/UpdateEngagementRequestValidationErrors.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Datasets/MeetingRequestValidationErrors.php b/tests/Datasets/MeetingRequestValidationErrors.php index 6504eac62..aa5ed9705 100644 --- a/tests/Datasets/MeetingRequestValidationErrors.php +++ b/tests/Datasets/MeetingRequestValidationErrors.php @@ -77,7 +77,7 @@ ], 'Meeting types is not an array' => [ ['meeting_types' => MeetingType::InPerson->value], - fn () => ['meeting_types' => __('validation.array', ['attribute' => __('meeting types')])], + fn () => ['meeting_types' => __('validation.array', ['attribute' => __('ways to attend')])], ], 'Meeting type is invalid' => [ ['meeting_types' => ['new_meeting_type']], diff --git a/tests/Datasets/UpdateEngagementRequestValidationErrors.php b/tests/Datasets/UpdateEngagementRequestValidationErrors.php index 096eb2d57..390910c53 100644 --- a/tests/Datasets/UpdateEngagementRequestValidationErrors.php +++ b/tests/Datasets/UpdateEngagementRequestValidationErrors.php @@ -164,7 +164,7 @@ 'Weekday availabilities is not an array' => [ fn () => ['weekday_availabilities' => Availability::Available->value], fn () => [ - 'weekday_availabilities' => __('validation.array', ['attribute' => __('weekday availabilities')]), + 'weekday_availabilities' => __('validation.array', ['attribute' => __('availability')]), 'weekday_availabilities.monday' => __('validation.required', ['attribute' => __('availability for Monday')]), 'weekday_availabilities.tuesday' => __('validation.required', ['attribute' => __('availability for Tuesday')]), 'weekday_availabilities.wednesday' => __('validation.required', ['attribute' => __('availability for Wednesday')]), From 50e03630cef180d89470799d38bf72a389417a23 Mon Sep 17 00:00:00 2001 From: Daniel Cho Date: Mon, 4 Dec 2023 09:53:44 -0500 Subject: [PATCH 14/20] fix: add email attribute to AcceptInvitationRequest --- app/Http/Requests/AcceptInvitationRequest.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/Http/Requests/AcceptInvitationRequest.php b/app/Http/Requests/AcceptInvitationRequest.php index d9bba8c89..2b500511f 100644 --- a/app/Http/Requests/AcceptInvitationRequest.php +++ b/app/Http/Requests/AcceptInvitationRequest.php @@ -22,6 +22,13 @@ public function rules(): array return []; } + public function attributes(): array + { + return [ + 'email' => __('email address'), + ]; + } + public function withValidator(Validator $validator) { $validator From 3d4c31c67f9da33018887490725221dc33996482 Mon Sep 17 00:00:00 2001 From: Daniel Cho Date: Mon, 4 Dec 2023 09:59:32 -0500 Subject: [PATCH 15/20] fix: update attribute message --- app/Http/Requests/UpdateEngagementRequest.php | 4 ++-- tests/Datasets/UpdateEngagementRequestValidationErrors.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Requests/UpdateEngagementRequest.php b/app/Http/Requests/UpdateEngagementRequest.php index 2f0a357a3..e8dc255bc 100644 --- a/app/Http/Requests/UpdateEngagementRequest.php +++ b/app/Http/Requests/UpdateEngagementRequest.php @@ -290,8 +290,8 @@ public function attributes(): array 'meeting_url' => __('link to join the meeting'), 'meeting_phone' => __('phone number to join the meeting'), 'meeting_software' => __('meeting software'), - 'meeting_types' => __('meeting types'), - 'meeting_types.*' => __('meeting types'), + 'meeting_types' => __('Ways to attend'), + 'meeting_types.*' => __('Ways to attend'), 'materials_by_date' => __('date for materials to be sent by'), 'complete_by_date' => __('due date'), 'postal_code' => __('Postal code'), diff --git a/tests/Datasets/UpdateEngagementRequestValidationErrors.php b/tests/Datasets/UpdateEngagementRequestValidationErrors.php index 390910c53..c74d7d6dd 100644 --- a/tests/Datasets/UpdateEngagementRequestValidationErrors.php +++ b/tests/Datasets/UpdateEngagementRequestValidationErrors.php @@ -204,14 +204,14 @@ ], 'Meeting types is missing' => [ ['meeting_types' => null], - fn () => ['meeting_types' => __('You must select at least one way to attend the meeting.', ['attribute' => __('meeting types')])], + fn () => ['meeting_types' => __('You must select at least one way to attend the meeting.', ['attribute' => __('Ways to attend')])], [ 'format' => EngagementFormat::Interviews->value, ], ], 'Meeting types is not an array' => [ ['meeting_types' => MeetingType::InPerson->value], - fn () => ['meeting_types' => __('validation.array', ['attribute' => __('meeting types')])], + fn () => ['meeting_types' => __('validation.array', ['attribute' => __('Ways to attend')])], [ 'format' => EngagementFormat::Interviews->value, ], From 2ceac1e2e7562adf6d64a850acded7a64e67e4d8 Mon Sep 17 00:00:00 2001 From: Daniel Cho Date: Mon, 4 Dec 2023 11:02:38 -0500 Subject: [PATCH 16/20] fix: add update attributes for StoreDefinedTermRequest --- app/Http/Requests/StoreDefinedTermRequest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Http/Requests/StoreDefinedTermRequest.php b/app/Http/Requests/StoreDefinedTermRequest.php index 7ba66ef2a..b9416cca2 100644 --- a/app/Http/Requests/StoreDefinedTermRequest.php +++ b/app/Http/Requests/StoreDefinedTermRequest.php @@ -33,7 +33,9 @@ public function attributes(): array { return [ 'term' => __('term'), + 'term.*' => __('term'), 'definition' => __('definition'), + 'definition.*' => __('definition'), ]; } } From eab5babe96eed3f749c3cff016cffaa2b130120e Mon Sep 17 00:00:00 2001 From: Daniel Cho Date: Tue, 5 Dec 2023 09:34:33 -0500 Subject: [PATCH 17/20] fix: update based on PR feedback --- app/Http/Requests/DestroyUserRequest.php | 1 + app/Http/Requests/SaveUserDetailsRequest.php | 2 +- .../Requests/SaveUserLanguagesRequest.php | 2 +- app/Http/Requests/StoreInvitationRequest.php | 2 +- .../Requests/StoreOrganizationRequest.php | 2 + .../Requests/StoreOrganizationTypeRequest.php | 2 - .../Requests/UpdateAccessNeedsRequest.php | 1 + ...ationAndConsultationPreferencesRequest.php | 14 +- .../Requests/UpdateDefinedTermRequest.php | 2 + ...ationAndConsultationPreferencesRequest.php | 14 +- .../UpdateNotificationPreferencesRequest.php | 1 + resources/lang/en.json | 66 +++++++-- resources/lang/fr.json | 138 ++++++++++++++++++ 13 files changed, 212 insertions(+), 35 deletions(-) diff --git a/app/Http/Requests/DestroyUserRequest.php b/app/Http/Requests/DestroyUserRequest.php index 406c1b43b..ddd5f31d4 100644 --- a/app/Http/Requests/DestroyUserRequest.php +++ b/app/Http/Requests/DestroyUserRequest.php @@ -30,6 +30,7 @@ public function attributes(): array { return [ 'current_password' => __('current password'), + 'organization' => __('organization'), ]; } diff --git a/app/Http/Requests/SaveUserDetailsRequest.php b/app/Http/Requests/SaveUserDetailsRequest.php index 3ef882919..d60f77186 100644 --- a/app/Http/Requests/SaveUserDetailsRequest.php +++ b/app/Http/Requests/SaveUserDetailsRequest.php @@ -39,7 +39,7 @@ public function attributes(): array { return [ 'name' => __('full name'), - 'email' => __('email'), + 'email' => __('email address'), ]; } } diff --git a/app/Http/Requests/SaveUserLanguagesRequest.php b/app/Http/Requests/SaveUserLanguagesRequest.php index fbbc3032f..59ea9516e 100644 --- a/app/Http/Requests/SaveUserLanguagesRequest.php +++ b/app/Http/Requests/SaveUserLanguagesRequest.php @@ -37,7 +37,7 @@ public function attributes(): array 'invitation' => __('invitation'), 'context' => __('context'), 'role' => __('role'), - 'email' => __('email'), + 'email' => __('email address'), ]; } diff --git a/app/Http/Requests/StoreInvitationRequest.php b/app/Http/Requests/StoreInvitationRequest.php index b4bf6b1a8..340029f81 100644 --- a/app/Http/Requests/StoreInvitationRequest.php +++ b/app/Http/Requests/StoreInvitationRequest.php @@ -38,7 +38,7 @@ public function rules(): array public function attributes(): array { return [ - 'email' => __('email'), + 'email' => __('email address'), 'role' => __('role'), ]; } diff --git a/app/Http/Requests/StoreOrganizationRequest.php b/app/Http/Requests/StoreOrganizationRequest.php index 20daf8925..2a200d061 100644 --- a/app/Http/Requests/StoreOrganizationRequest.php +++ b/app/Http/Requests/StoreOrganizationRequest.php @@ -26,6 +26,8 @@ public function attributes(): array { return [ 'type' => __('organization type'), + 'name.en' => __('organization name (English)'), + 'name.fr' => __('organization name (French)'), ]; } diff --git a/app/Http/Requests/StoreOrganizationTypeRequest.php b/app/Http/Requests/StoreOrganizationTypeRequest.php index 760c132e7..a47463cef 100644 --- a/app/Http/Requests/StoreOrganizationTypeRequest.php +++ b/app/Http/Requests/StoreOrganizationTypeRequest.php @@ -32,8 +32,6 @@ public function attributes(): array { return [ 'type' => __('organization type'), - 'name.en' => __('organization name (English)'), - 'name.fr' => __('organization name (French)'), ]; } diff --git a/app/Http/Requests/UpdateAccessNeedsRequest.php b/app/Http/Requests/UpdateAccessNeedsRequest.php index 07a4616ef..07a771bf2 100644 --- a/app/Http/Requests/UpdateAccessNeedsRequest.php +++ b/app/Http/Requests/UpdateAccessNeedsRequest.php @@ -168,6 +168,7 @@ public function attributes(): array 'other' => __('other'), 'other_access_need' => __('other access need'), 'meeting_access_needs' => __('meeting access needs'), + 'meeting_access_needs.*' => __('meeting access needs'), 'signed_language_for_interpretation' => __('Signed language for interpretation'), 'spoken_language_for_interpretation' => __('Spoken language interpretation'), 'in_person_access_needs' => __('in person access needs'), diff --git a/app/Http/Requests/UpdateCommunicationAndConsultationPreferencesRequest.php b/app/Http/Requests/UpdateCommunicationAndConsultationPreferencesRequest.php index 7222447bd..44e37ed24 100644 --- a/app/Http/Requests/UpdateCommunicationAndConsultationPreferencesRequest.php +++ b/app/Http/Requests/UpdateCommunicationAndConsultationPreferencesRequest.php @@ -56,19 +56,19 @@ public function rules(): array public function attributes(): array { return [ - 'preferred_contact_person' => __('preferred contact person'), - 'email' => __('email'), - 'phone' => __('phone'), - 'vrs' => __('vrs'), + 'preferred_contact_person' => __('Preferred contact person'), + 'email' => __('email address'), + 'phone' => __('phone number'), + 'vrs' => __('I require Video Relay Service (VRS) for phone calls'), 'support_person_name' => __('support person’s name'), 'support_person_email' => __('support person’s email'), 'support_person_phone' => __('support person’s phone number'), 'support_person_vrs' => __('support person requires Video Relay Service (VRS) for phone calls'), - 'preferred_contact_method' => __('preferred contact method'), + 'preferred_contact_method' => __('Preferred contact method'), 'consulting_methods' => __('consulting methods'), 'consulting_methods.*' => __('consulting methods'), - 'meeting_types' => __('meeting types'), - 'meeting_types.*' => __('meeting types'), + 'meeting_types' => __('Ways to attend'), + 'meeting_types.*' => __('Ways to attend'), ]; } diff --git a/app/Http/Requests/UpdateDefinedTermRequest.php b/app/Http/Requests/UpdateDefinedTermRequest.php index 676806c6a..ffc19d9d9 100644 --- a/app/Http/Requests/UpdateDefinedTermRequest.php +++ b/app/Http/Requests/UpdateDefinedTermRequest.php @@ -33,7 +33,9 @@ public function attributes(): array { return [ 'term' => __('term'), + 'term.*' => __('term'), 'definition' => __('definition'), + 'definition.*' => __('definition'), ]; } } diff --git a/app/Http/Requests/UpdateIndividualCommunicationAndConsultationPreferencesRequest.php b/app/Http/Requests/UpdateIndividualCommunicationAndConsultationPreferencesRequest.php index f768ff50c..dd1e869d7 100644 --- a/app/Http/Requests/UpdateIndividualCommunicationAndConsultationPreferencesRequest.php +++ b/app/Http/Requests/UpdateIndividualCommunicationAndConsultationPreferencesRequest.php @@ -48,17 +48,17 @@ public function rules(): array public function attributes(): array { return [ - 'preferred_contact_person' => __('preferred contact person'), - 'email' => __('email'), - 'phone' => __('phone'), - 'vrs' => __('vrs'), + 'preferred_contact_person' => __('Preferred contact person'), + 'email' => __('email address'), + 'phone' => __('phone number'), + 'vrs' => __('I require Video Relay Service (VRS) for phone calls'), 'support_person_name' => __('support person’s name'), 'support_person_email' => __('support person’s email'), 'support_person_phone' => __('support person’s phone number'), 'support_person_vrs' => __('support person requires Video Relay Service (VRS) for phone calls'), - 'preferred_contact_method' => __('preferred contact method'), - 'meeting_types' => __('meeting types'), - 'meeting_types.*' => __('meeting types'), + 'preferred_contact_method' => __('Preferred contact method'), + 'meeting_types' => __('Ways to attend'), + 'meeting_types.*' => __('Ways to attend'), ]; } diff --git a/app/Http/Requests/UpdateNotificationPreferencesRequest.php b/app/Http/Requests/UpdateNotificationPreferencesRequest.php index 8663452cd..bcfa0d2a3 100644 --- a/app/Http/Requests/UpdateNotificationPreferencesRequest.php +++ b/app/Http/Requests/UpdateNotificationPreferencesRequest.php @@ -87,6 +87,7 @@ public function rules(): array public function attributes(): array { return [ + 'preferred_notification_method' => __('Preferred notification method'), 'notification_settings.consultants.channels' => __('Accessibility Consultant notification setting'), 'notification_settings.consultants.channels.*' => __('Accessibility Consultant notification setting'), 'notification_settings.connectors.channels' => __('Community Connector notification setting'), diff --git a/resources/lang/en.json b/resources/lang/en.json index 42c60dc95..a12d2f7cd 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -1,4 +1,5 @@ { + "\"About your organization\"": "\"About your organization\"", "\"About your organization\" (English)": "\"About your organization\" (English)", "\"About your organization\" (French)": "\"About your organization\" (French)", "(optional)": "(optional)", @@ -86,6 +87,7 @@ "accessibility and inclusion link title": "accessibility and inclusion link title", "Accessibility Consultant": "Accessibility Consultant", "Accessibility consultant application": "Accessibility consultant application", + "Accessibility Consultant notification setting": "Accessibility Consultant notification setting", "Accessibility Consultants": "Accessibility Consultants", "Accessibility Consultants could help you design consultations that are inclusive and accessible.": "Accessibility Consultants could help you design consultations that are inclusive and accessible.", "Accessibility Consultants — Individual": "Accessibility Consultants — Individual", @@ -187,9 +189,12 @@ "Approve estimate": "Approve estimate", "Approximate response time": "Approximate response time", "approximate response time": "approximate response time", + "Approximate response time (English)": "Approximate response time (English)", + "Approximate response time (French)": "Approximate response time (French)", "A project name must be provided in at least one language.": "A project name must be provided in at least one language.", "A project with this name already exists.": "A project with this name already exists.", "Area": "Area", + "area of accessibility planning and design": "area of accessibility planning and design", "Area of impact": "Area of impact", "Areas of accessibility": "Areas of accessibility", "Areas of accessibility you are interested in": "Areas of accessibility you are interested in", @@ -231,6 +236,7 @@ "Author: :author": "Author: :author", "Author name": "Author name", "author organization": "author organization", + "availability": "availability", "availability for Friday": "availability for Friday", "availability for Monday": "availability for Monday", "availability for Saturday": "availability for Saturday", @@ -254,6 +260,8 @@ "Be matched based on what your lived experiences are": "Be matched based on what your lived experiences are", "Between which times during the day will the interviews take place?": "Between which times during the day will the interviews take place?", "bio": "bio", + "bio (English)": "bio (English)", + "bio (French)": "bio (French)", "Black": "Black", "Black on brown": "Black on brown", "Black on white": "Black on white", @@ -343,6 +351,7 @@ "Communities your organization :represents_or_serves_and_supports": "Communities your organization :represents_or_serves_and_supports", "Community Connector": "Community Connector", "Community connector application": "Community connector application", + "Community Connector notification setting": "Community Connector notification setting", "Community Connectors": "Community Connectors", "Community Connectors could help you connect with groups that may be hard to reach otherwise.": "Community Connectors could help you connect with groups that may be hard to reach otherwise.", "Community Connectors — Individual": "Community Connectors — Individual", @@ -398,9 +407,9 @@ "Contacting you with notifications": "Contacting you with notifications", "contact person": "contact person", "Contact person": "Contact person", + "Contact person requires Video Relay Service (VRS) for phone calls": "Contact person requires Video Relay Service (VRS) for phone calls", "Contact person’s email": "Contact person’s email", "Contact person’s phone number": "Contact person’s phone number", - "Contact person’s vrs": "Contact person’s vrs", "Contact support": "Contact support", "Contact us": "Contact us", "Content": "Content", @@ -541,7 +550,6 @@ "Edit your project page": "Edit your project page", "Edit your role": "Edit your role", "Email": "Email", - "email": "email", "Email address": "Email address", "email address": "email address", "Email your certificate again": "Email your certificate again", @@ -557,10 +565,14 @@ "Engagement": "Engagement", "engagement": "engagement", "engagement description": "engagement description", + "engagement description (English)": "engagement description (English)", + "engagement description (French)": "engagement description (French)", "engagement format": "engagement format", "Engagement materials": "Engagement materials", "Engagement meetings": "Engagement meetings", "engagement name": "engagement name", + "engagement name (English)": "engagement name (English)", + "engagement name (French)": "engagement name (French)", "Engagements": "Engagements", "Engagements by organizations that I have saved on my notification list": "Engagements by organizations that I have saved on my notification list", "Engagements that are looking for people that my organization represents or supports": "Engagements that are looking for people that my organization represents or supports", @@ -852,9 +864,10 @@ "lived experiences": "lived experiences", "Lived or living experience": "Lived or living experience", "Living in urban, rural, or remote areas": "Living in urban, rural, or remote areas", - "locale": "locale", "Location": "Location", "Location :number": "Location :number", + "location city or town": "location city or town", + "location province or territory": "location province or territory", "location type": "location type", "Mailing Address": "Mailing Address", "Mailing address": "Mailing address", @@ -892,7 +905,8 @@ "meeting start time": "meeting start time", "meeting time zone": "meeting time zone", "meeting title": "meeting title", - "meeting types": "meeting types", + "meeting title (English)": "meeting title (English)", + "meeting title (French)": "meeting title (French)", "Member": "Member", "Members of our team have received the following training:": "Members of our team have received the following training:", "Men": "Men", @@ -989,14 +1003,6 @@ "Notification List": "Notification List", "Notification preferences": "Notification preferences", "Notifications": "Notifications", - "notification settings connectors": "notification settings connectors", - "notification settings consultants": "notification settings consultants", - "notification settings projects": "notification settings projects", - "notification settings projects creators": "notification settings projects creators", - "notification settings projects engagements": "notification settings projects engagements", - "notification settings projects types": "notification settings projects types", - "notification settings reports": "notification settings reports", - "notification settings updates": "notification settings updates", "notifications navigation": "notifications navigation", "Notify me or my support person directly": "Notify me or my support person directly", "Notify your organization’s contact person directly": "Notify your organization’s contact person directly", @@ -1041,11 +1047,14 @@ "Opens in new tab": "Opens in new tab", "open to other formats": "open to other formats", "optional": "optional", + "organization": "organization", "Organization details": "Organization details", "Organization information": "Organization information", "Organization information that will set you up for running consultations.": "Organization information that will set you up for running consultations.", "Organization name": "Organization name", "organization name": "organization name", + "organization name (English)": "organization name (English)", + "organization name (French)": "organization name (French)", "organizations and businesses to work on accessibility projects together.": "organizations and businesses to work on accessibility projects together.", "Organizations can decide which criteria they would like the participants for a project to have. They then have a choice between:": "Organizations can decide which criteria they would like the participants for a project to have. They then have a choice between:", "Organization selection criteria": "Organization selection criteria", @@ -1061,6 +1070,8 @@ "Other (please specify)": "Other (please specify)", "Other accepted format": "Other accepted format", "other accepted format": "other accepted format", + "other accepted format (English)": "other accepted format (English)", + "other accepted format (French)": "other accepted format (French)", "other accepted formats": "other accepted formats", "other access need": "other access need", "Other civil society organizations relevant to people with disabilities, Deaf people, and supporters": "Other civil society organizations relevant to people with disabilities, Deaf people, and supporters", @@ -1078,6 +1089,7 @@ "Our team does not have people with lived and living experiences of disability or being Deaf.": "Our team does not have people with lived and living experiences of disability or being Deaf.", "Our team has people with lived and living experiences of disability or being Deaf.": "Our team has people with lived and living experiences of disability or being Deaf.", "Outcomes and reports": "Outcomes and reports", + "Outcomes and reports other": "Outcomes and reports other", "out of scope": "out of scope", "Pacific Standard or Daylight Time": "Pacific Standard or Daylight Time", "page": "page", @@ -1120,7 +1132,6 @@ "Phase of consultation": "Phase of consultation", "Phases of consultation": "Phases of consultation", "Phone": "Phone", - "phone": "phone", "Phone call": "Phone call", "Phone calls": "Phone calls", "Phone number": "Phone number", @@ -1228,7 +1239,7 @@ "preferred": "preferred", "Preferred contact method": "Preferred contact method", "preferred contact method": "preferred contact method", - "preferred contact person": "preferred contact person", + "Preferred contact person": "Preferred contact person", "Preferred notification method": "Preferred notification method", "present": "present", "Preview page": "Preview page", @@ -1246,18 +1257,28 @@ "projectable type": "projectable type", "Project by :projectable": "Project by :projectable", "project context": "project context", + "project created by organization type notification setting": "project created by organization type notification setting", "Project details": "Project details", "Project duration": "Project duration", "Project end date": "Project end date", + "project engagement type notification setting": "project engagement type notification setting", "Project goals": "Project goals", "project goals": "project goals", + "Project goals (English)": "Project goals (English)", + "Project goals (French)": "Project goals (French)", "Project goals must be provided in at least one language.": "Project goals must be provided in at least one language.", "project id": "project id", "Project impact": "Project impact", "project languages": "project languages", "Project name": "Project name", "project name": "project name", + "project name (English)": "project name (English)", + "Project name (English)": "Project name (English)", + "project name (French)": "project name (French)", + "Project name (French)": "Project name (French)", "Project outcome": "Project outcome", + "Project outcome (English)": "Project outcome (English)", + "Project outcome (French)": "Project outcome (French)", "Project overview": "Project overview", "Project page incomplete": "Project page incomplete", "Project reports": "Project reports", @@ -1265,6 +1286,8 @@ "Projects and engagements by other organizations": "Projects and engagements by other organizations", "Projects by organizations that I have saved on my notification list": "Projects by organizations that I have saved on my notification list", "Project scope": "Project scope", + "Project scope (English)": "Project scope (English)", + "Project scope (French)": "Project scope (French)", "Project scope must be provided in at least one language.": "Project scope must be provided in at least one language.", "Projects I am contracted for": "Projects I am contracted for", "Projects I am participating in": "Projects I am participating in", @@ -1272,12 +1295,14 @@ "Projects involved in as a Community Connector": "Projects involved in as a Community Connector", "Projects involved in as a Consultation Participant": "Projects involved in as a Consultation Participant", "Projects I’m running": "Projects I’m running", + "projects notification setting": "projects notification setting", "Project start date": "Project start date", "Projects that are looking for people that my organization represents or supports": "Projects that are looking for people that my organization represents or supports", "Projects that are looking for someone with my lived experience": "Projects that are looking for someone with my lived experience", "Project team": "Project team", "Project timeframe": "Project timeframe", "Project Translations": "Project Translations", + "project type notification setting": "project type notification setting", "Pronouns": "Pronouns", "pronouns": "pronouns", "Provides Guidance and Resources": "Provides Guidance and Resources", @@ -1312,8 +1337,8 @@ "Recommended": "Recommended", "Recruit individuals who are Deaf or have disabilities to give input on your own projects.": "Recruit individuals who are Deaf or have disabilities to give input on your own projects.", "Recruitment": "Recruitment", - "recruitment": "recruitment", "Recruitment method": "Recruitment method", + "recruitment method": "recruitment method", "Refugees": "Refugees", "Refugees and\/or immigrants": "Refugees and\/or immigrants", "Regions": "Regions", @@ -1327,6 +1352,7 @@ "Regulated organizations": "Regulated organizations", "Regulated Organizations": "Regulated Organizations", "Regulated organizations hire a Community Connector to connect to certain communities that they may otherwise find difficult to reach. Providing the information about the communities that you have connections to, lets the government and business groups know how you could help them.": "Regulated organizations hire a Community Connector to connect to certain communities that they may otherwise find difficult to reach. Providing the information about the communities that you have connections to, lets the government and business groups know how you could help them.", + "Regulated Organization type": "Regulated Organization type", "Relevant experience": "Relevant experience", "Relevant experiences": "Relevant experiences", "Relevant experiences (including any volunteer or paid experience)": "Relevant experiences (including any volunteer or paid experience)", @@ -1346,6 +1372,7 @@ "Remove this link": "Remove this link", "Remove this location": "Remove this location", "Remove this training": "Remove this training", + "report notification setting": "report notification setting", "represent": "represent", "Representative organization": "Representative organization", "Representative organizations": "Representative organizations", @@ -1374,6 +1401,7 @@ "Review and publish engagement details": "Review and publish engagement details", "Review and publish your organization’s public page": "Review and publish your organization’s public page", "Review and publish your public page": "Review and publish your public page", + "review and updates notification settings": "review and updates notification settings", "Review engagement details": "Review engagement details", "Review project": "Review project", "Review project details": "Review project details", @@ -1514,6 +1542,10 @@ "Support organization": "Support organization", "Support organizations": "Support organizations", "Support person, :name": "Support person, :name", + "support person requires Video Relay Service (VRS) for phone calls": "support person requires Video Relay Service (VRS) for phone calls", + "support person’s email": "support person’s email", + "support person’s name": "support person’s name", + "support person’s phone number": "support person’s phone number", "Support phone": "Support phone", "Survey": "Survey", "Survey materials": "Survey materials", @@ -1676,6 +1708,7 @@ "To request an estimate, you must have filled out your project’s engagement details (and meeting information for workshops and focus groups).": "To request an estimate, you must have filled out your project’s engagement details (and meeting information for workshops and focus groups).", "Trainer": "Trainer", "Training": "Training", + "training": "training", "Training by: :author": "Training by: :author", "training date": "training date", "training name": "training name", @@ -1692,6 +1725,7 @@ "Twitter page": "Twitter page", "Two-factor authentication": "Two-factor authentication", "Type of organization": "Type of organization", + "type of Regulated Organization": "type of Regulated Organization", "Types of experiences or identities": "Types of experiences or identities", "Types of meetings offered": "Types of meetings offered", "Types of regulated organizations": "Types of regulated organizations", @@ -1728,8 +1762,8 @@ "Voice recording": "Voice recording", "Volunteer": "Volunteer", "VRS": "VRS", - "vrs": "vrs", "Ways to attend": "Ways to attend", + "ways to attend": "ways to attend", "Ways to participate": "Ways to participate", "We ask Accessibility Consultants for the following information:": "We ask Accessibility Consultants for the following information:", "We ask Community Connectors for the following information:": "We ask Community Connectors for the following information:", diff --git a/resources/lang/fr.json b/resources/lang/fr.json index a991a8803..f48e92754 100644 --- a/resources/lang/fr.json +++ b/resources/lang/fr.json @@ -1,4 +1,5 @@ { + "\"About your organization\"": "", "\"About your organization\" (English)": "« À propos de votre organisation » (en anglais)", "\"About your organization\" (French)": "À propos de votre organisation", "(optional)": "(optionnel)", @@ -86,6 +87,7 @@ "accessibility and inclusion link title": "titre du lien sur les mesures d’accessibilité et d’inclusion", "Accessibility Consultant": "Personne consultante en matière d’accessibilité", "Accessibility consultant application": "Devenir personne consultante en matière d’accessibilité", + "Accessibility Consultant notification setting": "", "Accessibility Consultants": "Personnes consultantes en matière d’accessibilité", "Accessibility Consultants could help you design consultations that are inclusive and accessible.": "Les personnes consultantes en matière d’accessibilité peuvent vous aider à concevoir des consultations qui soient inclusives et accessibles.", "Accessibility Consultants — Individual": "Personne consultante en matière d’accessibilité - Individu", @@ -127,6 +129,8 @@ "Additional information to join": "Information supplémentaire à joindre", "additional information to join": "information complémentaire à joindre", "Additional needs or concerns": "Besoins ou préoccupations supplémentaires", + "additional phone information": "", + "additional video information": "", "Add language": "Ajouter une langue", "Add link": "Ajouter un lien", "Add meeting": "Ajouter une réunion", @@ -139,6 +143,8 @@ "A follow-up to a previous project (such as a progress report)": "Un suivi pour un projet précédent (tel qu’un rapport d’étape)", "African": "Africain", "Age": "Âge", + "age bracket connections": "", + "age bracket constituencies": "", "Age group": "Groupe d’âge", "age group": "groupe d’âge", "Age groups": "Groupes d’âge", @@ -155,6 +161,7 @@ "All rights reserved.": "Tous droits réservés.", "Already on your block list": "Déjà sur votre liste de blocage", "Already on your notification list.": "Already on your notification list.", + "alternative meeting software": "", "Alternative text for images": "Texte de remplacement pour les images", "Although it is not compulsory, we highly recommend that you include English and French translations of your content.": "Bien que cela ne soit pas obligatoire, nous vous recommandons vivement d’inclure des traductions en anglais et en français de votre contenu.", "A meeting title must be provided in at least English or French.": "Le titre de la réunion doit être fourni au moins en anglais ou en français.", @@ -182,9 +189,12 @@ "Approve estimate": "Approuver le devis", "Approximate response time": "Temps de réponse approximatif", "approximate response time": "vos temps de réponse approximatifs", + "Approximate response time (English)": "", + "Approximate response time (French)": "", "A project name must be provided in at least one language.": "Un nom de projet doit être fourni dans au moins une langue.", "A project with this name already exists.": "Un projet portant ce nom existe déjà.", "Area": "Zone", + "area of accessibility planning and design": "", "Area of impact": "Domaine d’impact", "Areas of accessibility": "Areas of accessibility", "Areas of accessibility you are interested in": "Domaines relatifs à l’accessibilité qui vous intéressent", @@ -193,6 +203,8 @@ "Areas of interest": "Domaines d’intérêt", "Areas of your organization this project will impact": "Secteurs de votre organisation sur lesquels ce projet aura un impact", "area type": "area type", + "area type connections": "", + "area type constituencies": "", "Are you looking for individuals in specific provinces or territories or specific cities or towns?": "Cherchez-vous des personnes dans des provinces ou territoires spécifiques ou dans des villes ou villages spécifiques ?", "Are you sure you want to block :blockable?": "Voulez-vous vraiment bloquer :blockable?", "Are you sure you want to delete your account?": "Voulez-vous vraiment supprimer votre compte ?", @@ -224,6 +236,7 @@ "Author: :author": "Auteur : :author", "Author name": "Nom de l’auteur", "author organization": "author organization", + "availability": "", "availability for Friday": "disponibilité le vendredi", "availability for Monday": "disponibilité le lundi", "availability for Saturday": "disponibilité le samedi", @@ -247,12 +260,16 @@ "Be matched based on what your lived experiences are": "Be matched based on what your lived experiences are", "Between which times during the day will the interviews take place?": "Entre quels moments de la journée les entrevues auront-elles lieu ?", "bio": "bio", + "bio (English)": "", + "bio (French)": "", "Black": "Noir", "Black on brown": "Noir sur brun", "Black on white": "Noir sur blanc", "Black on yellow": "Noir sur jaune", "Block": "Bloquer", "Block :blockable": "Bloquer :bloquable", + "blockable id": "", + "blockable type": "", "Blocked individuals and organizations": "Personnes et organisations bloquées", "Body differences": "Différences corporelles", "Booking accessibility service providers": "Gestion de prestataires de services en matière d’accessibilité", @@ -334,6 +351,7 @@ "Communities your organization :represents_or_serves_and_supports": "Communautés que votre organisation :represents_or_serves_and_supports", "Community Connector": "Personne facilitatrice communautaire", "Community connector application": "Community connector application", + "Community Connector notification setting": "", "Community Connectors": "Personnes facilitatrices communautaires", "Community Connectors could help you connect with groups that may be hard to reach otherwise.": "Les personnes facilitatrices communautaires peuvent vous aider à entrer en contact avec des groupes qui seraient autrement difficiles à rejoindre.", "Community Connectors — Individual": "Personne facilitatrice communautaire - Individu", @@ -366,6 +384,7 @@ "Congratulations, :name!": "Félicitations, :name!", "Connecting the disability and Deaf communities and their supporters with ": "Une plateforme mettant en relation les communautés de personnes en situation de handicap et de personnes sourdes et leurs alliés avec ", "connecting to a Community Connector to help recruit Consultation Participants.": "la mise en relation avec une personne facilitratrice communautaire afin de faciliter le recrutement des personnes participant à la consultation.", + "connection lived experience": "", "Connect members of your community with governments and businesses who are looking for Consultation Participants. Help them learn how to best work with your community.": "Mettez les membres de votre communauté en contact avec les gouvernements et les entreprises qui recherchent des personnes pour participer à des consultations. Aidez-les à apprendre comment travailler au mieux avec votre communauté.", "Connect organizations with participants from my community": "Met en relation des organisations avec des personnes de ma communauté", "Connects the disability and Deaf communities and supporters with organizations that are “regulated” or supervised and monitored by the federal government, so that together they can work on accessibility projects, as required by the Accessible Canada Act.": "Le Connecteur pour l’accessibilité met en relation les communautés de personnes en situation de handicap et de personnes sourdes et leurs alliés avec des organisations qui sont réglementées ou contrôlées par le gouvernement fédéral, afin qu’elles puissent travailler ensemble sur des projets relatifs à l’accessibilité, comme l’exige la Loi canadienne sur l’accessibilité.", @@ -375,6 +394,7 @@ "Consultation Participants are required to share their province\/territory, their city\/town, and whether or not they identify as someone with a disability, Deaf or a supporter. All of the remaining questions are optional. For multiple choice questions, there is an option to select “prefer not to answer”.": "Les personnes participant aux consultations doivent indiquer leur province\/territoire, leur ville\/village et préciser si elles s’identifient ou non comme une personne en situation de handicap, une personne sourde ou une personne soutenant ces personnes. Toutes les autres questions sont facultatives. Pour les questions à choix multiples, une option « préfère ne pas répondre » est disonible.", "Consultation Participants — Individual": "Personne participante à la consultation - Individu", "Consultations": "Consultations", + "consulting methods": "", "Consulting services": "Services de consultation", "Consulting with a Community Organization": "Consultation auprès d’une organisation communautaire", "Contact": "Contact", @@ -387,6 +407,7 @@ "Contacting you with notifications": "Vous contacter grâce à des notifications", "contact person": "contact person", "Contact person": "Personne contact", + "Contact person requires Video Relay Service (VRS) for phone calls": "", "Contact person’s email": "Adresse courriel de la personne contact", "Contact person’s phone number": "Numéro de téléphone de la personne contact", "Contact support": "Contactez le support", @@ -395,6 +416,7 @@ "Content added": "Contenu ajouté", "Content added, unsaved changes": "Contenu ajouté, modifications non sauvegardées", "Content types": "Types de contenus", + "context": "", "Continue": "Continuer", "Contracted": "Contracted", "Contracts": "Contrats", @@ -434,6 +456,7 @@ "creating an open project, where anyone who matches their criteria can sign up. ": "créer un projet ouvert, où quiconque correspond aux critères peut s’inscrire. ", "Cross disability (includes people with disabilities, Deaf people, and supporters)": "Polyhandicap (comprend les personnes en situation de handicap, les personnes sourdes et les personnes qui les soutiennent)", "Current password": "Mot de passe actuel", + "current password": "", "Customize": "Personnaliser", "Customize this website’s accessibility": "Personnalisez les paramètres d’accessibilité de ce site Internet", "Dark theme": "Thème sombre", @@ -452,6 +475,7 @@ "Decline": "Refuser", "Deepen understanding": "Approfondissement de la compréhension", "Deepen understanding about the systemic barriers (laws, policies, practices, and culture) underlying the experiences that consultation participants report": "Deepen understanding about the systemic barriers (laws, policies, practices, and culture) underlying the experiences that consultation participants report", + "definition": "", "Delete account": "Supprimer le compte", "Delete my page": "Supprimer ma page", "Delete regulated organization": "Supprimer l’organisation sous réglementation fédérale", @@ -467,7 +491,10 @@ "Developing an accessibility plan": "Développement d’un plan sur l’accessiblité", "Developmental disabilities": "Déficience intellectuelle (et autres troubles du développement)", "Did you know…": "Saviez-vous que…", + "directions": "", "Disability and\/or Deaf identity": "Handicap et\/ou identité sourde", + "disability and deaf connections": "", + "disability and deaf constituencies": "", "Disability and Deaf groups they are looking for": "Groupes de personnes en situation de handicap ou de personnes sourdes qu’ils cherchent", "Disability and Deaf representative organizations": "Organisations représentant les personnes en situation de handicap et les personnes sourdes", "Disability and Deaf support organizations": "Organisation soutenant les personnes en situation de handicap et les personnes sourdes", @@ -478,6 +505,8 @@ "disability type": "type de handicap", "Disconnected rooms for down-time": "Salles isolées pour les temps morts", "Dismiss": "Ignorer", + "document access needs": "", + "document languages": "", "Documents will be sent to participants by:": "Les documents seront envoyés aux personnes participantes par :", "Does :name have lived experience of the people they can connect to?": ":name a-t-il\/a-t-elle une expérience vécue de la réalité des personnes auprès desquelles il\/elle peut servir d’intermédiaire ?", "Does your organization :represent_or_serve_and_support a specific age bracket or brackets?": "Est-ce que votre organisation représente une ou plusieurs tranches d’âge spécifiques ?", @@ -536,9 +565,14 @@ "Engagement": "Consultation", "engagement": "consultation", "engagement description": "description de la consultation", + "engagement description (English)": "", + "engagement description (French)": "", + "engagement format": "", "Engagement materials": "Documents de consultation", "Engagement meetings": "Réunions de la consultation", "engagement name": "nom de la consultation", + "engagement name (English)": "", + "engagement name (French)": "", "Engagements": "Consultations", "Engagements by organizations that I have saved on my notification list": "Consultations menées par les organisations que j’ai enregistrés dans ma liste de notifications", "Engagements that are looking for people that my organization represents or supports": "Consultations qui recherchent des personnes que mon organisation représente ou soutient", @@ -558,6 +592,8 @@ "ethnoracial group": "ethnoracial group", "Ethnoracial identity": "Identité ethnoraciale", "ethnoracial identity": "identité ethnoraciale", + "ethnoracial identity connections": "", + "ethnoracial identity constituencies": "", "Experiences": "Expériences", "experience working with organizations to create inclusive consultations, identify barriers, and create accessibility plans.": "expérience de travail avec des organisations pour créer des consultations inclusives, identifier les obstacles et créer des plans en matière d’accessibilité.", "External team": "Équipe externe", @@ -584,6 +620,7 @@ "Finding out about new projects": "Découvrir les nouveaux projets", "Find learning materials, best practices, and variety of tools to help you throughout the consultation process.": "Supports d’apprentissage, meilleures pratiques et une variété d’outils pour vous aider tout au long du processus de consultation.", "Find people with disabilities, Deaf people and community organizations (for example, disability or other relevant civil society organizations, like Indigenous groups), to consult with on your accessibility project.": "Trouvez des personnes en situation de handicap, des personnes sourdes et des organisations communautaires (par exemple, des organisations de personnes en situation de handicap ou d’autres organisations pertinentes de la société civile, comme les groupes autochtones), à consulter dans le cadre de votre projet en matière d’accessibilité.", + "finished introduction": "", "First language": "Première langue", "first language": "first language", "First Nations": "Premières Nations", @@ -623,6 +660,8 @@ "further directions": "autres directives", "Gender and sexual identity": "Identités sexuelles et de genre", "Gender and sexuality": "Genre et sexualité", + "gender and sexuality connections": "", + "gender and sexuality constituencies": "", "Gender diverse": "Gender diverse", "Gender fluid people": "Personnes de genre fluide", "Gender identity": "Identité de genre", @@ -653,6 +692,18 @@ "groups you can connect to": "groupes auprès desquels vous pouvez agir comme intermédiaire", "Guidelines and best practices": "Lignes directrices et meilleures pratiques", "Hard-of-hearing": "Personnes malentendantes", + "has age bracket connections": "", + "has age bracket constituencies": "", + "has ethnoracial identity connections": "", + "has ethnoracial identity constituencies": "", + "has gender and sexuality connections": "", + "has gender and sexuality constituencies": "", + "has indigenous connections": "", + "has indigenous constituencies": "", + "has other disability connection": "", + "has other disability constituency": "", + "has other ethnoracial identity connection": "", + "has other ethnoracial identity constituency": "", "Have more questions?": "Vous avez encore des questions ?", "Have questions?": "Vous avez des questions ?", "Have trouble meeting the access needs of your participants?": "Vous avez du mal à répondre aux besoins en matière d’accessibilité des personnes participantes ?", @@ -713,6 +764,8 @@ "Including government departments, agencies and Crown Corporations": "Comprend les ministères, les agences et les sociétés d'État", "Incomplete": "Vous n’avez pas encore complété cette étape.", "Indigenous": "Autochtone", + "indigenous connections": "", + "indigenous constituencies": "", "Indigenous group": "Indigenous group", "Indigenous identity": "Indigenous identity", "Individual": "Individu", @@ -727,10 +780,12 @@ "Initiated by": "Lancé par", "In order to create a successful exchange, we ask Consultation Participants to provide this information so that The Accessibility Exchange can match Consultation Participants with an engagement that is looking for someone with your experiences.": "Afin de créer un échange réussi, nous demandons aux personnes participant à des consultations de fournir ces informations afin que le Connecteur pour l’accessibilité puisse mettre en relation les participants à des consultations avec une consultation à la recherche d’une personne ayant votre expérience.", "In person": "En personne", + "in person access needs": "", "In progress": "En cours", "In Progress": "En cours", "Interests": "Intérêts", "Internal team": "Équipe interne", + "intersectional": "", "Intersectional - This engagement is looking for people who have all sorts of different identities and lived experiences, such as race, gender, age, sexual orientation, and more.": "Intersectionnel - Cette consultation s’adresse à toute personne, peu importe leurs axes d’identités intersectionnels (telles que la race, le sexe, l’âge, l’orientation sexuelle) et leurs expériences vécues.", "Intersectional outreach": "Approche intersectionnelle", "Intervenor": "Intervenant", @@ -740,6 +795,7 @@ "Interviews will take place between :start and :end.": "Les entrevues auront lieu dans la période du :start au :end.", "Introduction video": "Vidéo de présentation", "Inuit": "Inuit", + "invitation": "", "Invite": "Envoyer des invitations", "Invite new member": "Inviter un nouveau membre", "Invite others to your organization": "Invitez d’autres personnes à rejoindre votre organisation", @@ -759,11 +815,14 @@ "Join our accessibility community": "Rejoignez notre communauté en faveur de l’accessibilité", "Keeping my information up to date": "Maintenir mes informations à jour", "Language": "Langue", + "language": "", "Language: :locale": "Langue: :locale", "Language :language added.": "Langue :language ajoutée.", "Language :language removed.": "Langue :language supprimée.", "Language :number": "Langue :number", "Language added.": "Langue ajoutée.", + "language connections": "", + "language constituencies": "", "Language groups": "Communautés linguistiques", "Language preferences": "Préférences linguistiques", "Language removed.": "Langue supprimée.", @@ -798,6 +857,8 @@ "link to join the meeting": "lien pour rejoindre la réunion", "Lived and living experiences": "Expériences vécues", "Lived experience": "Expérience vécue", + "lived experience connections": "", + "lived experience constituencies": "", "lived experience of disability, or of being Deaf, or both": "l’expérience vécue du handicap, de la surdité, ou des deux", "lived experience of disability or of being Deaf, or of both": "expérience vécue du handicap ou de la surdité, ou des deux", "lived experiences": "lived experiences", @@ -805,6 +866,9 @@ "Living in urban, rural, or remote areas": "Vivant dans des zones urbaines, rurales ou éloignées", "Location": "Emplacement", "Location :number": "Emplacement :number", + "location city or town": "", + "location province or territory": "", + "location type": "", "Mailing Address": "Adresse postale", "Mailing address": "Adresse postale", "main menu": "menu principal", @@ -832,13 +896,17 @@ "Materials will be provided in the following languages:": "Le matériel sera disponible dans les langues suivantes :", "Me": "Moi", "means that a field is required.": "singifie qu’un champ est requis.", + "meeting access needs": "", "meeting date": "date de la réunion", "Meeting dates": "Dates de réunion", "meeting end time": "heure de fin de la réunion", "Meetings": "Réunions", + "meeting software": "", "meeting start time": "heure de début de la réunion", "meeting time zone": "fuseau horaire de la réunion", "meeting title": "titre de la réunion", + "meeting title (English)": "", + "meeting title (French)": "", "Member": "Membre", "Members of our team have received the following training:": "Les membres de notre équipe ont suivi les formations suivantes :", "Men": "Hommes", @@ -890,6 +958,7 @@ "New Estimate Request from :projectable": "Nouvelle demande de devis de :projectable", "Newfoundland and Labrador": "Terre-Neuve-et-Labrador", "Newfoundland Standard or Daylight Time": "Heure normale ou heure avancée de Terre-Neuve", + "new language": "", "New password": "Nouveau mot de passe", "New project": "Nouveau projet", "New reports uploaded": "Nouveaux rapports téléversés", @@ -928,6 +997,8 @@ "Notes": "Remarques", "Not everyone has had access to paid or volunteer experiences, but there are a lot of experiences that build certain skills and strengths. You can share more about that here. If you have had paid or volunteer experiences, you can also include that.": "Tout le monde n’a pas forcément eu la possibilité de vivre des expériences rémunérées ou bénévoles, mais il existe de nombreuses expériences qui permettent de développer certaines compétences et forces. Vous pouvez en parler ici. Si vous avez eu des expériences rémunérées ou bénévoles, vous pouvez également le mentionner.", "Nothing found.": "Rien n’a été trouvé.", + "notificationable id": "", + "notificationable type": "", "Notification list": "Liste des notifications", "Notification List": "Liste des notifications", "Notification preferences": "Préférences de notification", @@ -974,12 +1045,16 @@ "Ontario": "Ontario", "Open call": "Invitation ouverte", "Opens in new tab": "S’ouvre dans un nouvel onglet", + "open to other formats": "", "optional": "optionnel", + "organization": "", "Organization details": "Détails de l’organisation", "Organization information": "Informations sur l’organisation", "Organization information that will set you up for running consultations.": "Renseignements sur l’organisation qui vous permettront de mener des consultations.", "Organization name": "Nom de l’organisation", "organization name": "nom de l’organisation", + "organization name (English)": "", + "organization name (French)": "", "organizations and businesses to work on accessibility projects together.": "les organisations et entreprises afin de travailler ensemble sur des projets relatifs à l’accessibilité.", "Organizations can decide which criteria they would like the participants for a project to have. They then have a choice between:": "Les organisations peuvent décider des critères qu’elles souhaitent voir figurer parmi les personnes participantes à un projet. Elles ont alors le choix entre :", "Organization selection criteria": "Critères de sélection des organisations", @@ -987,21 +1062,35 @@ "Organizations that provide support “for” disability, Deaf, and family-based members. Not constituted primarily by people with disabilities.": "Organisations qui offrent du soutien ou des services aux personnes en situation de handicap, les personnes sourdes et les membres de la famille. Ne sont pas constituées principalement de personnes en situation de handicap.", "Organizations which have some constituency of persons with disabilities, Deaf persons, or family members, but these groups are not their primary mandate. Groups served, for example, can include: Indigenous organizations, 2SLGBTQ+ organizations, immigrant and refugee groups, and women’s groups.": "Organisations qui comptent parmi leurs membres des personnes en situation de handicap, des personnes sourdes ou des membres de leur famille, mais pour qui ces groupes ne constituent pas leur vocation première. Les groupes desservis peuvent inclure : les organisations autochtones, les organisations 2SLGBTQ+, les groupes de personnes migrantes et réfugiées et les groupes de femmes.", "Organizations “of” disability, Deaf, and family-based organizations. Constituted primarily by people with disabilities.": "Organisations de personnes en situation de handicap, de personnes sourdes, et de familles. Constituées principalement de personnes en situation de handicap.", + "organization type": "", "Organization website": "Site Internet de l’organisation", "Other": "Autre", + "other": "", "Other (please describe)": "Autre (veuillez décrire)", "Other (please specify)": "Autre (veuillez préciser)", "Other accepted format": "Autre format accepté", "other accepted format": "autre format accepté", + "other accepted format (English)": "", + "other accepted format (French)": "", + "other accepted formats": "", + "other access need": "", "Other civil society organizations relevant to people with disabilities, Deaf people, and supporters": "Autres organisations de la société civile pertinentes pour les personnes en situation de handicap, les personnes sourdes et leurs réseaux de soutien", + "other disability connection": "", + "other disability constituency": "", + "other ethnoracial identity connection": "", + "other ethnoracial identity constituency": "", "Other identities": "Autres axes d’identité", "Other identity groups": "Autres groupes identitaires", + "other identity type": "", + "other payment type": "", "Other public sector organization, which is regulated by the Accessible Canada Act": "Autre organisation du secteur public qui est réglementée par la Loi canadienne sur l’accessibilité", "Other – in-person or virtual meeting": "Autre - réunion en personne ou virtuelle", "Other – written or recorded response": "Autre – réponse écrite ou enregistrée", "Our team does not have people with lived and living experiences of disability or being Deaf.": "Notre équipe ne compte pas de personnes en situation de handicap ou de personne sourdes, ou de personnes ayant une expérience vécue du handicap ou de la surdité.", "Our team has people with lived and living experiences of disability or being Deaf.": "Notre équipe compte des personnes en situation de handicap ou des personnes sourdes, ou des personnes ayant une expérience vécue du handicap ou de la surdité.", "Outcomes and reports": "Résultats et rapports", + "Outcomes and reports other": "", + "out of scope": "", "Pacific Standard or Daylight Time": "Heure normale ou avancée du Pacifique", "page": "page", "Page also available in:": "Page également disponible en :", @@ -1011,6 +1100,7 @@ "Page title": "Titre de la page", "Page translations": "Traductions de la page", "Paid": "Opportunité rémunérée", + "paid": "", "Pain-related disabilities": "Incapacités liées à la douleur", "Parliamentary entities": "Entités parlementaires", "Participant": "Personne participante", @@ -1148,9 +1238,13 @@ "Prefer not to answer": "Préfère ne pas répondre", "preferred": "préféré", "Preferred contact method": "Méthode de contact privilégiée", + "preferred contact method": "", + "Preferred contact person": "", "Preferred notification method": "Méthode de notification privilégiée", "present": "présent", "Preview page": "Prévisualiser la page", + "previous project": "", + "previous project id": "", "Pricing": "Tarification", "Prince Edward Island": "Île-du-Prince-Édouard", "Printed version of engagement documents": "Version imprimée des documents de consultation", @@ -1159,17 +1253,32 @@ "Privacy Policy": "Politique de confidentialité", "Procurement": "Approvisionnement", "project": "projet", + "projectable id": "", + "projectable type": "", "Project by :projectable": "Projet par :projectable", + "project context": "", + "project created by organization type notification setting": "", "Project details": "Détails du projet", "Project duration": "Durée du projet", "Project end date": "Date de fin du projet", + "project engagement type notification setting": "", "Project goals": "Objectifs du projet", "project goals": "objectifs du projet", + "Project goals (English)": "", + "Project goals (French)": "", "Project goals must be provided in at least one language.": "Les objectifs du projet doivent être fournis dans au moins une langue.", + "project id": "", "Project impact": "Impact du projet", + "project languages": "", "Project name": "Nom du projet", "project name": "nom du projet", + "project name (English)": "", + "Project name (English)": "", + "project name (French)": "", + "Project name (French)": "", "Project outcome": "Résultat du projet", + "Project outcome (English)": "", + "Project outcome (French)": "", "Project overview": "Aperçu du projet", "Project page incomplete": "Project page incomplete", "Project reports": "Rapports de projets", @@ -1177,6 +1286,8 @@ "Projects and engagements by other organizations": "Projets et consultations d’autres organisations", "Projects by organizations that I have saved on my notification list": "Projets des organisations que j’ai enregistrées dans ma liste de notification", "Project scope": "Portée du projet", + "Project scope (English)": "", + "Project scope (French)": "", "Project scope must be provided in at least one language.": "La portée du projet doit être fournie dans au moins une langue.", "Projects I am contracted for": "Projets pour lesquels je suis sous contrat", "Projects I am participating in": "Projets auxquels je participe", @@ -1184,12 +1295,14 @@ "Projects involved in as a Community Connector": "Projects involved in as a Community Connector", "Projects involved in as a Consultation Participant": "Projects involved in as a Consultation Participant", "Projects I’m running": "Projets que je dirige", + "projects notification setting": "", "Project start date": "Date de début du projet", "Projects that are looking for people that my organization represents or supports": "Projets cherchant des personnes que mon organisation représente ou soutient", "Projects that are looking for someone with my lived experience": "Projets cherchant une personne ayant une expérience vécue similaire à la mienne", "Project team": "Équipe du projet", "Project timeframe": "Echéancier du projet", "Project Translations": "Traductions du projet", + "project type notification setting": "", "Pronouns": "Pronons", "pronouns": "pronons", "Provides Guidance and Resources": "Un lieu pour trouver des conseils et des ressources", @@ -1199,6 +1312,7 @@ "Providing this information will help us match you to projects that are working on areas of interest to you.": "Fournir ces informations nous aidera à vous jumeler à des projets qui portent sur des domaines qui vous intéressent.", "Province or territory": "Province ou territoire", "province or territory": "province ou territoire", + "public outcomes": "", "Public profile": "Profil public", "Publish": "Publier", "Published": "Publiée", @@ -1206,6 +1320,7 @@ "Published on :date": "Publié le :date", "Publish page": "Publier la page", "Quebec": "Québec", + "questions": "", "Questions are sent to participants by:": "Les questions sont envoyées aux personnes participantes par :", "Quick exit": "Sortie rapide", "Quick links": "Liens rapides", @@ -1223,6 +1338,7 @@ "Recruit individuals who are Deaf or have disabilities to give input on your own projects.": "Recrutez des personnes sourdes ou en situation de handicap pour qu’elles donnent leur avis sur vos projets.", "Recruitment": "Recrutement", "Recruitment method": "Méthode de recrutement", + "recruitment method": "", "Refugees": "Refugees", "Refugees and\/or immigrants": "Personnes réfugiées ou migrantes", "Regions": "Régions", @@ -1236,6 +1352,7 @@ "Regulated organizations": "Organisations sous réglementation fédérale", "Regulated Organizations": "Organisations sous réglementation fédérale", "Regulated organizations hire a Community Connector to connect to certain communities that they may otherwise find difficult to reach. Providing the information about the communities that you have connections to, lets the government and business groups know how you could help them.": "Les organismes réglementés font appel à une personne facilitatrice communautaire afin d’établir des liens avec certaines communautés qu’ils pourraient autrement avoir du mal à rejoindre. En fournissant les informations sur les communautés avec lesquelles vous avez des liens, vous permettez au gouvernement et aux entreprises de savoir comment vous pourriez les aider.", + "Regulated Organization type": "", "Relevant experience": "Expérience pertinente", "Relevant experiences": "Expériences pertinentes", "Relevant experiences (including any volunteer or paid experience)": "Expériences pertinentes (y compris toute expérience bénévole ou rémunérée)", @@ -1255,6 +1372,7 @@ "Remove this link": "Retirer ce lien", "Remove this location": "Retirer cet emplacement", "Remove this training": "Retirer cette formation", + "report notification setting": "", "represent": "représenter", "Representative organization": "Organisation représentative", "Representative organizations": "Organisation de personnes en situation de handicap ou de personnes sourdes", @@ -1279,14 +1397,18 @@ "Results": "Résultats", "Returned": "Retourné", "Return to dashboard": "Retour au tableau de bord", + "return to engagement": "", "Review and publish engagement details": "Réviser et publier les détails de la consultation", "Review and publish your organization’s public page": "Révisez et publiez la page publique de votre organisation", "Review and publish your public page": "Révisez et publiez votre page publique", + "review and updates notification settings": "", "Review engagement details": "Réviser les détails de la consultation", "Review project": "Réviser le projet", "Review project details": "Vérifier les détails du projet", "Role": "Rôle", + "role": "", "Roles": "Rôles", + "roles": "", "Roles:": "Rôles :", "Roles and permissions": "Rôles et permissions", "Run by": "Dirigé par", @@ -1346,6 +1468,7 @@ "Show that you are looking for a Community Connector": "Indiquer que vous êtes à la recherche d’une personne facilitatrice communautaire", "show up on search results for them": "apparaître dans les résultats de recherche", "Signed language for interpretation": "Langue signée pour l’interprétation", + "signed language for translation": "", "Sign in": "S’identifier", "Sign language interpretation": "Interprétation en langue des signes", "Sign language interpretations": "Interprétation en langue des signes", @@ -1419,6 +1542,10 @@ "Support organization": "Organisation de soutien", "Support organizations": "Organisation de soutien", "Support person, :name": "Nom de la personne accompagnatrice, :name", + "support person requires Video Relay Service (VRS) for phone calls": "", + "support person’s email": "", + "support person’s name": "", + "support person’s phone number": "", "Support phone": "Support phone", "Survey": "Sondage", "Survey materials": "Documents du sondage", @@ -1432,12 +1559,14 @@ "Tap into our support network": "Profitez de notre réseau de soutien", "Team contact": "Contact de l’équipe", "Team Invitation": "Invitation à rejoindre une équipe", + "team size": "", "Tell us about who you are.": "Dites-nous en plus à propos de vous.", "Tell us about your organization, its mission, and what you offer.": "Parlez-nous de votre organisation, de sa mission et de ce que vous offrez.", "Tell us your business name": "Tell us your business name", "Tell us your organization’s name": "Indiquez-nous le nom de votre organisation", "Templates and forms": "Modèles et formulaires", "Temporary disabilities": "Incapacités temporaires", + "term": "", "terms of service": "conditions d’utilisation", "Terms of Service": "Conditions d’utilisation", "Text": "Texte", @@ -1561,6 +1690,7 @@ "Time and date": "Heure et date", "Times during the day interviews will be happening": "Heures auxquelles les entrevues auront lieu durant la journée", "Time zone": "Fuseau horaire", + "timezone": "", "Title of meeting": "Titre de la réunion", "Title of role": "Titre du rôle ou du poste", "Title of Role": "Titre du rôle ou du poste", @@ -1578,6 +1708,7 @@ "To request an estimate, you must have filled out your project’s engagement details (and meeting information for workshops and focus groups).": "Pour demander un devis, vous devez avoir rempli les détails de la consultation en lien avec votre projet ( ainsi que les informations relatives aux réunions pour les ateliers et les groupes de discussion).", "Trainer": "Personne fomatrice", "Training": "Formation", + "training": "", "Training by: :author": "Training by: :author", "training date": "training date", "training name": "training name", @@ -1586,12 +1717,15 @@ "training organization or trainer website address": "training organization or trainer website address", "Training Participant": "Personne cherchant à se former", "Training your team has received": "Formation que votre équipe a suivie", + "translatable id": "", + "translatable type": "", "Translations": "Traductions", "Trans people": "Personnes transgenres", "Tuesday": "Mardi", "Twitter page": "Page Twitter", "Two-factor authentication": "Authentification à deux facteurs", "Type of organization": "Type d’organisation", + "type of Regulated Organization": "", "Types of experiences or identities": "Types d’expériences ou d’identités", "Types of meetings offered": "Types de réunions proposées", "Types of regulated organizations": "Types of regulated organizations", @@ -1629,6 +1763,7 @@ "Volunteer": "Bénévole", "VRS": "SRV", "Ways to attend": "Façons de participer", + "ways to attend": "", "Ways to participate": "Façons de participer", "We ask Accessibility Consultants for the following information:": "Nous demandons aux personnes consultantes en matière d’accessibilité de fournir les informations suivantes :", "We ask Community Connectors for the following information:": "Nous demandons aux personnes facilitatrices communautaires de fournir les informations suivantes :", @@ -1713,6 +1848,7 @@ "Which of these areas can you help a regulated organization with?": "Dans lesquels de ces domaines pouvez-vous aider une organisation réglementée ?", "White": "Blanc", "White on black": "Blanc sur noir", + "who": "", "Who can be a :role?": "Qui peut être une :role?", "Who do you want to engage?": "Qui voulez-vous consulter ?", "who is going through the results": "qui passe en revue les résultats", @@ -1722,6 +1858,7 @@ "Who you’re joining as": "Quel type de compte voulez-vous créer?", "Who’s responsible for going through results and producing an outcome": "Who’s responsible for going through results and producing an outcome", "Why do we ask for this information?": "Pourquoi demandons-nous ces informations ?", + "window flexibility": "", "Women": "Femmes", "Word document": "Document Word", "Working age adults (15–64)": "Adultes en âge de travailler (15-64)", @@ -1732,6 +1869,7 @@ "Would you like to be notified directly when you are added to an engagement as a Community Connector?": "Aimeriez vous recevoir une notification lorsque vous êtes ajouté à une consultation en tant que personne facilitatrice communautaire ?", "Writing": "Réponse écrite", "Writing accessibility reports": "Rédaction de rapports relatifs à l’accessibilité", + "written language for translation": "", "Written language translation": "Traduction en langue écrite", "Written or recorded responses": "Réponses écrites ou enregistrées", "Wrong answer": "Mauvaise réponse", From 7bb3abf4f2d251da9906cfd8d0252bc42adac088 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 5 Dec 2023 13:48:08 -0500 Subject: [PATCH 18/20] fix: update DestroyUserRequest attribute --- app/Http/Requests/DestroyUserRequest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Requests/DestroyUserRequest.php b/app/Http/Requests/DestroyUserRequest.php index ddd5f31d4..2b1c07c5e 100644 --- a/app/Http/Requests/DestroyUserRequest.php +++ b/app/Http/Requests/DestroyUserRequest.php @@ -30,7 +30,7 @@ public function attributes(): array { return [ 'current_password' => __('current password'), - 'organization' => __('organization'), + 'organizations' => __('organizations'), ]; } From ca830d5c6f900b4062ef703b2990ff263e24d56b Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 5 Dec 2023 14:05:53 -0500 Subject: [PATCH 19/20] fix: update attributes of StoreEngagementLanguagesRequest --- app/Http/Requests/StoreEngagementLanguagesRequest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Requests/StoreEngagementLanguagesRequest.php b/app/Http/Requests/StoreEngagementLanguagesRequest.php index 905f0e76d..d67d3c390 100644 --- a/app/Http/Requests/StoreEngagementLanguagesRequest.php +++ b/app/Http/Requests/StoreEngagementLanguagesRequest.php @@ -26,6 +26,7 @@ public function attributes(): array { return [ 'languages' => __('languages'), + 'languages.*' => __('languages'), ]; } } From 6dd80165bf9b43ab6915342e64e2d13a3029193c Mon Sep 17 00:00:00 2001 From: Daniel Cho Date: Wed, 6 Dec 2023 09:02:00 -0500 Subject: [PATCH 20/20] fix: run composer localize --- resources/lang/en.json | 2 +- resources/lang/fr.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/lang/en.json b/resources/lang/en.json index a12d2f7cd..212990885 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -1047,7 +1047,6 @@ "Opens in new tab": "Opens in new tab", "open to other formats": "open to other formats", "optional": "optional", - "organization": "organization", "Organization details": "Organization details", "Organization information": "Organization information", "Organization information that will set you up for running consultations.": "Organization information that will set you up for running consultations.", @@ -1055,6 +1054,7 @@ "organization name": "organization name", "organization name (English)": "organization name (English)", "organization name (French)": "organization name (French)", + "organizations": "organizations", "organizations and businesses to work on accessibility projects together.": "organizations and businesses to work on accessibility projects together.", "Organizations can decide which criteria they would like the participants for a project to have. They then have a choice between:": "Organizations can decide which criteria they would like the participants for a project to have. They then have a choice between:", "Organization selection criteria": "Organization selection criteria", diff --git a/resources/lang/fr.json b/resources/lang/fr.json index f48e92754..e2e8dd30c 100644 --- a/resources/lang/fr.json +++ b/resources/lang/fr.json @@ -1047,7 +1047,6 @@ "Opens in new tab": "S’ouvre dans un nouvel onglet", "open to other formats": "", "optional": "optionnel", - "organization": "", "Organization details": "Détails de l’organisation", "Organization information": "Informations sur l’organisation", "Organization information that will set you up for running consultations.": "Renseignements sur l’organisation qui vous permettront de mener des consultations.", @@ -1055,6 +1054,7 @@ "organization name": "nom de l’organisation", "organization name (English)": "", "organization name (French)": "", + "organizations": "", "organizations and businesses to work on accessibility projects together.": "les organisations et entreprises afin de travailler ensemble sur des projets relatifs à l’accessibilité.", "Organizations can decide which criteria they would like the participants for a project to have. They then have a choice between:": "Les organisations peuvent décider des critères qu’elles souhaitent voir figurer parmi les personnes participantes à un projet. Elles ont alors le choix entre :", "Organization selection criteria": "Critères de sélection des organisations",