Merge tag 'v1.3.2' into staging

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "1.3.1"
+    ".": "1.3.2"
 }

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [1.3.2](https://github.com/accessibility-exchange/platform/compare/v1.3.1...v1.3.2) (2024-02-21)
+
+
+### Bug Fixes
+
+* clarify wording in validation messages for language requirements (resolves [#1824](https://github.com/accessibility-exchange/platform/issues/1824)) ([eb97bc8](https://github.com/accessibility-exchange/platform/commit/eb97bc892417bc1ffd08f4b124bca8f9bd59547b))
+* validation error when not filling in both French and English translations for FRO 'about' field (resolves [#2148](https://github.com/accessibility-exchange/platform/issues/2148)) ([eb97bc8](https://github.com/accessibility-exchange/platform/commit/eb97bc892417bc1ffd08f4b124bca8f9bd59547b))
+
+
+### Miscellaneous Chores
+
+* **localization:** update translations ([#2151](https://github.com/accessibility-exchange/platform/issues/2151)) ([4376b26](https://github.com/accessibility-exchange/platform/commit/4376b264e7ee0e327ae48ac8987b4e9ab65a55bc))
+
 ## [1.3.1](https://github.com/accessibility-exchange/platform/compare/v1.3.0...v1.3.1) (2024-02-20)
 
 

app/Http/Requests/MeetingRequest.php

@@ -138,7 +138,7 @@ public function messages(): array
     {
         return [
             'date.required' => __('You must enter a :attribute'),
-            'title.*.required_without' => __('A meeting title must be provided in at least English or French.'),
+            'title.*.required_without' => __('A meeting title must be provided in either English or French.'),
             'meeting_types.required' => __('You must indicate at least one way for participants to attend the meeting.'),
             'meeting_types.*.Illuminate\Validation\Rules\Enum' => __('You must select a valid meeting type.'),
             'street_address.required' => __('You must enter a :attribute for the meeting location.'),

app/Http/Requests/UpdateEngagementRequest.php

@@ -332,8 +332,8 @@ public function attributes(): array
     public function messages(): array
     {
         return [
-            'name.*.required_without' => __('An engagement name must be provided in at least English or French.'),
-            'description.*.required_without' => __('An engagement description must be provided in at least English or French.'),
+            'name.*.required_without' => __('An engagement name must be provided in either English or French.'),
+            'description.*.required_without' => __('An engagement description must be provided in either English or French.'),
             'document_languages.required' => __('Please select a language that the engagement documents will be in.'),
             'document_languages.*.in' => __('Please select a language that the engagement documents will be in.'),
             'window_start_date.required' => __('You must enter a :attribute'),
@@ -360,7 +360,7 @@ public function messages(): array
             'other_accepted_formats.required' => __('You must indicate the :attribute.'),
             'other_accepted_formats.required_without' => __('You must indicate the :values.'),
             'other_accepted_format.*.string' => __('The other accepted format must be a string.'),
-            'other_accepted_format.*.required_without' => __('The other accepted format must be provided in at least English or French.'),
+            'other_accepted_format.*.required_without' => __('The other accepted format must be provided in either English or French.'),
             'meeting_types.*.Illuminate\Validation\Rules\Enum' => __('You must select a valid meeting type.'),
             'materials_by_date.required' => __('You must enter a :attribute.'),
             'materials_by_date.date' => __('Please enter a valid :attribute.'),

app/Http/Requests/UpdateIndividualRequest.php

@@ -86,11 +86,11 @@ public function attributes(): array
     public function messages(): array
     {
         $messages = [
-            'bio.required_array_keys' => __('Your bio must be provided in at least English or French.'),
-            'bio.*.required_without' => __('Your bio must be provided in at least English or French.'),
-            'bio.array' => __('Your bio must be provided in at least English or French.'),
+            'bio.required_array_keys' => __('Your bio must be provided in either English or French.'),
+            'bio.*.required_without' => __('Your bio must be provided in either English or French.'),
+            'bio.array' => __('Your bio must be provided in either English or French.'),
             'consulting_services.*.Illuminate\Validation\Rules\Enum' => __('The selected consulting service is invalid'),
-            'pronouns.array' => __('Your pronouns must be provided in at least English or French.'),
+            'pronouns.array' => __('Your pronouns must be provided in either English or French.'),
             'website_link.active_url' => __('You must enter a valid website link.'),
         ];
 

app/Http/Requests/UpdateOrganizationRequest.php

@@ -101,7 +101,7 @@ public function messages(): array
     {
         $messages = [
             'name.*.required_without' => __('You must enter your organization name.'),
-            'about.*.required_without' => __('You must fill out the field “About your organization”.'),
+            'about.*.required_without' => __('“About your organization” must be provided in either English or French.'),
         ];
 
         foreach ($this->social_links as $key => $value) {

app/Http/Requests/UpdateProjectRequest.php

@@ -91,12 +91,12 @@ public function messages(): array
     {
         return [
             'name.*.required_without' => __('A project name must be provided in at least one language.'),
-            'goals.*.required_without' => __('Project goals must be provided in at least one language.'),
-            'scope.*.required_without' => __('Project scope must be provided in at least one language.'),
+            'goals.*.required_without' => __('Project goals must be provided in either English or French.'),
+            'scope.*.required_without' => __('Project scope must be provided in either English or French.'),
             'outcome_analysis.required_without' => __('You must identify who will be going through the results and producing an outcome.'),
             'has_other_outcome_analysis.required_without' => __('You must identify who will be going through the results and producing an outcome.'),
             'outcome_analysis_other.*.required_without' => __('You must identify the other team that will be going through the results and producing an outcome.'),
-            'outcomes.*.required_without' => __('Tangible outcomes must be provided in at least one language.'),
+            'outcomes.*.required_without' => __('Tangible outcomes must be provided in either English or French.'),
             'public_outcomes.required' => __('You must indicate if the reports will be publicly available.'),
         ];
     }

app/Http/Requests/UpdateProjectTeamRequest.php

@@ -69,7 +69,7 @@ public function attributes(): array
     public function messages(): array
     {
         return [
-            'contact_person_response_time.*.required_without' => __('An approximate response time must be provided in at least one language.'),
+            'contact_person_response_time.*.required_without' => __('An approximate response time must be provided in either English or French.'),
         ];
     }
 

app/Http/Requests/UpdateRegulatedOrganizationRequest.php

@@ -55,9 +55,9 @@ public function rules(): array
             'sectors.*' => [
                 Rule::in(Sector::pluck('id')->toArray()),
             ],
+            'about.en' => 'required_without:about.fr',
+            'about.fr' => 'required_without:about.en',
             'about.*' => 'nullable|string',
-            'about.en' => 'string|required_without:about.fr',
-            'about.fr' => 'string|required_without:about.en',
             'accessibility_and_inclusion_links.*.title' => 'nullable|string|required_with:accessibility_and_inclusion_links.*.url',
             'accessibility_and_inclusion_links.*.url' => 'nullable|active_url|required_with:accessibility_and_inclusion_links.*.title',
             'social_links.*' => 'nullable|active_url',
@@ -140,6 +140,7 @@ public function messages(): array
     {
         $messages = [
             'name.*.required_without' => __('You must enter your organization name.'),
+            'about.*.required_without' => __('“About your organization” must be provided in either English or French.'),
             'accessibility_and_inclusion_links.*.title.required_with' => __('Since a website link under “Accessibility and Inclusion links” has been entered, you must also enter a website title.'),
             'accessibility_and_inclusion_links.*.url.required_with' => __('Since a website title under “Accessibility and Inclusion links” has been entered, you must also enter a website link.'),
             'accessibility_and_inclusion_links.*.url.active_url' => __('Please enter a valid website link under “Accessibility and Inclusion links”.'),

composer.json

@@ -6,7 +6,7 @@
         "framework",
         "laravel"
     ],
-    "version": "1.3.1",
+    "version": "1.3.2",
     "license": "BSD-3-Clause",
     "require": {
         "php": "^8.1",

resources/lang/en.json

@@ -163,14 +163,14 @@
     "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.",
+    "A meeting title must be provided in either English or French.": "A meeting title must be provided in either English or French.",
     "Analysis of collected information": "Analysis of collected information",
-    "An approximate response time must be provided in at least one language.": "An approximate response time must be provided in at least one language.",
-    "An engagement description must be provided in at least English or French.": "An engagement description must be provided in at least English or French.",
+    "An approximate response time must be provided in either English or French.": "An approximate response time must be provided in either English or French.",
+    "An engagement description must be provided in either English or French.": "An engagement description must be provided in either English or French.",
     "An engagement involves a group of people participating in one set way (for example, a focus group or a survey). An engagement like a focus group can have multiple meetings.": "An engagement involves a group of people participating in one set way (for example, a focus group or a survey). An engagement like a focus group can have multiple meetings.",
     "An engagement involves a group of people participating in one set way (for example, a focus group or survey).": "An engagement involves a group of people participating in one set way (for example, a focus group or survey).",
-    "An engagement name must be provided in at least English or French.": "An engagement name must be provided in at least English or French.",
     "An engagement name must be provided in at least one language.": "An engagement name must be provided in at least one language.",
+    "An engagement name must be provided in either English or French.": "An engagement name must be provided in either English or French.",
     "a network and is able to conduct effective outreach to people with disabilities and Deaf persons in particular geographic communities and social groups (for example, Indigenous communities).": "a network and is able to conduct effective outreach to people with disabilities and Deaf persons in particular geographic communities and social groups (for example, Indigenous communities).",
     "A new project": "A new project",
     "Anonymous participant": "Anonymous participant",
@@ -1270,7 +1270,7 @@
     "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 goals must be provided in either English or French.": "Project goals must be provided in either English or French.",
     "project id": "project id",
     "Project impact": "Project impact",
     "project languages": "project languages",
@@ -1292,7 +1292,7 @@
     "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.",
+    "Project scope must be provided in either English or French.": "Project scope must be provided in either English or French.",
     "Projects I am contracted for": "Projects I am contracted for",
     "Projects I am participating in": "Projects I am participating in",
     "Projects I am running": "Projects I am running",
@@ -1556,7 +1556,7 @@
     "Suspended": "Suspended",
     "System theme": "System theme",
     "Take Quiz": "Take Quiz",
-    "Tangible outcomes must be provided in at least one language.": "Tangible outcomes must be provided in at least one language.",
+    "Tangible outcomes must be provided in either English or French.": "Tangible outcomes must be provided in either English or French.",
     "tangible outcomes of this project": "tangible outcomes of this project",
     "Tangible outcomes of this project": "Tangible outcomes of this project",
     "Tap into our support network": "Tap into our support network",
@@ -1610,7 +1610,7 @@
     "the number of people on your team": "the number of people on your team",
     "The organization you have added does not participate in engagements.": "The organization you have added does not participate in engagements.",
     "The other accepted format must be a string.": "The other accepted format must be a string.",
-    "The other accepted format must be provided in at least English or French.": "The other accepted format must be provided in at least English or French.",
+    "The other accepted format must be provided in either English or French.": "The other accepted format must be provided in either English or French.",
     "the other languages are you able to work in": "the other languages are you able to work in",
     "the other languages you are able to work in": "the other languages you are able to work in",
     "The other payment type must be specified.": "The other payment type must be specified.",
@@ -2001,7 +2001,6 @@
     "You must enter your organization name.": "You must enter your organization name.",
     "You must enter your organization name in either English or French.": "You must enter your organization name in either English or French.",
     "You must enter your organization’s name in either English or French.": "You must enter your organization’s name in either English or French.",
-    "You must fill out the field “About your organization”.": "You must fill out the field “About your organization”.",
     "You must fill out your [payment information](:url) before you can sign up.": "You must fill out your [payment information](:url) before you can sign up.",
     "You must identify the other team that will be going through the results and producing an outcome.": "You must identify the other team that will be going through the results and producing an outcome.",
     "You must identify who will be going through the results and producing an outcome.": "You must identify who will be going through the results and producing an outcome.",
@@ -2069,7 +2068,7 @@
     "Your agreement has been received for :project. You can now publish your project page and engagement details. Sign in to your account at https:\/\/accessibilityexchange.ca to continue.": "Your agreement has been received for :project. You can now publish your project page and engagement details. Sign in to your account at https:\/\/accessibilityexchange.ca to continue.",
     "Your areas of interest have been updated.": "Your areas of interest have been updated.",
     "Your bio": "Your bio",
-    "Your bio must be provided in at least English or French.": "Your bio must be provided in at least English or French.",
+    "Your bio must be provided in either English or French.": "Your bio must be provided in either English or French.",
     "Your communication and consultation preferences have been updated.": "Your communication and consultation preferences have been updated.",
     "Your Community Connector has been removed.": "Your Community Connector has been removed.",
     "Your details": "Your details",
@@ -2117,7 +2116,7 @@
     "Your project has been created.": "Your project has been created.",
     "Your project has been deleted.": "Your project has been deleted.",
     "Your projects and engagements": "Your projects and engagements",
-    "Your pronouns must be provided in at least English or French.": "Your pronouns must be provided in at least English or French.",
+    "Your pronouns must be provided in either English or French.": "Your pronouns must be provided in either English or French.",
     "your public profile will be removed from the platform": "your public profile will be removed from the platform",
     "Your regulated organization, :name, will be deleted and cannot be recovered. If you still want to delete your regulated organization, please enter your current password to proceed.": "Your regulated organization, :name, will be deleted and cannot be recovered. If you still want to delete your regulated organization, please enter your current password to proceed.",
     "Your roles have been saved.": "Your roles have been saved.",
@@ -2153,5 +2152,6 @@
     "{1} :count result for “:searchQuery”.": "{1} :count result for “:searchQuery”.",
     "“About your organization”": "“About your organization”",
     "“About your organization” (English)": "“About your organization” (English)",
-    "“About your organization” (French)": "“About your organization” (French)"
+    "“About your organization” (French)": "“About your organization” (French)",
+    "“About your organization” must be provided in either English or French.": "“About your organization” must be provided in either English or French."
 }