fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(link password time): new time format

Browse Source
This commit is contained in:
ros 2021-07-23 09:53:40 +02:00
parent 4490e9ad20
commit df2a9bc20f
5 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
messages/uniworx/categories/jobs_handler/de-de-formal.msg
View File

@ -17,4 +17,4 @@ InvitationAcceptDecline: Einladung annehmen/ablehnen
InvitationFromTip displayName@Text: Sie erhalten diese Einladung, weil #{displayName} ihren Versand in Uni2work ausgelöst hat. InvitationFromTip displayName@Text: Sie erhalten diese Einladung, weil #{displayName} ihren Versand in Uni2work ausgelöst hat.
InvitationFromTipAnonymous: Sie erhalten diese Einladung, weil ein nicht eingeloggter Benutzer/eine nichteingeloggte Benutzerin ihren Versand in Uni2work ausgelöst hat. InvitationFromTipAnonymous: Sie erhalten diese Einladung, weil ein nicht eingeloggter Benutzer/eine nichteingeloggte Benutzerin ihren Versand in Uni2work ausgelöst hat.
InvitationUniWorXTip: Uni2work ist ein webbasiertes Lehrverwaltungssystem der LMU München. InvitationUniWorXTip: Uni2work ist ein webbasiertes Lehrverwaltungssystem der LMU München.
LinkActiveUntil time@UTCTime: Der Link ist nur bis #{time} aktiv! LinkActiveUntil time@Text: Der Link ist nur bis #{time} aktiv!

2
messages/uniworx/categories/jobs_handler/en-eu.msg
View File

@ -17,4 +17,4 @@ InvitationAcceptDecline: Accept/Decline invitation
InvitationFromTip displayName: You are receiving this invitation because #{displayName} has caused it to be sent from within Uni2work. InvitationFromTip displayName: You are receiving this invitation because #{displayName} has caused it to be sent from within Uni2work.
InvitationFromTipAnonymous: You are receiving this invitiation because an user who didn't log in has caused it to be send from within Uni2work. InvitationFromTipAnonymous: You are receiving this invitiation because an user who didn't log in has caused it to be send from within Uni2work.
InvitationUniWorXTip: Uni2work is a web based teaching management system at LMU Munich. InvitationUniWorXTip: Uni2work is a web based teaching management system at LMU Munich.
LinkActiveUntil time@UTCTime: The link is only available until #{time}! LinkActiveUntil time@Text: The link is only available until #{time}!

3
src/Foundation/I18n.hs
View File

@ -417,9 +417,6 @@ instance ToMessage Natural where
toMessage = tshow toMessage = tshow
instance ToMessage Word64 where instance ToMessage Word64 where
toMessage = tshow toMessage = tshow
instance ToMessage UTCTime where
toMessage = tshow
instance HasResolution a => ToMessage (Fixed a) where instance HasResolution a => ToMessage (Fixed a) where
toMessage = toMessage . showFixed True toMessage = toMessage . showFixed True

4
src/Jobs/Handler/SendPasswordReset.hs
View File

@ -34,7 +34,7 @@ dispatchJobSendPasswordReset jRecipient = JobHandlerException . userMailT jRecip
let resetBearer = resetBearer' let resetBearer = resetBearer'
& bearerRestrict (UserPasswordR cID) (decodeUtf8 . Base64.encode . BA.convert $ computeUserAuthenticationDigest userAuthentication) & bearerRestrict (UserPasswordR cID) (decodeUtf8 . Base64.encode . BA.convert $ computeUserAuthenticationDigest userAuthentication)
encodedBearer <- encodeBearer resetBearer encodedBearer <- encodeBearer resetBearer
resetUrl <- toTextUrl (UserPasswordR cID, [(toPathPiece GetBearer, toPathPiece encodedBearer)]) resetUrl <- toTextUrl (UserPasswordR cID, [(toPathPiece GetBearer, toPathPiece encodedBearer)])
activeTime <- formatTimeMail SelFormatDateTime tomorrowEndOfDay
addHtmlMarkdownAlternatives ($(ihamletFile "templates/mail/passwordReset.hamlet") :: HtmlUrlI18n (SomeMessage UniWorX) (Route UniWorX)) addHtmlMarkdownAlternatives ($(ihamletFile "templates/mail/passwordReset.hamlet") :: HtmlUrlI18n (SomeMessage UniWorX) (Route UniWorX))

2
templates/mail/passwordReset.hamlet
View File

@ -13,4 +13,4 @@ $newline never
<h1> <h1>
<a href=#{resetUrl}> <a href=#{resetUrl}>
_{SomeMessage MsgResetPassword} _{SomeMessage MsgResetPassword}
_{SomeMessage $ MsgLinkActiveUntil tomorrowEndOfDay} _{SomeMessage $ MsgLinkActiveUntil activeTime}