fix: update based on PR feedback

accessibility-exchange · Dec 1, 2023 · e5f47a5 · e5f47a5
1 parent 08b6b78
commit e5f47a5
Show file tree

Hide file tree

Showing 31 changed files with 151 additions and 49 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,22 +291,34 @@ 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'),
             'alternative_meeting_software' => __('alternative meeting software'),
             '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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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'),
         ];
     }