From 799f1fe184276aea2eb3659e5d439cd76f4ca4d8 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Wed, 22 Mar 2023 10:35:03 +0000 Subject: [PATCH] fix(profile): email validation inverted --- messages/uniworx/utils/utils/de-de-formal.msg | 1 + messages/uniworx/utils/utils/en-eu.msg | 1 + src/Handler/Profile.hs | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/messages/uniworx/utils/utils/de-de-formal.msg b/messages/uniworx/utils/utils/de-de-formal.msg index 31cccdcbd..3dfdcd670 100644 --- a/messages/uniworx/utils/utils/de-de-formal.msg +++ b/messages/uniworx/utils/utils/de-de-formal.msg @@ -78,6 +78,7 @@ MultiUserFieldInvitationExplanation: An Adressen, die so keinem Uni2work-Benutze MultiUserFieldInvitationExplanationAlways: Es wird an alle Adressen, die Sie hier angeben, eine Einladung per E-Mail versandt. AmbiguousEmail: E-Mail-Adresse nicht eindeutig InvalidEmailAddress: E-Mail-Adresse ist ungültig +InvalidEmailAddressWith e@Text: E-Mail-Adresse #{show e} ist ungültig UtilExamResultGrade: Note UtilExamResultPass: Bestanden/Nicht Bestanden UtilExamResultNoShow: Nicht erschienen diff --git a/messages/uniworx/utils/utils/en-eu.msg b/messages/uniworx/utils/utils/en-eu.msg index 9dfe75299..8e551020c 100644 --- a/messages/uniworx/utils/utils/en-eu.msg +++ b/messages/uniworx/utils/utils/en-eu.msg @@ -78,6 +78,7 @@ MultiUserFieldInvitationExplanation: For addresses, which are not found in this MultiUserFieldInvitationExplanationAlways: An invitation will be sent via email to all addresses you enter here. AmbiguousEmail: Email address is ambiguous InvalidEmailAddress: Email address is invalid +InvalidEmailAddressWith e: Email asdress #{show e} is invalid UtilExamResultGrade: Grade UtilExamResultPass: Passed/Failed UtilExamResultNoShow: Not present diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs index 9bc7efeb7..80ae420cd 100644 --- a/src/Handler/Profile.hs +++ b/src/Handler/Profile.hs @@ -358,8 +358,8 @@ validateSettings User{..} = do validDisplayName userTitle userFirstName userSurname userDisplayName' userDisplayEmail' <- use _stgDisplayEmail - guardValidation MsgInvalidEmailAddress $ - not (validEmail' userDisplayEmail') + guardValidation (MsgInvalidEmailAddressWith $ CI.original userDisplayEmail') $ + validEmail' userDisplayEmail' userPostAddress' <- use _stgPostAddress let postalNotSet = isNothing userPostAddress'