Skip to content

Commit 2585118

Browse files
Temp fix translation msg validation (#122)
1 parent d2e67cd commit 2585118

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

src/pages/announcements/add-announcement-form.tsx

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,19 @@ const MESSAGE_MAX_LENGTH = 200;
3838
const formSchema = yup
3939
.object()
4040
.shape({
41-
[MESSAGE]: yup.string().nullable().trim().min(1, 'YupRequired').max(MESSAGE_MAX_LENGTH).required(),
42-
[START_DATE]: yup.string().nullable().datetime().required(),
41+
[MESSAGE]: yup
42+
.string()
43+
.nullable()
44+
.trim()
45+
.min(1, 'YupRequired')
46+
.max(MESSAGE_MAX_LENGTH, 'announcements.form.errForm.msgMaxLength' /*TODO temporary*/)
47+
.required('YupRequired' /*TODO temporary*/),
48+
[START_DATE]: yup.string().nullable().datetime().required('YupRequired' /*TODO temporary*/),
4349
[END_DATE]: yup
4450
.string()
4551
.nullable()
4652
.datetime()
47-
.required()
53+
.required('YupRequired' /*TODO temporary*/)
4854
.when(START_DATE, (startDate, schema) =>
4955
schema.test(
5056
'is-after-start',
@@ -56,7 +62,7 @@ const formSchema = yup
5662
.string<UserAdminSrv.AnnouncementSeverity>()
5763
.nullable()
5864
.oneOf(Object.values(UserAdminSrv.AnnouncementSeverity))
59-
.required(),
65+
.required('YupRequired' /*TODO temporary*/),
6066
})
6167
.required();
6268
type FormSchema = InferType<typeof formSchema>;

src/translations/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@
127127
"announcements.form.errCreateAnnouncement.noSameDateErr": "The announcement start and end date must be different.",
128128
"announcements.form.errCreateAnnouncement.startDateAfterEndDateErr": "The start date cannot be after the end date.",
129129
"announcements.form.errForm.startDateAfterEndDateErr": "End date must be after start date.",
130+
"announcements.form.errForm.msgMaxLength": "Message must be at most 200 characters.",
130131

131132
"YupRequired": "This field is required"
132133
}

src/translations/fr.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@
128128
"announcements.form.errCreateAnnouncement.noSameDateErr": "La date de début et de fin d'annonce doivent être différentes.",
129129
"announcements.form.errCreateAnnouncement.startDateAfterEndDateErr": "La date de début d'annonce ne peut pas être après la date de fin.",
130130
"announcements.form.errForm.startDateAfterEndDateErr": "La date de fin doit être après la date de début.",
131+
"announcements.form.errForm.msgMaxLength": "Le message ne doit pas dépasser 200 caractères.",
131132

132133
"YupRequired": "Ce champ doit être renseigné"
133134
}

0 commit comments

Comments
 (0)