Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: localize attributes properly #2016

Merged
merged 24 commits into from
Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
613f789
fix: localize attributes properly
chosww Nov 28, 2023
7812dfc
fix: decapitalize localization message keys
chosww Nov 28, 2023
9a8db06
fix: update error messages
chosww Nov 28, 2023
e67e5cc
fix: add attributes method to all requests
chosww Nov 29, 2023
8d023c5
fix: analyze issues
chosww Nov 29, 2023
501dc17
fix: update tests
chosww Nov 29, 2023
389f03b
Merge branch 'dev' of https://github.com/accessibility-exchange/platf…
chosww Nov 29, 2023
c35464c
fix: update validation errors
chosww Nov 29, 2023
c7db448
fix: run localize
chosww Nov 30, 2023
1bdee8a
Merge branch 'dev' of https://github.com/accessibility-exchange/platf…
chosww Nov 30, 2023
08b6b78
fix: update based on PR feedback
chosww Nov 30, 2023
e5f47a5
fix: update based on PR feedback
chosww Dec 1, 2023
46a82ed
fix: analyze issue
chosww Dec 1, 2023
ec40713
fix: update validation errors
chosww Dec 1, 2023
ebfe295
fix: update validation errors
chosww Dec 1, 2023
50e0363
fix: add email attribute to AcceptInvitationRequest
chosww Dec 4, 2023
3d4c31c
fix: update attribute message
chosww Dec 4, 2023
2ceac1e
fix: add update attributes for StoreDefinedTermRequest
chosww Dec 4, 2023
4bd5052
Merge branch 'dev' of https://github.com/accessibility-exchange/platf…
chosww Dec 4, 2023
eab5bab
fix: update based on PR feedback
chosww Dec 5, 2023
212be19
Merge branch 'dev' of https://github.com/accessibility-exchange/platf…
chosww Dec 5, 2023
7bb3abf
fix: update DestroyUserRequest attribute
chosww Dec 5, 2023
ca830d5
fix: update attributes of StoreEngagementLanguagesRequest
chosww Dec 5, 2023
6dd8016
fix: run composer localize
chosww Dec 6, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/Http/Requests/DestroyUserRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public function attributes(): array
{
return [
'current_password' => __('current password'),
jobara marked this conversation as resolved.
Show resolved Hide resolved
'organization' => __('organization'),
jobara marked this conversation as resolved.
Show resolved Hide resolved
];
}

Expand Down
2 changes: 1 addition & 1 deletion app/Http/Requests/SaveUserDetailsRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function attributes(): array
{
return [
'name' => __('full name'),
'email' => __('email'),
'email' => __('email address'),
];
}
}
2 changes: 1 addition & 1 deletion app/Http/Requests/SaveUserLanguagesRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function attributes(): array
'invitation' => __('invitation'),
'context' => __('context'),
'role' => __('role'),
'email' => __('email'),
'email' => __('email address'),
];
}

Expand Down
2 changes: 1 addition & 1 deletion app/Http/Requests/StoreInvitationRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function rules(): array
public function attributes(): array
{
return [
'email' => __('email'),
'email' => __('email address'),
'role' => __('role'),
];
}
Expand Down
2 changes: 2 additions & 0 deletions app/Http/Requests/StoreOrganizationRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ public function attributes(): array
{
return [
'type' => __('organization type'),
jobara marked this conversation as resolved.
Show resolved Hide resolved
'name.en' => __('organization name (English)'),
'name.fr' => __('organization name (French)'),
];
}

Expand Down
2 changes: 0 additions & 2 deletions app/Http/Requests/StoreOrganizationTypeRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ public function attributes(): array
{
return [
'type' => __('organization type'),
'name.en' => __('organization name (English)'),
'name.fr' => __('organization name (French)'),
];
}

Expand Down
1 change: 1 addition & 0 deletions app/Http/Requests/UpdateAccessNeedsRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ public function attributes(): array
'other' => __('other'),
'other_access_need' => __('other access need'),
'meeting_access_needs' => __('meeting access needs'),
jobara marked this conversation as resolved.
Show resolved Hide resolved
'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'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
];
}

Expand Down
2 changes: 2 additions & 0 deletions app/Http/Requests/UpdateDefinedTermRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,13 @@
];
}

public function attributes(): array

Check warning on line 32 in app/Http/Requests/UpdateDefinedTermRequest.php

View check run for this annotation

Codecov / codecov/patch

app/Http/Requests/UpdateDefinedTermRequest.php#L32

Added line #L32 was not covered by tests
jobara marked this conversation as resolved.
Show resolved Hide resolved
{
return [
'term' => __('term'),
'term.*' => __('term'),
'definition' => __('definition'),
'definition.*' => __('definition'),
];

Check warning on line 39 in app/Http/Requests/UpdateDefinedTermRequest.php

View check run for this annotation

Codecov / codecov/patch

app/Http/Requests/UpdateDefinedTermRequest.php#L34-L39

Added lines #L34 - L39 were not covered by tests
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
];
}

Expand Down
1 change: 1 addition & 0 deletions app/Http/Requests/UpdateNotificationPreferencesRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ public function rules(): array
public function attributes(): array
{
return [
jobara marked this conversation as resolved.
Show resolved Hide resolved
'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'),
Expand Down
Loading
Loading