Skip to content

Temp fix translation msg validation #122

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 5, 2025
Merged

Temp fix translation msg validation #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions src/pages/announcements/add-announcement-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,19 @@ const MESSAGE_MAX_LENGTH = 200;
const formSchema = yup
.object()
.shape({
[MESSAGE]: yup.string().nullable().trim().min(1, 'YupRequired').max(MESSAGE_MAX_LENGTH).required(),
[START_DATE]: yup.string().nullable().datetime().required(),
[MESSAGE]: yup
.string()
.nullable()
.trim()
.min(1, 'YupRequired')
.max(MESSAGE_MAX_LENGTH, 'announcements.form.errForm.msgMaxLength' /*TODO temporary*/)
.required('YupRequired' /*TODO temporary*/),
[START_DATE]: yup.string().nullable().datetime().required('YupRequired' /*TODO temporary*/),
[END_DATE]: yup
.string()
.nullable()
.datetime()
.required()
.required('YupRequired' /*TODO temporary*/)
.when(START_DATE, (startDate, schema) =>
schema.test(
'is-after-start',
Expand All @@ -56,7 +62,7 @@ const formSchema = yup
.string<UserAdminSrv.AnnouncementSeverity>()
.nullable()
.oneOf(Object.values(UserAdminSrv.AnnouncementSeverity))
.required(),
.required('YupRequired' /*TODO temporary*/),
})
.required();
type FormSchema = InferType<typeof formSchema>;
Expand Down
1 change: 1 addition & 0 deletions src/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
"announcements.form.errCreateAnnouncement.noSameDateErr": "The announcement start and end date must be different.",
"announcements.form.errCreateAnnouncement.startDateAfterEndDateErr": "The start date cannot be after the end date.",
"announcements.form.errForm.startDateAfterEndDateErr": "End date must be after start date.",
"announcements.form.errForm.msgMaxLength": "Message must be at most 200 characters.",

"YupRequired": "This field is required"
}
1 change: 1 addition & 0 deletions src/translations/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
"announcements.form.errCreateAnnouncement.noSameDateErr": "La date de début et de fin d'annonce doivent être différentes.",
"announcements.form.errCreateAnnouncement.startDateAfterEndDateErr": "La date de début d'annonce ne peut pas être après la date de fin.",
"announcements.form.errForm.startDateAfterEndDateErr": "La date de fin doit être après la date de début.",
"announcements.form.errForm.msgMaxLength": "Le message ne doit pas dépasser 200 caractères.",

"YupRequired": "Ce champ doit être renseigné"
}
Loading