diff --git a/messages/uniworx/misc/de-de-formal.msg b/messages/uniworx/misc/de-de-formal.msg index 8e116ef8f..8c90519c5 100644 --- a/messages/uniworx/misc/de-de-formal.msg +++ b/messages/uniworx/misc/de-de-formal.msg @@ -2673,6 +2673,7 @@ AllocationResultsTip: Die folgenden Informationen entsprechen dem aktuellen Stan AllocationResultsStudentTip: Unten aufgeführt sind alle Plätze, die Sie im Rahmen der genannten Zentralanmeldung erhalten haben und von denen Sie seit dem weder abgemeldet wurden, noch sich selbst abgemeldet haben. Plätze, über die Sie ggf. bereits informiert wurden, können also erneut aufgeführt sein. AllocationResultStudentRegistrationTip: Sie sind zu oben genanntem Kurs in Uni2work angemeldet. AllocationResultsStudentRegistrationTip: Sie sind zu den oben genannten Kursen in Uni2work angemeldet. +AllocationResultsStudentConsultFaq n@Int: Falls Sie Fragen oder Anmerkungen haben, beachten Sie bitte auch die Informationen auf #{pluralDE n "der" "den"} folgenden #{pluralDE n "Seite" "Seiten"}: FavouriteVisited: Kürzlich besucht FavouriteParticipant: Ihre Kurse diff --git a/messages/uniworx/misc/en-eu.msg b/messages/uniworx/misc/en-eu.msg index b809ca1c1..5f1f0ad57 100644 --- a/messages/uniworx/misc/en-eu.msg +++ b/messages/uniworx/misc/en-eu.msg @@ -2673,6 +2673,7 @@ AllocationResultsTip: The following information reflect the current state of the AllocationResultsStudentTip: Listed below are placements in courses which you have received due to the mentioned central allocation and for which you have not left the respective course or have been deregistered. Thus placements you have been informed of already may be listed again. AllocationResultStudentRegistrationTip: You were enrolled in the course mentioned above in Uni2work. AllocationResultsStudentRegistrationTip: You were enrolled in the courses mentioned above in Uni2work. +AllocationResultsStudentConsultFaq n@Int: If you have questions or remarks, please also take into account the information on the following #{pluralEN n "page" "pages"}: FavouriteVisited: Visited FavouriteParticipant: Your courses diff --git a/src/Jobs/Handler/SendNotification/Allocation.hs b/src/Jobs/Handler/SendNotification/Allocation.hs index 788c62086..94b86e4ed 100644 --- a/src/Jobs/Handler/SendNotification/Allocation.hs +++ b/src/Jobs/Handler/SendNotification/Allocation.hs @@ -14,6 +14,8 @@ import Import import Handler.Utils import Jobs.Handler.SendNotification.Utils +import Handler.Info (FAQItem(..)) + import Text.Hamlet import qualified Database.Esqueleto as E @@ -182,7 +184,11 @@ dispatchNotificationAllocationResults nAllocation jRecipient = userMailT jRecipi setSubjectI $ MsgMailSubjectAllocationResults allocationName editNotifications <- mkEditNotifications jRecipient + studentFaqItems <- forM studentFaqItems' $ \faqItem -> (faqItem, ) <$> toTextUrl (FaqR :#: faqItem) + addHtmlMarkdownAlternatives $(ihamletFile "templates/mail/allocationResults.hamlet") + where + studentFaqItems' = [FAQAllocationNoPlaces] dispatchNotificationAllocationNewCourse :: AllocationId -> CourseId -> UserId -> Handler () dispatchNotificationAllocationNewCourse nAllocation nCourse jRecipient = userMailT jRecipient $ do diff --git a/templates/i18n/faq/allocation-no-places.de-de-formal.hamlet b/templates/i18n/faq/allocation-no-places.de-de-formal.hamlet index 55c53c6e5..850d54104 100644 --- a/templates/i18n/faq/allocation-no-places.de-de-formal.hamlet +++ b/templates/i18n/faq/allocation-no-places.de-de-formal.hamlet @@ -19,14 +19,28 @@ $newline never
_{SomeMessage MsgAllocationResultsStudentTip} + $if not (null studentFaqItems) +
+ _{SomeMessage (MsgAllocationResultsStudentConsultFaq (length studentFaqItems))} +
_{SomeMessage MsgAllocationNoResultsStudent}