Merge tag 'v1.2.5' into staging

CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## [1.2.5](https://github.com/accessibility-exchange/platform/compare/v1.2.4...v1.2.5) (2023-12-12)
+
+
+### Bug Fixes
+
+* can't add other engagement languages ([#2027](https://github.com/accessibility-exchange/platform/issues/2027)) ([3220f3f](https://github.com/accessibility-exchange/platform/commit/3220f3f8e7535d93bc9d62e38a925e1a26f0efdf))
+* fonts fail to load on www subdomain (resolves [#2006](https://github.com/accessibility-exchange/platform/issues/2006)) ([#2063](https://github.com/accessibility-exchange/platform/issues/2063)) ([290a2b2](https://github.com/accessibility-exchange/platform/commit/290a2b203874473c6ae1906b208ed53cf788e5f5))
+* localize attributes properly ([#2016](https://github.com/accessibility-exchange/platform/issues/2016)) ([fbd95be](https://github.com/accessibility-exchange/platform/commit/fbd95be0f5d3e17d4366f72808778875e3937aeb))
+* localize notifications properly (resolves [#2015](https://github.com/accessibility-exchange/platform/issues/2015), [#2012](https://github.com/accessibility-exchange/platform/issues/2012)) ([#2050](https://github.com/accessibility-exchange/platform/issues/2050)) ([d19c4ae](https://github.com/accessibility-exchange/platform/commit/d19c4ae692abd17f7bc946cd0de80970c515f0f4))
+* misaligned heading area and main area (resolves [#1688](https://github.com/accessibility-exchange/platform/issues/1688)) ([#2060](https://github.com/accessibility-exchange/platform/issues/2060)) ([010d752](https://github.com/accessibility-exchange/platform/commit/010d752af7d57d8ca95d9a1d62a6ab367399acf5))
+* model lsq translations don't fallback to fr (resolves [#2014](https://github.com/accessibility-exchange/platform/issues/2014), [#2026](https://github.com/accessibility-exchange/platform/issues/2026)) ([#2027](https://github.com/accessibility-exchange/platform/issues/2027)) ([3220f3f](https://github.com/accessibility-exchange/platform/commit/3220f3f8e7535d93bc9d62e38a925e1a26f0efdf))
+* not displaying content in translation ([#2027](https://github.com/accessibility-exchange/platform/issues/2027)) ([3220f3f](https://github.com/accessibility-exchange/platform/commit/3220f3f8e7535d93bc9d62e38a925e1a26f0efdf))
+* rendering of language changer links (resolves [#2028](https://github.com/accessibility-exchange/platform/issues/2028), [#2029](https://github.com/accessibility-exchange/platform/issues/2029)) ([#2027](https://github.com/accessibility-exchange/platform/issues/2027)) ([3220f3f](https://github.com/accessibility-exchange/platform/commit/3220f3f8e7535d93bc9d62e38a925e1a26f0efdf))
+* response time in other languages not saved ([#2027](https://github.com/accessibility-exchange/platform/issues/2027)) ([3220f3f](https://github.com/accessibility-exchange/platform/commit/3220f3f8e7535d93bc9d62e38a925e1a26f0efdf))
+* update LSQ locale's Translatable inputs default to English (resolves [#1715](https://github.com/accessibility-exchange/platform/issues/1715)) ([#2062](https://github.com/accessibility-exchange/platform/issues/2062)) ([ccaa90c](https://github.com/accessibility-exchange/platform/commit/ccaa90c2f0f7ec2c3d5825b3e7a50b1afc7d3600))
+
+
+### Miscellaneous Chores
+
+* **localization:** update translations ([#2048](https://github.com/accessibility-exchange/platform/issues/2048)) ([780877b](https://github.com/accessibility-exchange/platform/commit/780877b8a1f1a54d438c77ec8f5b1e020a13f397))
+* **localization:** update translations ([#2059](https://github.com/accessibility-exchange/platform/issues/2059)) ([cb688c2](https://github.com/accessibility-exchange/platform/commit/cb688c29c18f912f54320f7d16713ba1ad1f1048))
+* **localization:** update translations ([#2061](https://github.com/accessibility-exchange/platform/issues/2061)) ([231b745](https://github.com/accessibility-exchange/platform/commit/231b745630aaf4f8b56094e1b874d27ff1467a8c))
+* **localization:** update translations ([#2070](https://github.com/accessibility-exchange/platform/issues/2070)) ([9a10088](https://github.com/accessibility-exchange/platform/commit/9a1008853b1fd4336b40c7d87394312913632d70))
+
 ## [1.2.4](https://github.com/accessibility-exchange/platform/compare/v1.2.3...v1.2.4) (2023-12-04)
 
 

app/Http/Controllers/EngagementController.php

@@ -350,7 +350,10 @@ public function updateCriteria(UpdateEngagementSelectionCriteriaRequest $request
 
     public function show(Engagement $engagement)
     {
+        $language = request()->query('language');
+
         return view('engagements.show', [
+            'language' => $language ?? locale(),
             'project' => $engagement->project,
             'engagement' => $engagement,
         ]);

app/Http/Controllers/IndividualController.php

@@ -104,10 +104,6 @@ public function show(Individual $individual): View
     {
         $language = request()->query('language');
 
-        if (! in_array($language, $individual->languages)) {
-            $language = false;
-        }
-
         return view('individuals.show', array_merge(compact('individual'), [
             'language' => $language ?? locale(),
         ]));

app/Http/Controllers/OrganizationController.php

@@ -142,10 +142,6 @@ public function show(Organization $organization): View
     {
         $language = request()->query('language');
 
-        if (! in_array($language, $organization->languages)) {
-            $language = false;
-        }
-
         return view('organizations.show', array_merge(compact('organization'), [
             'language' => $language ?? locale(),
         ]));

app/Http/Controllers/ProjectController.php

@@ -100,10 +100,6 @@ public function show(Project $project): View
 
         $language = request()->query('language');
 
-        if (! in_array($language, $project->languages)) {
-            $language = false;
-        }
-
         if ($user->can('manage', $project)) {
             $engagements = $project->allEngagements;
         } elseif ($user->isAdministrator()) {

app/Http/Controllers/RegulatedOrganizationController.php

@@ -118,10 +118,6 @@ public function show(RegulatedOrganization $regulatedOrganization): View
 
         $language = request()->query('language');
 
-        if (! in_array($language, $regulatedOrganization->languages)) {
-            $language = false;
-        }
-
         return view('regulated-organizations.show', array_merge(compact('regulatedOrganization'), ['language' => $language ?? locale()]));
     }
 

app/Http/Controllers/VerifyEmailController.php

@@ -23,7 +23,7 @@ public function __invoke(VerifyEmailRequest $request): RedirectResponse
             event(new Verified($request->user()));
         }
 
-        flash(__('hearth::auth.verification_succeeded'), 'success|'.__('hearth::auth.verification_succeeded', [], 'en'));
+        flash(__('hearth::auth.verification_succeeded', [], $request->user()->locale), 'success|'.__('hearth::auth.verification_succeeded', [], 'en'));
 
         return redirect()->intended($dashboard);
     }

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

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'),
+        ];
+    }
 }

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.
      */

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'),
+        ];
+    }
 }

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.
      *

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.
      *

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.
      *

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.
      *

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.
      */

app/Http/Requests/DestroyUserRequest.php

@@ -26,6 +26,14 @@ public function rules(): array
         ];
     }
 
+    public function attributes(): array
+    {
+        return [
+            'current_password' => __('current password'),
+            'organizations' => __('organizations'),
+        ];
+    }
+
     /**
      * Configure the validator instance.
      *

app/Http/Requests/MeetingRequest.php

@@ -110,14 +110,27 @@ 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'),
+            '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.*' => __('ways to attend'),
+            'meeting_types' => __('ways to attend'),
+            'street_address' => __('Street address'),
+            'postal_code' => __('Postal code'),
+            'unit_suite_floor' => __('Unit, suite, or floor'),
         ];
     }
 

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) {

app/Http/Requests/SaveIndividualRolesRequest.php

@@ -34,6 +34,14 @@ public function prepareForValidation()
         request()->mergeIfMissing($fallbacks);
     }
 
+    public function attributes(): array
+    {
+        return [
+            'roles' => __('roles'),
+            'roles.*' => __('roles'),
+        ];
+    }
+
     /**
      * Get the error messages for the defined validation rules.
      */

app/Http/Requests/SaveOrganizationRolesRequest.php

@@ -21,6 +21,14 @@ public function rules(): array
         ];
     }
 
+    public function attributes(): array
+    {
+        return [
+            'roles' => __('roles'),
+            'roles.*' => __('roles'),
+        ];
+    }
+
     public function prepareForValidation()
     {
         $fallbacks = [

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 [

app/Http/Requests/SaveUserDetailsRequest.php

@@ -39,6 +39,7 @@ public function attributes(): array
     {
         return [
             'name' => __('full name'),
+            'email' => __('email address'),
         ];
     }
 }

app/Http/Requests/SaveUserLanguagesRequest.php

@@ -30,6 +30,17 @@ public function rules(): array
         ];
     }
 
+    public function attributes(): array
+    {
+        return [
+            'locale' => __('Website language'),
+            'invitation' => __('invitation'),
+            'context' => __('context'),
+            'role' => __('role'),
+            'email' => __('email address'),
+        ];
+    }
+
     public function authorize(): bool
     {
         return true;