From 352bdba1a4377bbd3ecf76b72c6aee6fdd861316 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 18 Oct 2019 20:12:34 +0200
Subject: [PATCH 001/126] feat(i18n): basic language switching

---
 frontend/src/utils/inputs/checkbox.js   |  2 +-
 frontend/src/utils/inputs/checkbox.scss | 19 +++++----
 messages/uniworx/de.msg                 |  7 +++-
 messages/uniworx/en.msg                 |  2 +
 package.yaml                            |  1 +
 routes                                  |  1 +
 src/Foundation.hs                       | 42 +++++++++++++++----
 src/Handler/Profile.hs                  | 26 ++++++++++++
 src/Utils/Form.hs                       |  1 +
 src/Utils/Lang.hs                       | 11 ++---
 templates/widgets/navbar/navbar.hamlet  | 12 +++++-
 templates/widgets/navbar/navbar.lucius  | 56 ++++++++++++++++++++-----
 12 files changed, 145 insertions(+), 35 deletions(-)
 create mode 100644 messages/uniworx/en.msg

diff --git a/frontend/src/utils/inputs/checkbox.js b/frontend/src/utils/inputs/checkbox.js
index e93c88856..6f52ea3ae 100644
--- a/frontend/src/utils/inputs/checkbox.js
+++ b/frontend/src/utils/inputs/checkbox.js
@@ -5,7 +5,7 @@ var CHECKBOX_CLASS = 'checkbox';
 var CHECKBOX_INITIALIZED_CLASS = 'checkbox--initialized';
 
 @Utility({
-  selector: 'input[type="checkbox"]',
+  selector: 'input[type="checkbox"]:not([uw-no-checkbox])',
 })
 export class Checkbox {
 
diff --git a/frontend/src/utils/inputs/checkbox.scss b/frontend/src/utils/inputs/checkbox.scss
index 5dc0c9995..817aa5f3a 100644
--- a/frontend/src/utils/inputs/checkbox.scss
+++ b/frontend/src/utils/inputs/checkbox.scss
@@ -1,19 +1,20 @@
 
 /* CUSTOM CHECKBOXES */
 /* Completely replaces legacy checkbox */
+.checkbox [type='checkbox'], #lang-checkbox {
+  position: fixed;
+  top: -1px;
+  left: -1px;
+  width: 1px;
+  height: 1px;
+  overflow: hidden;
+  display: none;
+}
+
 .checkbox {
   position: relative;
   display: inline-block;
 
-  [type='checkbox'] {
-    position: fixed;
-    top: -1px;
-    left: -1px;
-    width: 1px;
-    height: 1px;
-    overflow: hidden;
-  }
-
   label {
     display: block;
     height: 20px;
diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index aef920e2b..825036b04 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -778,6 +778,8 @@ MailTestDateTime: Test der Datumsformattierung:
 
 German: Deutsch
 GermanGermany: Deutsch (Deutschland)
+English: English
+EnglishEurope: English (Europe)
 
 MailSubjectSubmissionRated csh@CourseShorthand: Ihre #{csh}-Abgabe wurde korrigiert
 MailSubmissionRatedIntro courseName@Text termDesc@Text: Ihre Abgabe im Kurs #{courseName} (#{termDesc}) wurde korrigiert.
@@ -1979,4 +1981,7 @@ ShortSexFemale: w
 ShortSexNotApplicable: k.A.
 
 ShowSex: Geschlechter anderer Nutzer anzeigen
-ShowSexTip: Sollen in Kursteilnehmer-Tabellen u.Ä. die Geschlechter der Nutzer angezeigt werden?
\ No newline at end of file
+ShowSexTip: Sollen in Kursteilnehmer-Tabellen u.Ä. die Geschlechter der Nutzer angezeigt werden?
+
+MenuLanguage: Sprache
+LanguageChanged: Sprache erfolgreich geändert
\ No newline at end of file
diff --git a/messages/uniworx/en.msg b/messages/uniworx/en.msg
new file mode 100644
index 000000000..c6e1dc4ad
--- /dev/null
+++ b/messages/uniworx/en.msg
@@ -0,0 +1,2 @@
+MenuLanguage: Language
+LanguageChanged: Language changed successfully
\ No newline at end of file
diff --git a/package.yaml b/package.yaml
index 45137e732..e002f165f 100644
--- a/package.yaml
+++ b/package.yaml
@@ -140,6 +140,7 @@ dependencies:
   - retry
   - generic-lens
   - array
+  - cookie
 
 other-extensions:
   - GeneralizedNewtypeDeriving
diff --git a/routes b/routes
index 582834521..b64e379b5 100644
--- a/routes
+++ b/routes
@@ -73,6 +73,7 @@
 /user/authpreds            AuthPredsR          GET POST        !free
 /user/set-display-email    SetDisplayEmailR    GET POST        !free
 /user/csv-options          CsvOptionsR         GET POST        !free
+/user/lang                 LangR                   POST        !free
 
 /exam-office               ExamOfficeR                         !exam-office:
   /                        EOExamsR            GET
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 4b54a9fd1..9294d7d8e 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -72,6 +72,7 @@ import Utils.SystemMessage
 import Text.Shakespeare.Text (st)
 
 import Yesod.Form.I18n.German
+import Yesod.Form.I18n.English
 import qualified Yesod.Auth.Message as Auth
 
 import qualified Data.Conduit.List as C
@@ -257,11 +258,6 @@ mkMessageVariant "UniWorX" "PWHash" "messages/pw-hash" "de"
 mkMessageVariant "UniWorX" "Button" "messages/button" "de"
 mkMessageVariant "UniWorX" "Frontend" "messages/frontend" "de"
 
--- This instance is required to use forms. You can modify renderMessage to
--- achieve customized and internationalized form validation messages.
-instance RenderMessage UniWorX FormMessage where
-    renderMessage _ _  = germanFormMessage -- TODO
-
 instance RenderMessage UniWorX TermIdentifier where
   renderMessage foundation ls TermIdentifier{..} = case season of
     Summer -> renderMessage' $ MsgSummerTerm year
@@ -304,6 +300,8 @@ instance RenderMessage UniWorX MsgLanguage where
   renderMessage foundation ls (MsgLanguage lang@(Text.splitOn "-" -> lang'))
     | ["de", "DE"] <- lang' = mr MsgGermanGermany
     | ("de" : _)   <- lang' = mr MsgGerman
+    | ["en", "EU"] <- lang' = mr MsgEnglishEurope
+    | ("en" : _)   <- lang' = mr MsgEnglish 
     | otherwise = lang
     where
       mr = renderMessage foundation ls
@@ -511,13 +509,13 @@ instance Button UniWorX ButtonSubmit where
 
 
 getTimeLocale' :: [Lang] -> TimeLocale
-getTimeLocale' = $(timeLocaleMap [("de", "de_DE.utf8")])
+getTimeLocale' = $(timeLocaleMap [("de", "de_DE.utf8"), ("en", "en_IE.utf8")])
 
 appTZ :: TZ
 appTZ = $(includeSystemTZ "Europe/Berlin")
 
 appLanguages :: NonEmpty Lang
-appLanguages = "de-DE" :| []
+appLanguages = "de" :| ["en"]
 
 appLanguagesOpts :: ( MonadHandler m
                     , HandlerSite m ~ UniWorX
@@ -533,6 +531,13 @@ appLanguagesOpts = do
       langOptions = map mkOption $ toList appLanguages
   return $ mkOptionList langOptions
 
+-- This instance is required to use forms. You can modify renderMessage to
+-- achieve customized and internationalized form validation messages.
+instance RenderMessage UniWorX FormMessage where
+    renderMessage _ ls = case lang of
+      ("en" : _) -> englishFormMessage
+      _other     -> germanFormMessage
+      where lang = Text.splitOn "-" $ selectLanguage' appLanguages ls
 
 instance RenderMessage UniWorX WeekDay where
   renderMessage _ ls wDay = pack $ map fst (wDays $ getTimeLocale' ls) !! fromEnum wDay
@@ -1683,6 +1688,17 @@ instance Yesod UniWorX where
     makeLogger = readTVarIO . snd . appLogger
 
 
+langForm :: Form (Lang, Route UniWorX)
+langForm csrf = do
+  lang <- selectLanguage appLanguages
+  route <- getCurrentRoute
+  (urlRes, urlView) <- mreq hiddenField ("" & addName ("referer" :: Text)) route
+  (langBoxRes, langBoxView) <- mreq
+    (selectField appLanguagesOpts)
+    ("" & addAttr "multiple" "multiple" & addAttr "size" (tshow . min 10 $ length appLanguages) & addAutosubmit & addName ("lang" :: Text))
+    (Just lang)
+  return ((,) <$> langBoxRes <*> urlRes, toWidget csrf <> fvInput urlView <> fvInput langBoxView)
+
 siteLayoutMsg :: (RenderMessage site msg, site ~ UniWorX) => msg -> Widget -> Handler Html
 siteLayoutMsg msg widget = do
   mr <- getMessageRender
@@ -1785,6 +1801,13 @@ siteLayout' headingOverride widget = do
           \authTag -> addMessageWidget Info $ msgModal [whamlet|_{MsgUnauthorizedDisabledTag authTag}|] (Left $ SomeRoute (AuthPredsR, catMaybes [(toPathPiece GetReferer, ) . toPathPiece <$> mcurrentRoute]))
         getMessages
 
+  (langFormView, langFormEnctype) <- generateFormPost $ identifyForm FIDLanguage langForm
+  let langFormView' = wrapForm langFormView def
+        { formAction = Just $ SomeRoute LangR
+        , formSubmit = FormAutoSubmit
+        , formEncoding = langFormEnctype
+        }
+
   let highlight :: Route UniWorX -> Bool -- highlight last route in breadcrumbs, favorites taking priority
       highlight = let crumbs = mcons mcurrentRoute $ fst <$> reverse parents
                       navItems = map (view _2) favourites ++ map (urlRoute . menuItemRoute . view _1) menuTypes
@@ -3681,7 +3704,10 @@ instance YesodAuth UniWorX where
       addMessage Error $ toHtml msg
       redirect dest
 
-    renderAuthMessage _ _ = Auth.germanMessage -- TODO
+    renderAuthMessage _ ls = case lang of
+      ("en" : _) -> Auth.englishMessage
+      _other     -> Auth.germanMessage
+      where lang = Text.splitOn "-" $ selectLanguage' appLanguages ls
 
 instance YesodAuthPersist UniWorX
 
diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index fbb3093cf..7b9f922b1 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -5,6 +5,7 @@ module Handler.Profile
   , getUserNotificationR, postUserNotificationR
   , getSetDisplayEmailR, postSetDisplayEmailR
   , getCsvOptionsR, postCsvOptionsR
+  , postLangR
   ) where
 
 import Import
@@ -22,11 +23,15 @@ import qualified Data.Set as Set
 import qualified Database.Esqueleto as E
 import qualified Database.Esqueleto.Utils as E
 -- import           Database.Esqueleto      ((^.))
+import qualified Data.Text as Text
+import Data.List (inits)
 
 import qualified Data.CaseInsensitive as CI
 
 import Jobs
 
+import Web.Cookie
+
 
 data SettingsForm = SettingsForm
       { stgDisplayName          :: UserDisplayName
@@ -837,3 +842,24 @@ postCsvOptionsR = do
       , formEncoding = optionsEnctype
       , formAttrs = [ asyncSubmitAttr | isModal ]
       }
+
+postLangR :: Handler ()
+postLangR = do
+  ((langRes, _), _) <- runFormPost $ identifyForm FIDLanguage langForm
+
+  now <- liftIO getCurrentTime
+  formResult langRes $ \(lang, route) -> do
+    setCookie $ def
+      { setCookieName    = "_LANG"
+      , setCookieValue   = encodeUtf8 lang
+      , setCookieExpires = Just $ addUTCTime (400 * avgNominalYear) now
+      }
+    setLanguage lang
+    -- TODO: Write to user
+
+    app <- getYesod
+    let mr = renderMessage app . map (Text.intercalate "-") . reverse . inits $ Text.splitOn "-" lang
+    addMessage Success . toHtml $ mr MsgLanguageChanged
+    redirect route
+
+  invalidArgs ["Language form required"]
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index eb212bc1a..52024081d 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -228,6 +228,7 @@ data FormIdentifier
   | FIDAssignSubmissions
   | FIDUserAuthMode
   | FIDAllUsersAction
+  | FIDLanguage
   deriving (Eq, Ord, Read, Show)
 
 instance PathPiece FormIdentifier where
diff --git a/src/Utils/Lang.hs b/src/Utils/Lang.hs
index a8ebe1878..da8eafcda 100644
--- a/src/Utils/Lang.hs
+++ b/src/Utils/Lang.hs
@@ -6,6 +6,7 @@ import qualified Data.List.NonEmpty as NonEmpty
 import Data.List.NonEmpty (NonEmpty(..))
 
 import qualified Data.Text as Text
+import qualified Data.List as List
 
 
 selectLanguage :: MonadHandler m
@@ -18,13 +19,13 @@ selectLanguage' :: NonEmpty Lang -- ^ Available translations, first is default
                 -> Lang
 selectLanguage' (defL :| _) [] = defL
 selectLanguage' avL (l:ls)
-  | not $ null l
-  , Just l' <- find (== l) (NonEmpty.toList avL)
-  = l'
   | not $ null l
   , Just lParts <- NonEmpty.nonEmpty $ Text.splitOn "-" l
-  , found <- find ((NonEmpty.toList lParts `isPrefixOf`) . Text.splitOn "-") avL
-  = flip fromMaybe found $ selectLanguage' avL $ Text.intercalate "-" (NonEmpty.tail lParts) : ls
+  , found <- [ l' | lParts' <- reverse . List.inits $ NonEmpty.toList lParts
+                  , l' <- NonEmpty.toList avL
+                  , langMatches (Text.intercalate "-" lParts') l'
+                  ]
+  = fromMaybe (selectLanguage' avL ls) $ listToMaybe found
   | otherwise = selectLanguage' avL ls
 
 langMatches :: Lang -- ^ Needle
diff --git a/templates/widgets/navbar/navbar.hamlet b/templates/widgets/navbar/navbar.hamlet
index 966223643..77e1184a9 100644
--- a/templates/widgets/navbar/navbar.hamlet
+++ b/templates/widgets/navbar/navbar.hamlet
@@ -7,7 +7,8 @@ $newline never
       $# manually add favorites to navbar for small screens
       <li .navbar__list-item.navbar__list-item--favorite>
         <a .navbar__link-wrapper href="#">
-          <i .fas.fa-star>
+          <div .navbar__link-icon>
+            <i .fas .fa-2x .fa-star>
           <div .navbar__link-label>_{MsgNavigationFavourites}
 
       $forall (menuItem@MenuItem{menuItemType, menuItemRoute, menuItemModal}, menuIdent, _) <- menuTypes
@@ -36,3 +37,12 @@ $newline never
               $else
                 ^{navbarItem (menuItem, menuIdent)}
           $of _
+      <li .navbar__list-item--lang-wrapper>
+        <input type="checkbox" id="lang-checkbox" uw-no-checkbox>
+        <div id="lang-dropdown">
+          ^{langFormView'}
+        <div .navbar__list-item .navbar__list-item--language>
+          <label .navbar__link-wrapper for="lang-checkbox">
+            <div .navbar__link-icon>
+              <i .fas .fa-2x .fa-flag>
+            <div .navbar__link-label>_{MsgMenuLanguage}
diff --git a/templates/widgets/navbar/navbar.lucius b/templates/widgets/navbar/navbar.lucius
index c3885f975..888d8d5cb 100644
--- a/templates/widgets/navbar/navbar.lucius
+++ b/templates/widgets/navbar/navbar.lucius
@@ -68,14 +68,7 @@
   color: var(--color-lightwhite);
   transition: height .2s cubic-bezier(0.03, 0.43, 0.58, 1);
   overflow: hidden;
-
-  &:hover {
-    color: var(--color-lightwhite);
-
-    .navbar__link-icon {
-      opacity: 1;
-    }
-  }
+  cursor: pointer;
 }
 
 .navbar__link-icon {
@@ -88,6 +81,7 @@
   transition: opacity .2s ease;
   padding: 2px 4px;
   text-transform: uppercase;
+  font-weight: 600;
 }
 
 @media (min-width: 769px) {
@@ -146,7 +140,9 @@
 .navbar__list-item {
   position: relative;
   transition: background-color .1s ease;
-
+  &:not(.navbar__list-item--favorite) + .navbar__list-item--lang-wrapper {
+    margin-left: 12px;
+  }
   &:not(.navbar__list-item--favorite) + .navbar__list-item {
     margin-left: 12px;
   }
@@ -160,6 +156,9 @@
     &:not(.navbar__list-item--favorite) + .navbar__list-item {
       margin-left: 0;
     }
+    &:not(.navbar__list-item--favorite) + .navbar__list-item--lang-wrapper {
+      margin-left: 0;
+    }
   }
 }
 
@@ -219,9 +218,13 @@
   color: var(--color-dark);
 }
 
-.navbar .navbar__list-item:not(.navbar__list-item--active):not(.navbar__list-item--favorite):hover .navbar__link-wrapper {
+.navbar .navbar__list-item:not(.navbar__list-item--active):not(.navbar__list-item--favorite):hover .navbar__link-wrapper, #lang-checkbox:checked ~ * .navbar__link-wrapper {
   background-color: var(--color-dark);
   color: var(--color-lightwhite);
+
+  .navbar__link-icon {
+    opacity: 1;
+  }
 }
 
 /* sticky state */
@@ -267,3 +270,36 @@
     height: var(--header-height-collapsed);
   }
 }
+
+
+#lang-dropdown {
+    display: none;
+
+    position: fixed;
+    top: var(--header-height);
+    right: 0;
+    min-width: 200px;
+    z-index: 10;
+    background-color: white;
+    border-radius: 2px;
+    box-shadow: 0 0 10px rgba(0,0,0,0.3);
+
+    select {
+      display: block;
+    }
+
+    button {
+      display: block;
+      width: 100%;
+    }
+}
+
+#lang-checkbox:checked ~ #lang-dropdown {
+  display: block;
+}
+
+@media (max-width: 768px) {
+    #lang-dropdown {
+      top: var(--header-height-collapsed);
+    }
+}

From 717cf1ddfd05d63151fcc9df85b782d48a655f41 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 20 Oct 2019 10:40:43 +0200
Subject: [PATCH 002/126] style(i18n): prettier language select

---
 frontend/src/utils/inputs/inputs.scss | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/frontend/src/utils/inputs/inputs.scss b/frontend/src/utils/inputs/inputs.scss
index 6f12d81b8..f19a17bda 100644
--- a/frontend/src/utils/inputs/inputs.scss
+++ b/frontend/src/utils/inputs/inputs.scss
@@ -150,7 +150,6 @@ textarea {
   padding: 4px 13px;
   font-size: 1rem;
   font-family: var(--font-base);
-  -webkit-appearance: none;
   appearance: none;
   border: 1px solid #dbdbdb;
   border-radius: 2px;
@@ -184,8 +183,8 @@ textarea {
 
 /* OPTIONS */
 
-select {
-  -webkit-appearance: menulist;
+select[size = "1"], select:not([size]) {
+  appearance: menulist;
 }
 
 select,

From 59b8bb982d33b14a01133819c375884a8a7f7ce9 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 20 Oct 2019 13:54:15 +0200
Subject: [PATCH 003/126] fix(mail): use only RFC822-timezones

---
 src/Mail.hs | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/Mail.hs b/src/Mail.hs
index 53b0e6611..5a308636c 100644
--- a/src/Mail.hs
+++ b/src/Mail.hs
@@ -89,7 +89,7 @@ import qualified Data.Binary as Binary
 import "network-bsd" Network.BSD (getHostName)
 
 import Data.Time.Zones (TZ, utcTZ, utcToLocalTimeTZ, timeZoneForUTCTime)
-import Data.Time.LocalTime (ZonedTime(..))
+import Data.Time.LocalTime (ZonedTime(..), TimeZone(..))
 import Data.Time.Format (rfc822DateFormat)
 
 import Network.HaskellNet.SMTP (SMTPConnection)
@@ -515,8 +515,24 @@ setDateCurrent = setDate =<< liftIO getCurrentTime
 setDate :: (MonadHandler m, YesodMail (HandlerSite m)) => UTCTime -> MailT m ()
 setDate time = do
   tz <- mailDateTZ
-  let timeStr = formatTime defaultTimeLocale rfc822DateFormat $ ZonedTime (utcToLocalTimeTZ tz time) (timeZoneForUTCTime tz time)
+  let timeStr = formatTime defaultTimeLocale rfc822DateFormat $ ZonedTime (utcToLocalTimeTZ tz time) (rfc822zone $ timeZoneForUTCTime tz time)
   replaceMailHeader "Date" . Just $ pack timeStr
+  where
+    rfc822zone tz'
+      | tz' `elem` rfc822zones = tz'
+      | otherwise              = tz' { timeZoneName = "" }
+    rfc822zones = 
+      [ TimeZone 0         False "UT"
+      , TimeZone 0         False "GMT"
+      , TimeZone (-5 * 60) False "EST"
+      , TimeZone (-4 * 60) True  "EDT"
+      , TimeZone (-6 * 60) False "CST"
+      , TimeZone (-5 * 60) True  "CDT"
+      , TimeZone (-7 * 60) False "MST"
+      , TimeZone (-6 * 60) True  "MDT"
+      , TimeZone (-8 * 60) False "PST"
+      , TimeZone (-7 * 60) True  "PDT"
+      ]
 
 
 setMailSmtpData :: (MonadHandler m, YesodMail (HandlerSite m), MonadThrow m) => MailT m ()

From f0f94112f4d8b9af96c2048a046e43ce7ae7351b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 20 Oct 2019 15:55:02 +0200
Subject: [PATCH 004/126] feat(i18n): store language in user account

---
 models/users.model            |  2 +-
 src/Foundation.hs             | 56 +++++++++++++++++++++++++++++++++--
 src/Handler/Admin.hs          |  2 +-
 src/Handler/Profile.hs        | 16 +++-------
 src/Handler/Users/Add.hs      |  2 +-
 src/Handler/Utils/DateTime.hs |  2 +-
 src/Handler/Utils/Mail.hs     |  4 +--
 src/Mail.hs                   | 26 ++++------------
 src/Model/Migration.hs        |  8 +++++
 src/Model/Types.hs            |  1 +
 src/Model/Types/Languages.hs  | 25 ++++++++++++++++
 src/Utils/DateTime.hs         | 13 ++++----
 src/Utils/Lang.hs             |  2 +-
 templates/mail/support.hamlet | 11 +++----
 test/Database.hs              | 12 ++++----
 test/ModelSpec.hs             |  5 +++-
 16 files changed, 125 insertions(+), 62 deletions(-)
 create mode 100644 src/Model/Types/Languages.hs

diff --git a/models/users.model b/models/users.model
index 216f9ecb8..57ae421cf 100644
--- a/models/users.model
+++ b/models/users.model
@@ -28,7 +28,7 @@ User json    -- Each Uni2work user has a corresponding row in this table; create
     dateFormat     DateTimeFormat "default='%d.%m.%Y'"       -- preferred Date-only display format for user; user-defined
     timeFormat     DateTimeFormat "default='%R'"             -- preferred Time-only display format for user; user-defined
     downloadFiles  Bool default=false           -- Should files be opened in browser or downloaded? (users often oblivious that their browser has a setting for this)
-    mailLanguages  MailLanguages "default='[]'::jsonb"  -- Preferred language for eMail; i18n not yet implemented; user-defined
+    languages      Languages Maybe          -- Preferred language; user-defined
     notificationSettings NotificationSettings   -- Bit-array for which events email notifications are requested by user; user-defined
     warningDays    NominalDiffTime default=1209600 -- timedistance to pending deadlines for homepage infos
     csvOptions     CsvOptions "default='{}'::jsonb"
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 9294d7d8e..608d784ac 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -43,7 +43,9 @@ import Data.Map (Map, (!?))
 import qualified Data.Map as Map
 import qualified Data.HashSet as HashSet
 
-import Data.List (nubBy, (!!), findIndex)
+import Data.List (nubBy, (!!), findIndex, inits)
+
+import Web.Cookie
 
 import Data.Monoid (Any(..))
 
@@ -3487,7 +3489,7 @@ upsertCampusUser ldapData Creds{..} = do
       , userWarningDays          = userDefaultWarningDays
       , userShowSex              = userDefaultShowSex
       , userNotificationSettings = def
-      , userMailLanguages        = def
+      , userLanguages            = Nothing
       , userCsvOptions           = def
       , userTokensIssuedAfter    = Nothing
       , userCreated              = now
@@ -3607,6 +3609,49 @@ associateUserSchoolsByTerms uid = do
         , userSchoolIsOptOut = False
         }
 
+setLangCookie :: MonadHandler m => Lang -> m ()
+setLangCookie lang = do
+  now <- liftIO getCurrentTime
+  setCookie $ def
+    { setCookieName    = "_LANG"
+    , setCookieValue   = encodeUtf8 lang
+    , setCookieExpires = Just $ addUTCTime (400 * avgNominalYear) now
+    , setCookiePath    = Just "/"
+    }
+
+updateUserLanguage :: Maybe Lang -> DB (Maybe Lang)
+updateUserLanguage (Just lang) = do
+  unless (lang `elem` appLanguages) $
+    invalidArgs ["Unsupported language"]
+
+  muid <- maybeAuthId
+  case muid of
+    Just uid -> do
+      langs <- languages
+      update uid [ UserLanguages =. Just (Languages $ lang : nub (filter ((&&) <$> (`elem` appLanguages) <*> (/= lang)) langs)) ]
+      updateUserLanguage Nothing
+    Nothing -> do
+      setLangCookie lang
+      setLanguage lang
+      return $ Just lang
+updateUserLanguage Nothing = runMaybeT $ do
+  uid <- MaybeT maybeAuthId
+  User{..} <- MaybeT $ get uid
+  setLangs <- nub . filter (`elem` appLanguages) <$> languages
+  let userLanguages' = nub . filter (`elem` appLanguages) <$> userLanguages ^? _Just . _Wrapped
+  lang <- case (userLanguages', setLangs) of
+    (Just (l : _), _)
+      -> return l
+    (Nothing, l : _)
+      -> lift $ l <$ update uid [ UserLanguages =. Just (Languages setLangs) ]
+    (Just [], l : _)
+      -> return l
+    (_, [])
+      -> mzero
+  setLangCookie lang
+  setLanguage lang
+  return lang
+
 
 instance YesodAuth UniWorX where
     type AuthId UniWorX = UserId
@@ -3698,7 +3743,12 @@ instance YesodAuth UniWorX where
 
     authHttpManager = getsYesod appHttpManager
 
-    onLogin = addMessageI Success Auth.NowLoggedIn
+    onLogin = liftHandler $ do
+      mlang <- runDB $ updateUserLanguage Nothing
+      app <- getYesod
+      let mr | Just lang <- mlang = renderMessage app . map (Text.intercalate "-") . reverse . inits $ Text.splitOn "-" lang
+             | otherwise = renderMessage app []
+      addMessage Success . toHtml $ mr Auth.NowLoggedIn
 
     onErrorHtml dest msg = do
       addMessage Error $ toHtml msg
diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs
index 3b921bca3..307c7acf9 100644
--- a/src/Handler/Admin.hs
+++ b/src/Handler/Admin.hs
@@ -58,7 +58,7 @@ emailTestForm :: AForm (HandlerFor UniWorX) (Email, MailContext)
 emailTestForm = (,)
             <$> areq emailField (fslI MsgMailTestFormEmail) Nothing
             <*> ( MailContext
-                  <$> (MailLanguages <$> areq (reorderField appLanguagesOpts) (fslI MsgMailTestFormLanguages) Nothing)
+                  <$> (Languages <$> areq (reorderField appLanguagesOpts) (fslI MsgMailTestFormLanguages) Nothing)
                   <*> (toMailDateTimeFormat
                         <$> areq (selectField $ dateTimeFormatOptions SelFormatDateTime) (fslI MsgDateTimeFormat) Nothing
                         <*> areq (selectField $ dateTimeFormatOptions SelFormatDate) (fslI MsgDateFormat) Nothing
diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index 7b9f922b1..7e133098e 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -30,8 +30,6 @@ import qualified Data.CaseInsensitive as CI
 
 import Jobs
 
-import Web.Cookie
-
 
 data SettingsForm = SettingsForm
       { stgDisplayName          :: UserDisplayName
@@ -847,18 +845,12 @@ postLangR :: Handler ()
 postLangR = do
   ((langRes, _), _) <- runFormPost $ identifyForm FIDLanguage langForm
 
-  now <- liftIO getCurrentTime
   formResult langRes $ \(lang, route) -> do
-    setCookie $ def
-      { setCookieName    = "_LANG"
-      , setCookieValue   = encodeUtf8 lang
-      , setCookieExpires = Just $ addUTCTime (400 * avgNominalYear) now
-      }
-    setLanguage lang
-    -- TODO: Write to user
-
+    lang' <- runDB . updateUserLanguage $ Just lang
+    
     app <- getYesod
-    let mr = renderMessage app . map (Text.intercalate "-") . reverse . inits $ Text.splitOn "-" lang
+    let mr | Just lang'' <- lang' = renderMessage app . map (Text.intercalate "-") . reverse . inits $ Text.splitOn "-" lang''
+           | otherwise = renderMessage app []
     addMessage Success . toHtml $ mr MsgLanguageChanged
     redirect route
 
diff --git a/src/Handler/Users/Add.hs b/src/Handler/Users/Add.hs
index 96fe9e8a7..07858b9f1 100644
--- a/src/Handler/Users/Add.hs
+++ b/src/Handler/Users/Add.hs
@@ -76,7 +76,7 @@ postAdminUserAddR = do
         , userWarningDays             = userDefaultWarningDays
         , userShowSex                 = userDefaultShowSex
         , userNotificationSettings    = def
-        , userMailLanguages           = def
+        , userLanguages               = Nothing
         , userCsvOptions              = def
         , userTokensIssuedAfter       = Nothing
         , userCreated                 = now
diff --git a/src/Handler/Utils/DateTime.hs b/src/Handler/Utils/DateTime.hs
index cf337d3d1..6ff98943e 100644
--- a/src/Handler/Utils/DateTime.hs
+++ b/src/Handler/Utils/DateTime.hs
@@ -90,7 +90,7 @@ formatTimeW :: (HasLocalTime t) => SelDateTimeFormat -> t -> Widget
 formatTimeW s t = toWidget =<< formatTime s t
 
 formatTimeMail :: (MonadMail m, HasLocalTime t) => SelDateTimeFormat -> t -> m Text
-formatTimeMail sel t = fmap fromString $ Time.formatTime <$> (getTimeLocale' . mailLanguages <$> askMailLanguages) <*> (unDateTimeFormat <$> askMailDateTimeFormat sel) <*> pure (toLocalTime t)
+formatTimeMail sel t = fmap fromString $ Time.formatTime <$> (getTimeLocale' . view _Wrapped <$> askMailLanguages) <*> (unDateTimeFormat <$> askMailDateTimeFormat sel) <*> pure (toLocalTime t)
 
 getTimeLocale :: MonadHandler m => m TimeLocale
 getTimeLocale = getTimeLocale' <$> languages
diff --git a/src/Handler/Utils/Mail.hs b/src/Handler/Utils/Mail.hs
index 814657010..bccbd0ce8 100644
--- a/src/Handler/Utils/Mail.hs
+++ b/src/Handler/Utils/Mail.hs
@@ -47,14 +47,14 @@ userMailT :: ( MonadHandler m
              ) => UserId -> MailT m a -> m a
 userMailT uid mAct = do
   user@User
-    { userMailLanguages
+    { userLanguages
     , userDateTimeFormat
     , userDateFormat
     , userTimeFormat
     } <- liftHandler . runDB $ getJust uid
   let
     ctx = MailContext
-      { mcLanguages = userMailLanguages
+      { mcLanguages = fromMaybe def userLanguages
       , mcDateTimeFormat = \case
           SelFormatDateTime -> userDateTimeFormat
           SelFormatDate -> userDateFormat
diff --git a/src/Mail.hs b/src/Mail.hs
index 5a308636c..81457b574 100644
--- a/src/Mail.hs
+++ b/src/Mail.hs
@@ -10,7 +10,7 @@ module Mail
   , MailT, defMailT
   , MailSmtpData(..)
   , _MailSmtpDataSet
-  , MailContext(..), MailLanguages(..)
+  , MailContext(..)
   , MonadMail(..)
   , getMailMessageRender, getMailMsgRenderer
     -- * YesodMail
@@ -38,7 +38,7 @@ module Mail
 
 import ClassyPrelude.Yesod hiding (snoc, (.=), getMessageRender, derivePersistFieldJSON)
 
-import Model.Types.TH.JSON
+import Model.Types.Languages
 
 import Network.Mail.Mime hiding (addPart, addAttachment)
 import qualified Network.Mail.Mime as Mime (addPart)
@@ -109,8 +109,6 @@ import Data.Universe.Instances.Reverse ()
 import Data.Universe.Instances.Reverse.JSON ()
 import Data.Universe.Instances.Reverse.Hashable ()
 
-import GHC.Exts (IsList)
-
 import Control.Monad.Trans.Maybe (MaybeT(..))
 
 import Data.CaseInsensitive (CI)
@@ -160,19 +158,8 @@ _MailSmtpDataSet = to $ \MailSmtpData{..} -> none id
   ]
 
 
-newtype MailLanguages = MailLanguages { mailLanguages :: [Lang] }
-  deriving (Eq, Ord, Show, Read, Generic, Typeable)
-  deriving newtype (FromJSON, ToJSON, IsList)
-
-instance Default MailLanguages where
-  def = MailLanguages []
-
-instance Hashable MailLanguages
-instance NFData MailLanguages
-
-
 data MailContext = MailContext
-  { mcLanguages :: MailLanguages
+  { mcLanguages :: Languages
   , mcDateTimeFormat :: SelDateTimeFormat -> DateTimeFormat
   } deriving (Eq, Ord, Read, Show, Generic, Typeable)
 
@@ -191,7 +178,7 @@ instance Default MailContext where
 makeLenses_ ''MailContext
 
 class (MonadHandler m, MonadState Mail m) => MonadMail m where
-  askMailLanguages :: m MailLanguages
+  askMailLanguages :: m Languages
   askMailDateTimeFormat :: SelDateTimeFormat -> m DateTimeFormat
   tellMailSmtpData :: MailSmtpData -> m ()
 
@@ -214,7 +201,7 @@ getMailMessageRender :: ( MonadMail m
                         , HandlerSite m ~ site
                         , RenderMessage site msg
                         ) => m (msg -> Text)
-getMailMessageRender = renderMessage <$> getYesod <*> (mailLanguages <$> askMailLanguages)
+getMailMessageRender = renderMessage <$> getYesod <*> (view _Wrapped <$> askMailLanguages)
 
 getMailMsgRenderer :: forall site m.
                       ( MonadMail m
@@ -559,6 +546,3 @@ setMailSmtpData = do
         in tell $ mempty { smtpEnvelopeFrom = Last $ Just verp }
     | otherwise
     -> tell $ mempty { smtpEnvelopeFrom = Last $ Just from }
-
-
-derivePersistFieldJSON ''MailLanguages
diff --git a/src/Model/Migration.hs b/src/Model/Migration.hs
index 5f8ab418c..b22bae8fd 100644
--- a/src/Model/Migration.hs
+++ b/src/Model/Migration.hs
@@ -577,6 +577,14 @@ customMigrations = Map.fromListWith (>>)
           ALTER TABLE "allocation" DROP COLUMN "matching_log";
         |]
     )
+  , ( AppliedMigrationKey [migrationVersion|26.0.0|] [version|27.0.0|]
+    , whenM (tableExists "user") $
+        [executeQQ|
+          ALTER TABLE "user" ADD COLUMN "languages" jsonb;
+          UPDATE TABLE "user" SET "languages" = "mail_languages" where "mail_languages" <> '[]';
+          ALTER TABLE "user" DROP COLUMN "mail_languages";
+        |]
+    )
   ]
 
 
diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index 2dff836fe..3797b0647 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -14,3 +14,4 @@ import Model.Types.Submission as Types
 import Model.Types.Misc as Types
 import Model.Types.School as Types
 import Model.Types.Allocation as Types
+import Model.Types.Languages as Types
diff --git a/src/Model/Types/Languages.hs b/src/Model/Types/Languages.hs
new file mode 100644
index 000000000..8ed789fb6
--- /dev/null
+++ b/src/Model/Types/Languages.hs
@@ -0,0 +1,25 @@
+{-# LANGUAGE GeneralizedNewtypeDeriving, UndecidableInstances #-}
+
+module Model.Types.Languages
+  ( Languages(..)
+  ) where
+
+import ClassyPrelude.Yesod hiding (derivePersistFieldJSON)
+import GHC.Exts (IsList)
+
+import Model.Types.TH.JSON
+
+import Control.Lens.TH (makeWrapped)
+  
+
+newtype Languages = Languages [Lang]
+  deriving (Eq, Ord, Show, Read, Generic, Typeable)
+  deriving newtype (FromJSON, ToJSON, IsList)
+
+instance Default Languages where
+  def = Languages []
+
+instance Hashable Languages
+instance NFData Languages
+derivePersistFieldJSON ''Languages
+makeWrapped ''Languages
diff --git a/src/Utils/DateTime.hs b/src/Utils/DateTime.hs
index 71d120861..3120f49f5 100644
--- a/src/Utils/DateTime.hs
+++ b/src/Utils/DateTime.hs
@@ -19,6 +19,8 @@ import Data.Time (TimeLocale(..), NominalDiffTime, nominalDay)
 import Data.Time.Zones (TZ)
 import Data.Time.Zones.TH (includeSystemTZ)
 
+import qualified Data.List.NonEmpty as NonEmpty
+
 import Language.Haskell.TH
 import Language.Haskell.TH.Syntax (Lift(..))
 import Instances.TH.Lift ()
@@ -49,21 +51,18 @@ timeLocaleMap extra@((_, defLocale):_) = do
   localeMap <- newName "localeMap"
 
   let
-    localeMap' = funD localeMap $ map matchLang extra ++ [reduceLangList, defaultLang]
+    langs = NonEmpty.fromList $ map fst extra
+    
+    localeMap' = funD localeMap $ map matchLang extra ++ [defaultLang]
 
     defaultLang :: ClauseQ
     defaultLang =
       clause [listP []] (normalB $ localeExp defLocale) []
 
-    reduceLangList :: ClauseQ
-    reduceLangList = do
-      ls <- newName "ls"
-      clause [[p|(_ : $(varP ls))|]] (normalB [e|$(varE localeMap) $(varE ls)|]) []
-
     matchLang :: (Lang, String) -> ClauseQ
     matchLang (lang, localeStr) = do
       lang' <- newName "lang"
-      clause [[p|($(varP lang') : _)|]] (guardedB [(,) <$> normalG [e|$(varE lang') == lang|] <*> localeExp localeStr]) []
+      clause [varP lang'] (guardedB [(,) <$> normalG [e|selectLanguage' langs $(varE lang') == lang|] <*> localeExp localeStr]) []
 
     localeExp :: String -> ExpQ
     localeExp = lift <=< runIO . getLocale . Just
diff --git a/src/Utils/Lang.hs b/src/Utils/Lang.hs
index da8eafcda..c0de743ba 100644
--- a/src/Utils/Lang.hs
+++ b/src/Utils/Lang.hs
@@ -25,7 +25,7 @@ selectLanguage' avL (l:ls)
                   , l' <- NonEmpty.toList avL
                   , langMatches (Text.intercalate "-" lParts') l'
                   ]
-  = fromMaybe (selectLanguage' avL ls) $ listToMaybe found
+  = fromMaybe (selectLanguage' avL ls) . listToMaybe $ sortOn (Down . length) found
   | otherwise = selectLanguage' avL ls
 
 langMatches :: Lang -- ^ Needle
diff --git a/templates/mail/support.hamlet b/templates/mail/support.hamlet
index da915339e..86148b851 100644
--- a/templates/mail/support.hamlet
+++ b/templates/mail/support.hamlet
@@ -15,7 +15,7 @@ $newline never
         $of Left  Nothing
         $of Right Nothing
           <dt>Ungültige UserId erhalten!
-        $of Right (Just (Entity _ User{userDisplayName, userSurname, userIdent, userEmail, userMatrikelnummer, userMailLanguages}))
+        $of Right (Just (Entity _ User{userDisplayName, userSurname, userIdent, userEmail, userMatrikelnummer, userLanguages}))
           <dt>Name
           <dd>^{const (const (nameHtml userDisplayName userSurname))}
           <dt>Identifikation
@@ -25,10 +25,11 @@ $newline never
           $maybe matrnr <- userMatrikelnummer
             <dt>Matrikelnummer
             <dd>#{matrnr}
-          $if not (null (mailLanguages userMailLanguages))
-            <dt>Präferierte E-Mail Sprachen
-            $forall lang <- mailLanguages userMailLanguages
-              <dd>#{lang}
+          $maybe langs <- fmap (view _Wrapped) userLanguages
+            $if not (null langs)
+              <dt>Präferierte E-Mail Sprachen
+              $forall lang <- langs
+                <dd>#{lang}
       <dt>Zeit
       <dd>#{rtime}
       $maybe referer <- jReferer
diff --git a/test/Database.hs b/test/Database.hs
index a3ca55a07..274bfa77f 100755
--- a/test/Database.hs
+++ b/test/Database.hs
@@ -108,7 +108,7 @@ fillDb = do
     , userTimeFormat = userDefaultTimeFormat
     , userDownloadFiles = userDefaultDownloadFiles
     , userWarningDays = userDefaultWarningDays
-    , userMailLanguages = MailLanguages ["en"]
+    , userLanguages = Just $ Languages ["en"]
     , userNotificationSettings = def
     , userCreated = now
     , userLastLdapSynchronisation = Nothing
@@ -136,7 +136,7 @@ fillDb = do
     , userTimeFormat = userDefaultTimeFormat
     , userDownloadFiles = userDefaultDownloadFiles
     , userWarningDays = userDefaultWarningDays
-    , userMailLanguages = MailLanguages ["de"]
+    , userLanguages = Nothing
     , userNotificationSettings = def
     , userCreated = now
     , userLastLdapSynchronisation = Nothing
@@ -164,7 +164,7 @@ fillDb = do
     , userTimeFormat = userDefaultTimeFormat
     , userDownloadFiles = userDefaultDownloadFiles
     , userWarningDays = userDefaultWarningDays
-    , userMailLanguages = MailLanguages ["de"]
+    , userLanguages = Nothing
     , userNotificationSettings = def
     , userCreated = now
     , userLastLdapSynchronisation = Nothing
@@ -192,7 +192,7 @@ fillDb = do
     , userTimeFormat = userDefaultTimeFormat
     , userDownloadFiles = userDefaultDownloadFiles
     , userWarningDays = userDefaultWarningDays
-    , userMailLanguages = MailLanguages ["de"]
+    , userLanguages = Just $ Languages ["de"]
     , userNotificationSettings = def
     , userCreated = now
     , userLastLdapSynchronisation = Nothing
@@ -220,7 +220,7 @@ fillDb = do
     , userTimeFormat = userDefaultTimeFormat
     , userDownloadFiles = userDefaultDownloadFiles
     , userWarningDays = userDefaultWarningDays
-    , userMailLanguages = MailLanguages ["de"]
+    , userLanguages = Just $ Languages ["sn"]
     , userNotificationSettings = def
     , userCreated = now
     , userLastLdapSynchronisation = Nothing
@@ -248,7 +248,7 @@ fillDb = do
     , userTimeFormat = userDefaultTimeFormat
     , userDownloadFiles = userDefaultDownloadFiles
     , userWarningDays = userDefaultWarningDays
-    , userMailLanguages = MailLanguages ["de"]
+    , userLanguages = Nothing
     , userNotificationSettings = def
     , userCreated = now
     , userLastLdapSynchronisation = Nothing
diff --git a/test/ModelSpec.hs b/test/ModelSpec.hs
index cdd916f3b..936eccbbd 100644
--- a/test/ModelSpec.hs
+++ b/test/ModelSpec.hs
@@ -106,7 +106,10 @@ instance Arbitrary User where
 
     userDownloadFiles <- arbitrary
     userWarningDays <- arbitrary
-    userMailLanguages <- fmap MailLanguages $ sublistOf =<< shuffle (toList appLanguages)
+    userLanguages <- choose
+      [ pure Nothing
+      , fmap (Just . Languages) $ sublistOf =<< shuffle (toList appLanguages)
+      ]
     userNotificationSettings <- arbitrary
     userCsvOptions <- arbitrary
     userShowSex <- arbitrary

From 97a29ec68cb64e4264afc1d6a95e73e608b33748 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 20 Oct 2019 16:48:14 +0200
Subject: [PATCH 005/126] feat(i18n): close language select on click anywhere

---
 frontend/src/utils/navbar/navbar.js           | 48 +++++++++++++++++++
 .../src/utils/navbar/navbar.scss              |  0
 frontend/src/utils/utils.js                   |  2 +
 templates/widgets/navbar/navbar.hamlet        |  2 +-
 4 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/utils/navbar/navbar.js
 rename templates/widgets/navbar/navbar.lucius => frontend/src/utils/navbar/navbar.scss (100%)

diff --git a/frontend/src/utils/navbar/navbar.js b/frontend/src/utils/navbar/navbar.js
new file mode 100644
index 000000000..95af958f4
--- /dev/null
+++ b/frontend/src/utils/navbar/navbar.js
@@ -0,0 +1,48 @@
+import { Utility } from '../../core/utility';
+import './navbar.scss';
+
+
+export const LANGUAGE_SELECT_UTIL_SELECTOR = '[uw-language-select]';
+const LANGUAGE_SELECT_INITIALIZED_CLASS = 'language-select--initialized';
+
+
+@Utility({
+  selector: LANGUAGE_SELECT_UTIL_SELECTOR,
+})
+export class LanguageSelectUtil {
+  _element;
+  checkbox;
+  
+  constructor(element) {
+    if (!element) {
+      throw new Error('Language Select utility needs to be passed an element!');
+    }
+
+    if (element.classList.contains(LANGUAGE_SELECT_INITIALIZED_CLASS)) {
+      return false;
+    }
+
+    this._element = element;
+    this.checkbox = element.querySelector('#lang-checkbox');
+
+    window.addEventListener('click', event => this.close(event));
+
+    element.classList.add(LANGUAGE_SELECT_INITIALIZED_CLASS);
+  }
+
+  close(event) {
+    if (!this._element.contains(event.target) && window.document.contains(event.target)) {
+      this.checkbox.checked = false;
+    }
+  }
+
+  destroy() {
+    // TODO
+  }
+
+}
+
+
+export const NavbarUtils = [
+  LanguageSelectUtil,
+];
diff --git a/templates/widgets/navbar/navbar.lucius b/frontend/src/utils/navbar/navbar.scss
similarity index 100%
rename from templates/widgets/navbar/navbar.lucius
rename to frontend/src/utils/navbar/navbar.scss
diff --git a/frontend/src/utils/utils.js b/frontend/src/utils/utils.js
index 06e095af6..b539edb44 100644
--- a/frontend/src/utils/utils.js
+++ b/frontend/src/utils/utils.js
@@ -10,6 +10,7 @@ import { MassInput } from './mass-input/mass-input';
 import { Modal } from './modal/modal';
 import { Tooltip } from './tooltips/tooltips';
 import { CourseTeaser } from './course-teaser/course-teaser';
+import { NavbarUtils } from './navbar/navbar';
 
 export const Utils = [
   Alerts,
@@ -25,4 +26,5 @@ export const Utils = [
   ShowHide,
   Tooltip,
   CourseTeaser,
+  ...NavbarUtils,
 ];
diff --git a/templates/widgets/navbar/navbar.hamlet b/templates/widgets/navbar/navbar.hamlet
index 77e1184a9..0f6d227fb 100644
--- a/templates/widgets/navbar/navbar.hamlet
+++ b/templates/widgets/navbar/navbar.hamlet
@@ -37,7 +37,7 @@ $newline never
               $else
                 ^{navbarItem (menuItem, menuIdent)}
           $of _
-      <li .navbar__list-item--lang-wrapper>
+      <li .navbar__list-item--lang-wrapper uw-language-select>
         <input type="checkbox" id="lang-checkbox" uw-no-checkbox>
         <div id="lang-dropdown">
           ^{langFormView'}

From 205d7688bf821b1c899b9f3b4d3759a9d89de3cb Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 21 Oct 2019 14:02:09 +0200
Subject: [PATCH 006/126] fix(i18n): custom language inference

---
 .../frontend/{de.msg => de-de-formal.msg}     |  2 +-
 messages/uniworx/{de.msg => de-de-formal.msg} |  0
 src/Foundation.hs                             | 39 ++++++------
 src/Utils/Lang.hs                             | 59 +++++++++++++++----
 4 files changed, 69 insertions(+), 31 deletions(-)
 rename messages/frontend/{de.msg => de-de-formal.msg} (50%)
 rename messages/uniworx/{de.msg => de-de-formal.msg} (100%)

diff --git a/messages/frontend/de.msg b/messages/frontend/de-de-formal.msg
similarity index 50%
rename from messages/frontend/de.msg
rename to messages/frontend/de-de-formal.msg
index f01c31640..a17c4540c 100644
--- a/messages/frontend/de.msg
+++ b/messages/frontend/de-de-formal.msg
@@ -1,4 +1,4 @@
 FilesSelected: Dateien ausgewählt
 SelectFile: Datei auswählen
 SelectFiles: Datei(en) auswählen
-AsyncFormFailure: Da ist etwas schief gelaufen, das tut uns Leid. Falls das erneut passiert schicke uns gerne eine kurze Beschreibung dieses Ereignisses über das Hilfe-Widget rechts oben. Vielen Dank für deine Hilfe!
\ No newline at end of file
+AsyncFormFailure: Da ist etwas schief gelaufen, das tut uns Leid. Falls das erneut passiert schicken Sie uns bitte eine kurze Beschreibung dieses Ereignisses über das Hilfe-Widget rechts oben. Vielen Dank für Ihre Hilfe!
\ No newline at end of file
diff --git a/messages/uniworx/de.msg b/messages/uniworx/de-de-formal.msg
similarity index 100%
rename from messages/uniworx/de.msg
rename to messages/uniworx/de-de-formal.msg
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 608d784ac..9f973bfd5 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -253,12 +253,12 @@ maybeToMessage _      Nothing  _     = mempty
 maybeToMessage before (Just x) after = before <> (toMessage x) <> after
 
 -- Messages creates type UniWorXMessage and RenderMessage UniWorX instance
-mkMessage "UniWorX" "messages/uniworx" "de"
+mkMessage "UniWorX" "messages/uniworx" "de-de-formal"
 mkMessageVariant "UniWorX" "Campus" "messages/campus" "de"
 mkMessageVariant "UniWorX" "Dummy" "messages/dummy" "de"
 mkMessageVariant "UniWorX" "PWHash" "messages/pw-hash" "de"
 mkMessageVariant "UniWorX" "Button" "messages/button" "de"
-mkMessageVariant "UniWorX" "Frontend" "messages/frontend" "de"
+mkMessageVariant "UniWorX" "Frontend" "messages/frontend" "de-de-formal"
 
 instance RenderMessage UniWorX TermIdentifier where
   renderMessage foundation ls TermIdentifier{..} = case season of
@@ -299,11 +299,11 @@ instance RenderMessage UniWorX Load where
 newtype MsgLanguage = MsgLanguage Lang
   deriving (Eq, Ord, Show, Read)
 instance RenderMessage UniWorX MsgLanguage where
-  renderMessage foundation ls (MsgLanguage lang@(Text.splitOn "-" -> lang'))
-    | ["de", "DE"] <- lang' = mr MsgGermanGermany
-    | ("de" : _)   <- lang' = mr MsgGerman
-    | ["en", "EU"] <- lang' = mr MsgEnglishEurope
-    | ("en" : _)   <- lang' = mr MsgEnglish 
+  renderMessage foundation ls (MsgLanguage lang@(map mk . Text.splitOn "-" -> lang'))
+    | ("de" : "DE" : _) <- lang' = mr MsgGermanGermany
+    | ("de" : _)        <- lang' = mr MsgGerman
+    | ("en" : "EU" : _) <- lang' = mr MsgEnglishEurope
+    | ("en" : _)        <- lang' = mr MsgEnglish 
     | otherwise = lang
     where
       mr = renderMessage foundation ls
@@ -511,13 +511,13 @@ instance Button UniWorX ButtonSubmit where
 
 
 getTimeLocale' :: [Lang] -> TimeLocale
-getTimeLocale' = $(timeLocaleMap [("de", "de_DE.utf8"), ("en", "en_IE.utf8")])
+getTimeLocale' = $(timeLocaleMap [("de-de", "de_DE.utf8"), ("en-eu", "en_IE.utf8")])
 
 appTZ :: TZ
 appTZ = $(includeSystemTZ "Europe/Berlin")
 
 appLanguages :: NonEmpty Lang
-appLanguages = "de" :| ["en"]
+appLanguages = "de-de-formal" :| ["en-eu"]
 
 appLanguagesOpts :: ( MonadHandler m
                     , HandlerSite m ~ UniWorX
@@ -1571,7 +1571,7 @@ instance Yesod UniWorX where
     --   b) Validates that incoming write requests include that token in either a header or POST parameter.
     -- To add it, chain it together with the defaultMiddleware: yesodMiddleware = defaultYesodMiddleware . defaultCsrfMiddleware
     -- For details, see the CSRF documentation in the Yesod.Core.Handler module of the yesod-core package.
-    yesodMiddleware = headerMessagesMiddleware . defaultYesodMiddleware . normalizeRouteMiddleware . defaultCsrfMiddleware . updateFavouritesMiddleware
+    yesodMiddleware = languagesMiddleware appLanguages . headerMessagesMiddleware . defaultYesodMiddleware . normalizeRouteMiddleware . defaultCsrfMiddleware . updateFavouritesMiddleware
       where
         updateFavouritesMiddleware :: Handler a -> Handler a
         updateFavouritesMiddleware handler = (*> handler) . runMaybeT $ do
@@ -3632,24 +3632,25 @@ updateUserLanguage (Just lang) = do
       updateUserLanguage Nothing
     Nothing -> do
       setLangCookie lang
-      setLanguage lang
       return $ Just lang
 updateUserLanguage Nothing = runMaybeT $ do
   uid <- MaybeT maybeAuthId
   User{..} <- MaybeT $ get uid
-  setLangs <- nub . filter (`elem` appLanguages) <$> languages
-  let userLanguages' = nub . filter (`elem` appLanguages) <$> userLanguages ^? _Just . _Wrapped
-  lang <- case (userLanguages', setLangs) of
-    (Just (l : _), _)
+  setLangs <- toList . selectLanguages appLanguages <$> languages
+  highPrioSetLangs <- toList . selectLanguages appLanguages <$> highPrioRequestedLangs
+  let userLanguages' = toList . selectLanguages appLanguages <$> userLanguages ^? _Just . _Wrapped
+  lang <- case (userLanguages', setLangs, highPrioSetLangs) of
+    (_, _, hpl : _)
+      -> lift $ hpl <$ update uid [ UserLanguages =. Just (Languages highPrioSetLangs) ]
+    (Just (l : _), _, _)
       -> return l
-    (Nothing, l : _)
+    (Nothing, l : _, _)
       -> lift $ l <$ update uid [ UserLanguages =. Just (Languages setLangs) ]
-    (Just [], l : _)
+    (Just [], l : _, _)
       -> return l
-    (_, [])
+    (_, [], _)
       -> mzero
   setLangCookie lang
-  setLanguage lang
   return lang
 
 
diff --git a/src/Utils/Lang.hs b/src/Utils/Lang.hs
index c0de743ba..82103b848 100644
--- a/src/Utils/Lang.hs
+++ b/src/Utils/Lang.hs
@@ -3,11 +3,22 @@ module Utils.Lang where
 import ClassyPrelude.Yesod
 
 import qualified Data.List.NonEmpty as NonEmpty
-import Data.List.NonEmpty (NonEmpty(..))
+import Data.List.NonEmpty (NonEmpty(..), nonEmpty)
 
 import qualified Data.Text as Text
+import qualified Data.Text.Encoding as Text
 import qualified Data.List as List
 
+import qualified Data.CaseInsensitive as CI
+
+import Control.Lens (none)
+
+import Yesod.Core.Types (HandlerData(handlerRequest), YesodRequest(reqLangs))
+import qualified Network.Wai.Parse as NWP
+
+import Control.Monad.Trans.Maybe (MaybeT(..))
+import Control.Monad.Reader.Class (local)
+
 
 selectLanguage :: MonadHandler m
                => NonEmpty Lang -- ^ Available translations, first is default
@@ -17,18 +28,44 @@ selectLanguage avL = selectLanguage' avL <$> languages
 selectLanguage' :: NonEmpty Lang -- ^ Available translations, first is default
                 -> [Lang] -- ^ Languages in preference order
                 -> Lang
-selectLanguage' (defL :| _) [] = defL
-selectLanguage' avL (l:ls)
+selectLanguage' avL ls = NonEmpty.head $ selectLanguages avL ls
+
+selectLanguages :: NonEmpty Lang -> [Lang] -> NonEmpty Lang
+selectLanguages (defL :| _) [] = defL :| []
+selectLanguages avL (l:ls)
   | not $ null l
-  , Just lParts <- NonEmpty.nonEmpty $ Text.splitOn "-" l
-  , found <- [ l' | lParts' <- reverse . List.inits $ NonEmpty.toList lParts
-                  , l' <- NonEmpty.toList avL
-                  , langMatches (Text.intercalate "-" lParts') l'
-                  ]
-  = fromMaybe (selectLanguage' avL ls) . listToMaybe $ sortOn (Down . length) found
-  | otherwise = selectLanguage' avL ls
+  , Just lParts <- nonEmpty $ matchesFor l
+  , found <- List.nub
+      [ l'' | lParts' <- NonEmpty.toList lParts
+            , l' <- NonEmpty.toList avL
+            , l'' <- matchesFor l'
+            , langMatches lParts' l''
+            ]
+  = let now = nonEmpty . filter (\l' -> none (((==) `on` CI.mk) l') ls) $ sortOn (Down . length) found
+        others = selectLanguages avL ls
+     in maybe id (\now' others' -> NonEmpty.fromList $ toList now' ++ filter (`notElem` toList now') (toList others')) now others
+  | otherwise = selectLanguages avL ls
 
 langMatches :: Lang -- ^ Needle
             -> Lang -- ^ Haystack
             -> Bool
-langMatches = isPrefixOf `on` Text.splitOn "-"
+langMatches (CI.foldCase -> needle) (CI.foldCase -> haystack) = needle `elem` matchesFor haystack
+
+matchesFor :: Lang -> [Lang]
+matchesFor = mapMaybe (\frags -> Text.intercalate "-" frags <$ guard (not $ null frags)) . reverse . List.inits . Text.splitOn "-"
+
+
+highPrioRequestedLangs, lowPrioRequestedLangs :: forall m. MonadHandler m => m [Lang]
+highPrioRequestedLangs = fmap (concatMap $ fromMaybe []) . mapM runMaybeT $
+  [ lookupGetParams "_LANG"
+  , lookupCookies "_LANG"
+  , fmap pure . MaybeT $ lookupSession "_LANG"
+  ]
+lowPrioRequestedLangs = fromMaybe [] . fmap (mapMaybe (either (const Nothing) Just . Text.decodeUtf8') . NWP.parseHttpAccept) <$> lookupHeader "Accept-Language"
+
+languagesMiddleware :: forall site a. NonEmpty Lang -> HandlerFor site a -> HandlerFor site a
+languagesMiddleware avL act = do
+  pLangs <- fmap List.nub $ (<>) <$> highPrioRequestedLangs <*> lowPrioRequestedLangs
+  let langs = toList $ selectLanguages avL pLangs
+      setLangs hData = hData{ handlerRequest = (handlerRequest hData){ reqLangs = langs } }
+  local setLangs $ ($logDebugS "languages" . tshow . (pLangs,langs,) =<< languages) *> act

From 331ba1fed3ca5e25942c906b10f670e2ed03299b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 21 Oct 2019 15:14:30 +0200
Subject: [PATCH 007/126] feat(i18n): 12h-clock for english locales

---
 src/Foundation.hs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 9f973bfd5..3ba6f09bb 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -511,7 +511,7 @@ instance Button UniWorX ButtonSubmit where
 
 
 getTimeLocale' :: [Lang] -> TimeLocale
-getTimeLocale' = $(timeLocaleMap [("de-de", "de_DE.utf8"), ("en-eu", "en_IE.utf8")])
+getTimeLocale' = $(timeLocaleMap [("de-de", "de_DE.utf8"), ("en-GB", "en_GB.utf8")])
 
 appTZ :: TZ
 appTZ = $(includeSystemTZ "Europe/Berlin")
@@ -3625,14 +3625,11 @@ updateUserLanguage (Just lang) = do
     invalidArgs ["Unsupported language"]
 
   muid <- maybeAuthId
-  case muid of
-    Just uid -> do
-      langs <- languages
-      update uid [ UserLanguages =. Just (Languages $ lang : nub (filter ((&&) <$> (`elem` appLanguages) <*> (/= lang)) langs)) ]
-      updateUserLanguage Nothing
-    Nothing -> do
-      setLangCookie lang
-      return $ Just lang
+  for_ muid $ \uid -> do
+    langs <- languages
+    update uid [ UserLanguages =. Just (Languages $ lang : nub (filter ((&&) <$> (`elem` appLanguages) <*> (/= lang)) langs)) ]
+  setLangCookie lang
+  return $ Just lang
 updateUserLanguage Nothing = runMaybeT $ do
   uid <- MaybeT maybeAuthId
   User{..} <- MaybeT $ get uid

From 281c98fe916d1d44805605d5ffca3c6b3aecca36 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 21 Oct 2019 15:19:50 +0200
Subject: [PATCH 008/126] fix(i18n): prepare translation file for en-eu

---
 messages/uniworx/{en.msg => en-eu.msg} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename messages/uniworx/{en.msg => en-eu.msg} (100%)

diff --git a/messages/uniworx/en.msg b/messages/uniworx/en-eu.msg
similarity index 100%
rename from messages/uniworx/en.msg
rename to messages/uniworx/en-eu.msg

From 33ddbfb7ccd648bf875152ba2c626c0220088bb2 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 21 Oct 2019 15:43:22 +0200
Subject: [PATCH 009/126] fix(i18n): rename i18nWidgetFiles to proper language
 code

---
 templates/i18n/allocation-info/{de.hamlet => de-de-formal.hamlet} | 0
 templates/i18n/changelog/{de.hamlet => de-de-formal.hamlet}       | 0
 .../{de.hamlet => de-de-formal.hamlet}                            | 0
 .../{de.hamlet => de-de-formal.hamlet}                            | 0
 templates/i18n/data-protection/{de.hamlet => de-de-formal.hamlet} | 0
 .../computed-values-tip/{de.hamlet => de-de-formal.hamlet}        | 0
 templates/i18n/featureList/{de.hamlet => de-de-formal.hamlet}     | 0
 templates/i18n/html-input/{de.hamlet => de-de-formal.hamlet}      | 0
 templates/i18n/implementation/{de.hamlet => de-de-formal.hamlet}  | 0
 templates/i18n/imprint/{de.hamlet => de-de-formal.hamlet}         | 0
 templates/i18n/info-lecturer/{de.hamlet => de-de-formal.hamlet}   | 0
 templates/i18n/knownBugs/{de.hamlet => de-de-formal.hamlet}       | 0
 .../profile/displayNameRules/{de.hamlet => de-de-formal.hamlet}   | 0
 .../profile/tokenExplanation/{de.hamlet => de-de-formal.hamlet}   | 0
 .../i18n/set-display-email/{de.hamlet => de-de-formal.hamlet}     | 0
 templates/i18n/sheet-edit/{de.hamlet => de-de-formal.hamlet}      | 0
 .../csv-import-explanation/{de.hamlet => de-de-formal.hamlet}     | 0
 templates/i18n/unauth-home/{de.hamlet => de-de-formal.hamlet}     | 0
 18 files changed, 0 insertions(+), 0 deletions(-)
 rename templates/i18n/allocation-info/{de.hamlet => de-de-formal.hamlet} (100%)
 rename templates/i18n/changelog/{de.hamlet => de-de-formal.hamlet} (100%)
 rename templates/i18n/corrections-upload-instructions/{de.hamlet => de-de-formal.hamlet} (100%)
 rename templates/i18n/course-exam-office-explanation/{de.hamlet => de-de-formal.hamlet} (100%)
 rename templates/i18n/data-protection/{de.hamlet => de-de-formal.hamlet} (100%)
 rename templates/i18n/exam-users/computed-values-tip/{de.hamlet => de-de-formal.hamlet} (100%)
 rename templates/i18n/featureList/{de.hamlet => de-de-formal.hamlet} (100%)
 rename templates/i18n/html-input/{de.hamlet => de-de-formal.hamlet} (100%)
 rename templates/i18n/implementation/{de.hamlet => de-de-formal.hamlet} (100%)
 rename templates/i18n/imprint/{de.hamlet => de-de-formal.hamlet} (100%)
 rename templates/i18n/info-lecturer/{de.hamlet => de-de-formal.hamlet} (100%)
 rename templates/i18n/knownBugs/{de.hamlet => de-de-formal.hamlet} (100%)
 rename templates/i18n/profile/displayNameRules/{de.hamlet => de-de-formal.hamlet} (100%)
 rename templates/i18n/profile/tokenExplanation/{de.hamlet => de-de-formal.hamlet} (100%)
 rename templates/i18n/set-display-email/{de.hamlet => de-de-formal.hamlet} (100%)
 rename templates/i18n/sheet-edit/{de.hamlet => de-de-formal.hamlet} (100%)
 rename templates/i18n/table/csv-import-explanation/{de.hamlet => de-de-formal.hamlet} (100%)
 rename templates/i18n/unauth-home/{de.hamlet => de-de-formal.hamlet} (100%)

diff --git a/templates/i18n/allocation-info/de.hamlet b/templates/i18n/allocation-info/de-de-formal.hamlet
similarity index 100%
rename from templates/i18n/allocation-info/de.hamlet
rename to templates/i18n/allocation-info/de-de-formal.hamlet
diff --git a/templates/i18n/changelog/de.hamlet b/templates/i18n/changelog/de-de-formal.hamlet
similarity index 100%
rename from templates/i18n/changelog/de.hamlet
rename to templates/i18n/changelog/de-de-formal.hamlet
diff --git a/templates/i18n/corrections-upload-instructions/de.hamlet b/templates/i18n/corrections-upload-instructions/de-de-formal.hamlet
similarity index 100%
rename from templates/i18n/corrections-upload-instructions/de.hamlet
rename to templates/i18n/corrections-upload-instructions/de-de-formal.hamlet
diff --git a/templates/i18n/course-exam-office-explanation/de.hamlet b/templates/i18n/course-exam-office-explanation/de-de-formal.hamlet
similarity index 100%
rename from templates/i18n/course-exam-office-explanation/de.hamlet
rename to templates/i18n/course-exam-office-explanation/de-de-formal.hamlet
diff --git a/templates/i18n/data-protection/de.hamlet b/templates/i18n/data-protection/de-de-formal.hamlet
similarity index 100%
rename from templates/i18n/data-protection/de.hamlet
rename to templates/i18n/data-protection/de-de-formal.hamlet
diff --git a/templates/i18n/exam-users/computed-values-tip/de.hamlet b/templates/i18n/exam-users/computed-values-tip/de-de-formal.hamlet
similarity index 100%
rename from templates/i18n/exam-users/computed-values-tip/de.hamlet
rename to templates/i18n/exam-users/computed-values-tip/de-de-formal.hamlet
diff --git a/templates/i18n/featureList/de.hamlet b/templates/i18n/featureList/de-de-formal.hamlet
similarity index 100%
rename from templates/i18n/featureList/de.hamlet
rename to templates/i18n/featureList/de-de-formal.hamlet
diff --git a/templates/i18n/html-input/de.hamlet b/templates/i18n/html-input/de-de-formal.hamlet
similarity index 100%
rename from templates/i18n/html-input/de.hamlet
rename to templates/i18n/html-input/de-de-formal.hamlet
diff --git a/templates/i18n/implementation/de.hamlet b/templates/i18n/implementation/de-de-formal.hamlet
similarity index 100%
rename from templates/i18n/implementation/de.hamlet
rename to templates/i18n/implementation/de-de-formal.hamlet
diff --git a/templates/i18n/imprint/de.hamlet b/templates/i18n/imprint/de-de-formal.hamlet
similarity index 100%
rename from templates/i18n/imprint/de.hamlet
rename to templates/i18n/imprint/de-de-formal.hamlet
diff --git a/templates/i18n/info-lecturer/de.hamlet b/templates/i18n/info-lecturer/de-de-formal.hamlet
similarity index 100%
rename from templates/i18n/info-lecturer/de.hamlet
rename to templates/i18n/info-lecturer/de-de-formal.hamlet
diff --git a/templates/i18n/knownBugs/de.hamlet b/templates/i18n/knownBugs/de-de-formal.hamlet
similarity index 100%
rename from templates/i18n/knownBugs/de.hamlet
rename to templates/i18n/knownBugs/de-de-formal.hamlet
diff --git a/templates/i18n/profile/displayNameRules/de.hamlet b/templates/i18n/profile/displayNameRules/de-de-formal.hamlet
similarity index 100%
rename from templates/i18n/profile/displayNameRules/de.hamlet
rename to templates/i18n/profile/displayNameRules/de-de-formal.hamlet
diff --git a/templates/i18n/profile/tokenExplanation/de.hamlet b/templates/i18n/profile/tokenExplanation/de-de-formal.hamlet
similarity index 100%
rename from templates/i18n/profile/tokenExplanation/de.hamlet
rename to templates/i18n/profile/tokenExplanation/de-de-formal.hamlet
diff --git a/templates/i18n/set-display-email/de.hamlet b/templates/i18n/set-display-email/de-de-formal.hamlet
similarity index 100%
rename from templates/i18n/set-display-email/de.hamlet
rename to templates/i18n/set-display-email/de-de-formal.hamlet
diff --git a/templates/i18n/sheet-edit/de.hamlet b/templates/i18n/sheet-edit/de-de-formal.hamlet
similarity index 100%
rename from templates/i18n/sheet-edit/de.hamlet
rename to templates/i18n/sheet-edit/de-de-formal.hamlet
diff --git a/templates/i18n/table/csv-import-explanation/de.hamlet b/templates/i18n/table/csv-import-explanation/de-de-formal.hamlet
similarity index 100%
rename from templates/i18n/table/csv-import-explanation/de.hamlet
rename to templates/i18n/table/csv-import-explanation/de-de-formal.hamlet
diff --git a/templates/i18n/unauth-home/de.hamlet b/templates/i18n/unauth-home/de-de-formal.hamlet
similarity index 100%
rename from templates/i18n/unauth-home/de.hamlet
rename to templates/i18n/unauth-home/de-de-formal.hamlet

From 268d9e0b1cfc2a41079d42415fccc075ba909ee7 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 21 Oct 2019 15:51:22 +0200
Subject: [PATCH 010/126] fix(i18n): get started on i18n-breadcrumbs

---
 src/Foundation.hs | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 3ba6f09bb..64e0bd6ee 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1908,16 +1908,27 @@ applySystemMessages = liftHandler . runDB . runConduit $ selectSource [] [] .| C
         Nothing -> addMessage systemMessageSeverity content
 
 -- Define breadcrumbs.
+i18nCrumb :: ( RenderMessage (HandlerSite m) msg, MonadHandler m )
+          => msg
+          -> Maybe (Route (HandlerSite m))
+          -> m (Text, Maybe (Route (HandlerSite m)))
+i18nCrumb msg mbR = do
+  mr <- getMessageRender
+  return (mr msb, mbR)
+  
 instance YesodBreadcrumbs UniWorX where
-  breadcrumb (AuthR _)        = return ("Login"        , Just HomeR)
-  breadcrumb HomeR            = return ("Uni2work"     , Nothing)
-  breadcrumb UsersR           = return ("Benutzer"     , Just AdminR)
-  breadcrumb AdminUserAddR    = return ("Benutzer anlegen", Just UsersR)
-  breadcrumb (AdminUserR _)   = return ("Users"        , Just UsersR)
-  breadcrumb AdminR           = return ("Administration", Nothing)
-  breadcrumb AdminFeaturesR   = return ("Test"         , Just AdminR)
-  breadcrumb AdminTestR       = return ("Test"         , Just AdminR)
-  breadcrumb AdminErrMsgR     = return ("Test"         , Just AdminR)
+  breadcrumb (AuthR _)        = i18nCrumb MsgMenuLogin   $ Just HomeR
+  breadcrumb HomeR            = i18nCrumb MsgMenuHome      Nothing
+  breadcrumb UsersR           = i18nCrumb MsgMenuUsers   $ Just AdminR
+  breadcrumb AdminUserAddR    = i18nCrumb MsgMenuUserAdd $ Just UsersR
+  breadcrumb (AdminUserR cID) = do
+    uid <- decrypt cID
+    User{..} <- runDB $ get404 uid
+    return (userDisplayName, Just UsersR
+  breadcrumb AdminR           = i18nCrumb MsgAdminHeading           Nothing
+  breadcrumb AdminFeaturesR   = i18nCrumb MsgAdminFeaturesHeading $ Just AdminR 
+  breadcrumb AdminTestR       = i18nCrumb MsgMenuAdminTest        $ Just AdminR
+  breadcrumb AdminErrMsgR     = i18nCrumb MsgAdminErrMsg          $ Just AdminR
   
   breadcrumb SchoolListR      = return ("Institute"    , Just AdminR)
   breadcrumb (SchoolR ssh SchoolEditR) = return (original (unSchoolKey ssh), Just SchoolListR)

From 6ca87f0d66c40ba651f4dbe0e2155790b74613c8 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 22 Oct 2019 00:13:22 +0200
Subject: [PATCH 011/126] refactor(i18n): i18n for breadcrumbs

---
 messages/uniworx/de-de-formal.msg |  57 ++++-
 src/Foundation.hs                 | 337 +++++++++++++++++++++---------
 src/Handler/CryptoIDDispatch.hs   |   4 +-
 src/Utils/Lang.hs                 |   2 +-
 test/MailSpec.hs                  |   7 +-
 test/Model/Types/LanguagesSpec.hs |  14 ++
 test/Model/TypesSpec.hs           |   2 +
 test/ModelSpec.hs                 |   7 +-
 test/TestImport.hs                |   2 +-
 9 files changed, 313 insertions(+), 119 deletions(-)
 create mode 100644 test/Model/Types/LanguagesSpec.hs

diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index 825036b04..45a6a6e53 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -1067,6 +1067,7 @@ MenuProfileData: Persönliche Daten
 MenuTermCreate: Neues Semester anlegen
 MenuCourseNew: Neuen Kurs anlegen
 MenuTermEdit: Semester editieren
+MenuTermCurrent: Aktuelles Semester
 MenuCorrection: Korrektur
 MenuCorrections: Korrekturen
 MenuCorrectionsOwn: Meine Korrekturen
@@ -1095,8 +1096,8 @@ MenuCorrectionsUpload: Korrekturen hochladen
 MenuCorrectionsDownload: Offene Abgaben herunterladen
 MenuCorrectionsCreate: Abgaben registrieren
 MenuCorrectionsGrade: Abgaben online korrigieren
-MenuCorrectionsAssign: Zuteilung Korrekturen
-MenuCorrectionsAssignSheet name@Text: Zuteilung Korrekturen von #{name}
+MenuCorrectionsAssign: Zuteilung der Korrekturen
+MenuCorrectionsAssignSheet name@Text: Zuteilung der Korrekturen von #{name}
 MenuAuthPreds: Authorisierungseinstellungen
 MenuTutorialDelete: Tutorium löschen
 MenuTutorialEdit: Tutorium editieren
@@ -1120,6 +1121,58 @@ MenuCourseNewsEdit: Kursnachricht bearbeiten
 MenuCourseEventNew: Neuer Kurstermin
 MenuCourseEventEdit: Kurstermin bearbeiten
 
+BreadcrumbSubmissionFile: Datei
+BreadcrumbSubmissionUserInvite: Einladung zur Abgabe
+BreadcrumbCryptoIDDispatch: CryptoID-Weiterleitung
+BreadcrumbCourseAppsFiles: Bewerbungsdateien
+BreadcrumbCourseNotes: Kursnotizen
+BreadcrumbHiWis: Korrektoren
+BreadcrumbMaterial: Material
+BreadcrumbSheet: Übungsblatt
+BreadcrumbTutorial: Tutorium
+BreadcrumbExam: Prüfung
+BreadcrumbApplicant: Bewerber
+BreadcrumbCourseRegister: Anmelden
+BreadcrumbCourseRegisterTemplate: Bewerbungsvorlagen
+BreadcrumbCourseFavourite: Favorisieren
+BreadcrumbCourse: Kurs
+BreadcrumbAllocationRegister: Teilnahme registrieren
+BreadcrumbAllocation: Zentralanmeldung
+BreadcrumbTerm: Semester
+BreadcrumbSchool: Institut
+BreadcrumbUser: Benutzer
+BreadcrumbStatic: Statische Resource
+BreadcrumbFavicon: Favicon
+BreadcrumbRobots: robots.txt
+BreadcrumbLecturerInvite: Einladung zum Kursverwalter
+BreadcrumbExamOfficeUserInvite: Einladung bzgl. Prüfungsleistungen
+BreadcrumbFunctionaryInvite: Einladung zum Instituts-Funktionär
+BreadcrumbUserDelete: Nutzer-Account löschen
+BreadcrumbUserHijack: Nutzer-Sitzung übernehmen
+BreadcrumbSystemMessage: Statusmeldung
+BreadcrumbSubmission: Abgabe
+BreadcrumbCourseNews: Kursnachricht
+BreadcrumbCourseNewsDelete: Kursnachricht löschen
+BreadcrumbCourseEventDelete: Kurstermin löschen
+BreadcrumbProfile: Einstellungen
+BreadcrumbAllocationInfo: Ablauf einer Zentralanmeldung
+BreadcrumbCourseParticipantInvitation: Einladung zum Kursteilnehmer
+BreadcrumbMaterialArchive: Archiv
+BreadcrumbMaterialFile: Datei
+BreadcrumbSheetArchive: Dateien
+BreadcrumbSheetIsCorrector: Korrektor-Überprüfung
+BreadcrumbSheetPseudonym: Pseudonym
+BreadcrumbSheetCorrectorInvite: Einladung zum Korrektor
+BreadcrumbSheetFile: Datei
+BreadcrumbTutorialRegister: Anmelden
+BreadcrumbTutorInvite: Einladung zum Tutor
+BreadcrumbExamCorrectorInvite: Einladung zum Prüfungskorrektor
+BreadcrumbExamParticipantInvite: Einladung zum Prüfungsteilnehmer
+BreadcrumbExamRegister: Anmelden
+BreadcrumbApplicationFiles: Bewerbungsdateien
+BreadcrumbCourseNewsArchive: Archiv
+BreadcrumbCourseNewsFile: Datei
+
 AuthPredsInfo: Um eigene Veranstaltungen aus Sicht der Teilnehmer anzusehen, können Veranstalter und Korrektoren hier die Prüfung ihrer erweiterten Berechtigungen temporär deaktivieren. Abgewählte Prädikate schlagen immer fehl. Abgewählte Prädikate werden also nicht geprüft um Zugriffe zu gewähren, welche andernfalls nicht erlaubt wären. Diese Einstellungen gelten nur temporär bis Ihre Sitzung abgelaufen ist, d.h. bis ihr Browser-Cookie abgelaufen ist. Durch Abwahl von Prädikaten kann man sich höchstens temporär aussperren.
 AuthPredsActive: Aktive Authorisierungsprädikate
 AuthPredsActiveChanged: Authorisierungseinstellungen für aktuelle Sitzung gespeichert
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 64e0bd6ee..1b17acd0c 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1511,6 +1511,15 @@ redirectAccess url = do
     Authorized -> redirect url
     _          -> permissionDeniedI MsgUnauthorizedRedirect
 
+redirectAccessWith :: (MonadThrow m, MonadHandler m, HandlerSite m ~ UniWorX) => Status -> Route UniWorX -> m a
+redirectAccessWith status url = do
+  -- must hide URL if not authorized
+  access <- evalAccess url False
+  case access of
+    Authorized -> redirectWith status url
+    _          -> permissionDeniedI MsgUnauthorizedRedirect
+
+
 -- | Verify that the currently logged in user is lecturer or corrector for at least one sheet for the given course
 evalAccessCorrector :: (MonadThrow m, MonadHandler m, HandlerSite m ~ UniWorX)
             => TermId -> SchoolId -> CourseShorthand -> m AuthResult
@@ -1725,7 +1734,21 @@ siteLayout' headingOverride widget = do
   mcurrentRoute <- getCurrentRoute
 
   -- Get the breadcrumbs, as defined in the YesodBreadcrumbs instance.
-  (title, parents) <- breadcrumbs
+  let
+    breadcrumbs' mcRoute = do
+      mr <- getMessageRender
+      case mcRoute of
+        Nothing -> return (mr MsgErrorResponseTitleNotFound, [])
+        Just cRoute -> do
+          (title, next) <- breadcrumb cRoute
+          crumbs <- go [] next
+          return (title, crumbs)
+      where
+        go crumbs  Nothing      = return crumbs
+        go crumbs (Just cRoute) = do
+          (title, next) <- breadcrumb cRoute
+          go ((cRoute, title) : crumbs) next
+  (title, parents) <- breadcrumbs' mcurrentRoute
 
   --         let isParent :: Route UniWorX -> Bool
   --             isParent r = r == (fst parents)
@@ -1914,141 +1937,253 @@ i18nCrumb :: ( RenderMessage (HandlerSite m) msg, MonadHandler m )
           -> m (Text, Maybe (Route (HandlerSite m)))
 i18nCrumb msg mbR = do
   mr <- getMessageRender
-  return (mr msb, mbR)
-  
+  return (mr msg, mbR)
+
+-- `breadcrumb` _really_ needs to be total for _all_ routes
+--
+-- Even if routes are POST only or don't usually use `siteLayout` they will if
+-- an error occurs.
+--
+-- Keep in mind that Breadcrumbs are also shown by the 403-Handler,
+-- i.e. information might be leaked by not performing permission checks if the
+-- breadcrumb value depends on sensitive content (like an user's name).
 instance YesodBreadcrumbs UniWorX where
   breadcrumb (AuthR _)        = i18nCrumb MsgMenuLogin   $ Just HomeR
+  breadcrumb (StaticR _)      = i18nCrumb MsgBreadcrumbStatic Nothing
+  breadcrumb FaviconR         = i18nCrumb MsgBreadcrumbFavicon Nothing
+  breadcrumb RobotsR          = i18nCrumb MsgBreadcrumbRobots Nothing
+
   breadcrumb HomeR            = i18nCrumb MsgMenuHome      Nothing
   breadcrumb UsersR           = i18nCrumb MsgMenuUsers   $ Just AdminR
   breadcrumb AdminUserAddR    = i18nCrumb MsgMenuUserAdd $ Just UsersR
-  breadcrumb (AdminUserR cID) = do
+  breadcrumb (AdminUserR cID) = maybeT (i18nCrumb MsgBreadcrumbUser $ Just UsersR) $ do
+    guardM . hasReadAccessTo $ AdminUserR cID
     uid <- decrypt cID
-    User{..} <- runDB $ get404 uid
-    return (userDisplayName, Just UsersR
+    User{..} <- MaybeT . runDB $ get uid
+    return (userDisplayName, Just UsersR)
+  breadcrumb (AdminUserDeleteR cID) = i18nCrumb MsgBreadcrumbUserDelete . Just $ AdminUserR cID
+  breadcrumb (AdminHijackUserR cID) = i18nCrumb MsgBreadcrumbUserHijack . Just $ AdminUserR cID 
+  breadcrumb (UserNotificationR cID) = do
+    mayList <- hasReadAccessTo UsersR
+    if
+      | mayList
+        -> i18nCrumb MsgMenuUserNotifications . Just $ AdminUserR cID
+      | otherwise
+        -> i18nCrumb MsgMenuUserNotifications $ Just ProfileR
+  breadcrumb (UserPasswordR cID) = do
+    mayList <- hasReadAccessTo UsersR
+    if
+      | mayList
+        -> i18nCrumb MsgMenuUserPassword . Just $ AdminUserR cID
+      | otherwise
+        -> i18nCrumb MsgMenuUserPassword $ Just ProfileR
+  breadcrumb AdminNewFunctionaryInviteR = i18nCrumb MsgMenuLecturerInvite $ Just UsersR
+  breadcrumb AdminFunctionaryInviteR = i18nCrumb MsgBreadcrumbFunctionaryInvite Nothing
+
   breadcrumb AdminR           = i18nCrumb MsgAdminHeading           Nothing
   breadcrumb AdminFeaturesR   = i18nCrumb MsgAdminFeaturesHeading $ Just AdminR 
   breadcrumb AdminTestR       = i18nCrumb MsgMenuAdminTest        $ Just AdminR
-  breadcrumb AdminErrMsgR     = i18nCrumb MsgAdminErrMsg          $ Just AdminR
+  breadcrumb AdminErrMsgR     = i18nCrumb MsgMenuAdminErrMsg      $ Just AdminR
   
-  breadcrumb SchoolListR      = return ("Institute"    , Just AdminR)
-  breadcrumb (SchoolR ssh SchoolEditR) = return (original (unSchoolKey ssh), Just SchoolListR)
-  breadcrumb SchoolNewR       = return ("Neu"          , Just SchoolListR)
+  breadcrumb SchoolListR      = i18nCrumb MsgMenuSchoolList       $ Just AdminR
+  breadcrumb (SchoolR ssh SchoolEditR) = maybeT (i18nCrumb MsgBreadcrumbSchool $ Just SchoolListR) $ do
+    School{..} <- MaybeT . runDB $ get ssh
+    return (original schoolName, Just SchoolListR)
+  breadcrumb SchoolNewR       = i18nCrumb MsgMenuSchoolNew        $ Just SchoolListR
 
-  breadcrumb (ExamOfficeR EOExamsR)  = return ("Prüfungen", Nothing)
-  breadcrumb (ExamOfficeR EOFieldsR) = return ("Fächer"   , Just $ ExamOfficeR EOExamsR)
-  breadcrumb (ExamOfficeR EOUsersR)  = return ("Benutzer" , Just $ ExamOfficeR EOExamsR)
+  breadcrumb (ExamOfficeR EOExamsR)  = i18nCrumb MsgMenuExamOfficeExams    Nothing
+  breadcrumb (ExamOfficeR EOFieldsR) = i18nCrumb MsgMenuExamOfficeFields . Just $ ExamOfficeR EOExamsR
+  breadcrumb (ExamOfficeR EOUsersR)  = i18nCrumb MsgMenuExamOfficeUsers . Just $ ExamOfficeR EOExamsR
+  breadcrumb (ExamOfficeR EOUsersInviteR) = i18nCrumb MsgBreadcrumbExamOfficeUserInvite Nothing
 
-  breadcrumb InfoR            = return ("Information"  , Nothing)
-  breadcrumb InfoLecturerR    = return ("Veranstalter" , Just InfoR)
-  breadcrumb DataProtR        = return ("Datenschutz"  , Just InfoR)
-  breadcrumb InfoAllocationR  = return ("Zentralanmeldungen", Just InfoR)
-  breadcrumb ImpressumR       = return ("Impressum"    , Just InfoR)
-  breadcrumb VersionR         = return ("Versionsgeschichte", Just InfoR)
+  breadcrumb InfoR            = i18nCrumb MsgMenuInformation     Nothing
+  breadcrumb InfoLecturerR    = i18nCrumb MsgInfoLecturerTitle $ Just InfoR
+  breadcrumb DataProtR        = i18nCrumb MsgMenuDataProt      $ Just InfoR
+  breadcrumb InfoAllocationR  = i18nCrumb MsgBreadcrumbAllocationInfo $ Just InfoR
+  breadcrumb ImpressumR       = i18nCrumb MsgMenuImpressum     $ Just InfoR
+  breadcrumb VersionR         = i18nCrumb MsgMenuVersion       $ Just InfoR
 
 
-  breadcrumb HelpR            = return ("Hilfe"        , Just HomeR)
+  breadcrumb HelpR            = i18nCrumb MsgMenuHelp            Nothing
 
 
-  breadcrumb HealthR          = return ("Status"        , Nothing)
-  breadcrumb InstanceR        = return ("Identifikation", Nothing)
+  breadcrumb HealthR          = i18nCrumb MsgMenuHealth          Nothing
+  breadcrumb InstanceR        = i18nCrumb MsgMenuInstance        Nothing
 
+  breadcrumb ProfileR         = i18nCrumb MsgBreadcrumbProfile   Nothing
+  breadcrumb SetDisplayEmailR = i18nCrumb MsgUserDisplayEmail  $ Just ProfileR
+  breadcrumb ProfileDataR     = i18nCrumb MsgMenuProfileData   $ Just ProfileR
+  breadcrumb AuthPredsR       = i18nCrumb MsgMenuAuthPreds     $ Just ProfileR
+  breadcrumb CsvOptionsR      = i18nCrumb MsgCsvOptions        $ Just ProfileR
+  breadcrumb LangR            = i18nCrumb MsgMenuLanguage      $ Just ProfileR
 
-  breadcrumb ProfileR         = return ("Einstellungen"    , Just HomeR)
-  breadcrumb SetDisplayEmailR = return ("Öffentliche E-Mail Adresse", Just ProfileR)
-  breadcrumb ProfileDataR     = return ("Persönliche Daten", Just ProfileR)
-  breadcrumb AuthPredsR       = return ("Authorisierung"   , Just ProfileR)
+  breadcrumb TermShowR              = i18nCrumb MsgMenuTermShow    $ Just HomeR
+  breadcrumb TermCurrentR           = i18nCrumb MsgMenuTermCurrent $ Just TermShowR
+  breadcrumb TermEditR              = i18nCrumb MsgMenuTermCreate  $ Just TermShowR
+  breadcrumb (TermEditExistR tid)   = i18nCrumb MsgMenuTermEdit    . Just $ TermCourseListR tid
+  breadcrumb (TermCourseListR tid)  = maybeT (i18nCrumb MsgBreadcrumbTerm $ Just CourseListR) $ do -- redirect only, used in other breadcrumbs
+    guardM . lift . runDB $ isJust <$> get tid
+    i18nCrumb (ShortTermIdentifier $ unTermKey tid) $ Just CourseListR
 
-  breadcrumb TermShowR              = return ("Semester"  , Just HomeR)
-  breadcrumb TermCurrentR           = return ("Aktuell"   , Just TermShowR)
-  breadcrumb TermEditR              = return ("Neu"       , Just TermCurrentR)
-  breadcrumb (TermEditExistR tid)   = return ("Editieren" , Just $ TermCourseListR tid)
-  breadcrumb (TermCourseListR (unTermKey -> tid)) = getMessageRender <&> \mr -> (mr $ ShortTermIdentifier tid, Just CourseListR)
+  breadcrumb (TermSchoolCourseListR tid ssh) = maybeT (i18nCrumb MsgBreadcrumbSchool . Just $ TermCourseListR tid) $ do -- redirect only, used in other breadcrumbs
+    guardM . lift . runDB $
+      (&&) <$> fmap isJust (get ssh)
+           <*> fmap isJust (get tid)
+    return (original $ unSchoolKey ssh, Just $ TermCourseListR tid)
 
-  breadcrumb (TermSchoolCourseListR tid ssh)  = return (original $ unSchoolKey ssh, Just $ TermCourseListR tid)
-
-  breadcrumb AllocationListR        = return ("Zentralanmeldungen", Just HomeR)
-  breadcrumb (AllocationR tid ssh ash AShowR) = do
+  breadcrumb AllocationListR        = i18nCrumb MsgAllocationListTitle $ Just HomeR
+  breadcrumb (AllocationR tid ssh ash AShowR) = maybeT (i18nCrumb MsgBreadcrumbAllocation $ Just AllocationListR) $ do
     mr <- getMessageRender
-    Entity _ Allocation{allocationName} <- runDB . getBy404 $ TermSchoolAllocationShort tid ssh ash
+    Entity _ Allocation{allocationName} <- MaybeT . runDB . getBy $ TermSchoolAllocationShort tid ssh ash
     return ([st|#{allocationName} (#{mr (ShortTermIdentifier (unTermKey tid))}, #{original (unSchoolKey ssh)})|], Just $ AllocationListR)
+  breadcrumb (AllocationR tid ssh ash ARegisterR) = i18nCrumb MsgBreadcrumbAllocationRegister . Just $ AllocationR tid ssh ash AShowR
+  breadcrumb (AllocationR tid ssh ash (AApplyR cID)) = maybeT (i18nCrumb MsgBreadcrumbCourse . Just $ AllocationR tid ssh ash AShowR) $ do
+    cid <- decrypt cID
+    Course{..} <- hoist runDB $ do
+      aid <- MaybeT . getKeyBy $ TermSchoolAllocationShort tid ssh ash 
+      guardM . lift $ exists [ AllocationCourseAllocation ==. aid, AllocationCourseCourse ==. cid ]
+      MaybeT $ get cid
+    return (original courseName, Just $ AllocationR tid ssh ash AShowR)
 
-  breadcrumb  CourseListR                 = return ("Kurse"    , Nothing)
-  breadcrumb  CourseNewR                  = return ("Neu"      , Just CourseListR)
-  breadcrumb (CourseR tid ssh csh CShowR) = return (original csh, Just $ TermSchoolCourseListR tid ssh)
-  --         (CourseR tid ssh csh CRegisterR) -- is POST only
-  breadcrumb (CourseR tid ssh csh CEditR)     = return ("Editieren"  , Just $ CourseR tid ssh csh CShowR)
-  breadcrumb (CourseR tid ssh csh CUsersR)    = return ("Anmeldungen", Just $ CourseR tid ssh csh CShowR)
-  breadcrumb (CourseR tid ssh csh CAddUserR)  = return ("Kursteilnehmer hinzufügen", Just $ CourseR tid ssh csh CUsersR)
-  breadcrumb (CourseR tid ssh csh CInviteR)   = return ("Einladung", Just $ CourseR tid ssh csh CShowR)
-  breadcrumb (CourseR tid ssh csh CExamOfficeR) = return ("Prüfungsamter", Just $ CourseR tid ssh csh CShowR)
-  breadcrumb (CourseR tid ssh csh (CUserR cID)) = do
+  breadcrumb  CourseListR                 = i18nCrumb MsgMenuCourseList   Nothing
+  breadcrumb  CourseNewR                  = i18nCrumb MsgMenuCourseNew  $ Just CourseListR
+  breadcrumb (CourseR tid ssh csh CShowR) = maybeT (i18nCrumb MsgBreadcrumbCourse . Just $ TermSchoolCourseListR tid ssh) $ do
+    guardM . lift . runDB . existsBy $ TermSchoolCourseShort tid ssh csh
+    return (original csh, Just $ TermSchoolCourseListR tid ssh)
+  breadcrumb (CourseR tid ssh csh CEditR)     = i18nCrumb MsgMenuCourseEdit . Just $ CourseR tid ssh csh CShowR
+  breadcrumb (CourseR tid ssh csh CUsersR)    = i18nCrumb MsgMenuCourseMembers . Just $ CourseR tid ssh csh CShowR
+  breadcrumb (CourseR tid ssh csh CAddUserR)  = i18nCrumb MsgMenuCourseAddMembers . Just $ CourseR tid ssh csh CUsersR
+  breadcrumb (CourseR tid ssh csh CInviteR)   = i18nCrumb MsgBreadcrumbCourseParticipantInvitation . Just $ CourseR tid ssh csh CShowR
+  breadcrumb (CourseR tid ssh csh CExamOfficeR) = i18nCrumb MsgMenuCourseExamOffice . Just $ CourseR tid ssh csh CShowR
+  breadcrumb (CourseR tid ssh csh (CUserR cID)) = maybeT (i18nCrumb MsgBreadcrumbUser . Just $ CourseR tid ssh csh CUsersR) $ do
+    guardM . hasReadAccessTo . CourseR tid ssh csh $ CUserR cID
     uid <- decrypt cID
-    User{userDisplayName} <- runDB $ get404 uid
-    return (userDisplayName, Just $ CourseR tid ssh csh CShowR)
-  breadcrumb (CourseR tid ssh csh CCorrectionsR) = return ("Abgaben" , Just $ CourseR tid ssh csh CShowR)
-  breadcrumb (CourseR tid ssh csh CAssignR)   = return ("Zuteilung Korrekturen"  , Just $ CourseR tid ssh csh CCorrectionsR)
-  breadcrumb (CourseR tid ssh csh SheetListR) = return ("Übungen"    , Just $ CourseR tid ssh csh CShowR)
-  breadcrumb (CourseR tid ssh csh SheetNewR ) = return ("Neu",         Just $ CourseR tid ssh csh SheetListR)
-  breadcrumb (CourseR tid ssh csh SheetCurrentR) = return ("Aktuelles Blatt", Just $ CourseR tid ssh csh SheetListR)
-  breadcrumb (CourseR tid ssh csh SheetOldUnassignedR) = return ("Offene Abgaben", Just $ CourseR tid ssh csh SheetListR)
-  breadcrumb (CourseR tid ssh csh CCommR    ) = return ("Kursmitteilung", Just $ CourseR tid ssh csh CShowR)
-  breadcrumb (CourseR tid ssh csh CTutorialListR) = return ("Tutorien", Just $ CourseR tid ssh csh CShowR)
-  breadcrumb (CourseR tid ssh csh CTutorialNewR) = return ("Anlegen", Just $ CourseR tid ssh csh CTutorialListR)
+    User{userDisplayName} <- MaybeT . runDB $ get uid
+    return (userDisplayName, Just $ CourseR tid ssh csh CUsersR)
+  breadcrumb (CourseR tid ssh csh CCorrectionsR) = i18nCrumb MsgMenuSubmissions . Just $ CourseR tid ssh csh CShowR
+  breadcrumb (CourseR tid ssh csh CAssignR)   = i18nCrumb MsgMenuCorrectionsAssign . Just $ CourseR tid ssh csh CCorrectionsR
+  breadcrumb (CourseR tid ssh csh SheetListR) = i18nCrumb MsgMenuSheetList . Just $ CourseR tid ssh csh CShowR
+  breadcrumb (CourseR tid ssh csh SheetNewR ) = i18nCrumb MsgMenuSheetNew . Just $ CourseR tid ssh csh SheetListR
+  breadcrumb (CourseR tid ssh csh SheetCurrentR) = i18nCrumb MsgMenuSheetCurrent . Just $ CourseR tid ssh csh SheetListR
+  breadcrumb (CourseR tid ssh csh SheetOldUnassignedR) = i18nCrumb MsgMenuSheetOldUnassigned . Just $ CourseR tid ssh csh SheetListR
+  breadcrumb (CourseR tid ssh csh CCommR    ) = i18nCrumb MsgMenuCourseCommunication . Just $ CourseR tid ssh csh CShowR
+  breadcrumb (CourseR tid ssh csh CTutorialListR) = i18nCrumb MsgMenuTutorialList . Just $ CourseR tid ssh csh CShowR
+  breadcrumb (CourseR tid ssh csh CTutorialNewR) = i18nCrumb MsgMenuTutorialNew . Just $ CourseR tid ssh csh CTutorialListR
+  breadcrumb (CourseR tid ssh csh CFavouriteR) = i18nCrumb MsgBreadcrumbCourseFavourite . Just $ CourseR tid ssh csh CShowR
+  breadcrumb (CourseR tid ssh csh CRegisterR)  = i18nCrumb MsgBreadcrumbCourseRegister . Just $ CourseR tid ssh csh CShowR
+  breadcrumb (CourseR tid ssh csh CRegisterTemplateR) = i18nCrumb MsgBreadcrumbCourseRegisterTemplate . Just $ CourseR tid ssh csh CShowR
+  breadcrumb (CourseR tid ssh csh CLecInviteR) = i18nCrumb MsgBreadcrumbLecturerInvite . Just $ CourseR tid ssh csh CShowR
+  breadcrumb (CourseR tid ssh csh CDeleteR) = i18nCrumb MsgMenuCourseDelete . Just $ CourseR tid ssh csh CShowR
+  breadcrumb (CourseR tid ssh csh CHiWisR) = i18nCrumb MsgBreadcrumbHiWis . Just $ CourseR tid ssh csh CShowR
+  breadcrumb (CourseR tid ssh csh CNotesR) = i18nCrumb MsgBreadcrumbCourseNotes . Just $ CourseR tid ssh csh CShowR
 
-  breadcrumb (CourseR tid ssh csh CNewsNewR)    = return ("Neue Nachricht", Just $ CourseR tid ssh csh CShowR)
-  breadcrumb (CNewsR tid ssh csh _ CNShowR)     = return ("Kursnachricht" , Just $ CourseR tid ssh csh CShowR)
-  breadcrumb (CNewsR tid ssh csh cID CNEditR)   = return ("Bearbeiten"    , Just $ CNewsR tid ssh csh cID CNShowR)
-  breadcrumb (CNewsR tid ssh csh cID CNDeleteR) = return ("Löschen"       , Just $ CNewsR tid ssh csh cID CNShowR)
+  breadcrumb (CourseR tid ssh csh CNewsNewR)    = i18nCrumb MsgMenuCourseNewsNew . Just $ CourseR tid ssh csh CShowR
+  breadcrumb (CourseR tid ssh csh (CourseNewsR cID sRoute)) = case sRoute of
+    CNShowR   -> i18nCrumb MsgBreadcrumbCourseNews . Just $ CourseR tid ssh csh CShowR
+    CNEditR   -> i18nCrumb MsgMenuCourseNewsEdit . Just $ CNewsR tid ssh csh cID CNShowR
+    CNDeleteR -> i18nCrumb MsgBreadcrumbCourseNewsDelete . Just $ CNewsR tid ssh csh cID CNShowR
+    CNArchiveR -> i18nCrumb MsgBreadcrumbCourseNewsArchive . Just $ CNewsR tid ssh csh cID CNShowR
+    CNFileR _ -> i18nCrumb MsgBreadcrumbCourseNewsFile . Just $ CNewsR tid ssh csh cID CNShowR
+  
+  breadcrumb (CourseR tid ssh csh CEventsNewR)    = i18nCrumb MsgMenuCourseEventNew . Just $ CourseR tid ssh csh CShowR
+  breadcrumb (CourseR tid ssh csh (CourseEventR _cID sRoute)) = case sRoute of
+    CEvEditR   -> i18nCrumb MsgMenuCourseEventEdit . Just $ CourseR tid ssh csh CShowR
+    CEvDeleteR -> i18nCrumb MsgBreadcrumbCourseEventDelete . Just $ CourseR tid ssh csh CShowR
 
-  breadcrumb (CourseR tid ssh csh CExamListR) = return ("Prüfungen", Just $ CourseR tid ssh csh CShowR)
-  breadcrumb (CourseR tid ssh csh CExamNewR) = return ("Anlegen", Just $ CourseR tid ssh csh CExamListR)
+  breadcrumb (CourseR tid ssh csh CExamListR) = i18nCrumb MsgMenuExamList . Just $ CourseR tid ssh csh CShowR
+  breadcrumb (CourseR tid ssh csh CExamNewR) = i18nCrumb MsgMenuExamNew . Just $ CourseR tid ssh csh CExamListR
 
-  breadcrumb (CourseR tid ssh csh CApplicationsR) = return ("Bewerbungen", Just $ CourseR tid ssh csh CShowR)
+  breadcrumb (CourseR tid ssh csh CApplicationsR) = i18nCrumb MsgMenuCourseApplications . Just $ CourseR tid ssh csh CShowR
+  breadcrumb (CourseR tid ssh csh CAppsFilesR) = i18nCrumb MsgBreadcrumbCourseAppsFiles . Just $ CourseR tid ssh csh CApplicationsR
 
-  breadcrumb (CApplicationR tid ssh csh _ CAEditR) = return ("Bewerbung", Just $ CourseR tid ssh csh CApplicationsR)
+  breadcrumb (CourseR tid ssh csh (CourseApplicationR cID sRoute)) = case sRoute of
+    CAEditR -> maybeT (i18nCrumb MsgBreadcrumbApplicant . Just $ CourseR tid ssh csh CApplicationsR) $ do
+      guardM . hasReadAccessTo $ CApplicationR tid ssh csh cID CAEditR
+      appId <- decrypt cID
+      User{..} <- hoist runDB $ MaybeT (get appId) >>= MaybeT . get . courseApplicationUser
+      return (userDisplayName, Just $ CourseR tid ssh csh CApplicationsR)
+    CAFilesR -> i18nCrumb MsgBreadcrumbApplicationFiles . Just $ CApplicationR tid ssh csh cID CAEditR
 
-  breadcrumb (CExamR tid ssh csh examn EShowR) = return (original examn, Just $ CourseR tid ssh csh CExamListR)
-  breadcrumb (CExamR tid ssh csh examn EEditR) = return ("Bearbeiten", Just $ CExamR tid ssh csh examn EShowR)
-  breadcrumb (CExamR tid ssh csh examn EUsersR) = return ("Teilnehmer", Just $ CExamR tid ssh csh examn EShowR)
-  breadcrumb (CExamR tid ssh csh examn EAddUserR) = return ("Prüfungsteilnehmer hinzufügen", Just $ CExamR tid ssh csh examn EUsersR)
-  breadcrumb (CExamR tid ssh csh examn EGradesR) = return ("Prüfungsleistungen", Just $ CExamR tid ssh csh examn EShowR)
+  breadcrumb (CourseR tid ssh csh (ExamR examn sRoute)) = case sRoute of
+    EShowR    -> maybeT (i18nCrumb MsgBreadcrumbExam . Just $ CourseR tid ssh csh CExamListR) $ do
+      guardM . hasReadAccessTo $ CExamR tid ssh csh examn EShowR
+      return (original examn, Just $ CourseR tid ssh csh CExamListR)
+    EEditR    -> i18nCrumb MsgMenuExamEdit . Just $ CExamR tid ssh csh examn EShowR
+    EUsersR   -> i18nCrumb MsgMenuExamUsers . Just $ CExamR tid ssh csh examn EShowR
+    EAddUserR -> i18nCrumb MsgMenuExamAddMembers . Just $ CExamR tid ssh csh examn EUsersR
+    EGradesR  -> i18nCrumb MsgMenuExamGrades . Just $ CExamR tid ssh csh examn EShowR
+    ECInviteR  -> i18nCrumb MsgBreadcrumbExamCorrectorInvite . Just $ CExamR tid ssh csh examn EShowR
+    EInviteR   -> i18nCrumb MsgBreadcrumbExamParticipantInvite . Just $ CExamR tid ssh csh examn EShowR
+    ERegisterR -> i18nCrumb MsgBreadcrumbExamRegister . Just $ CExamR tid ssh csh examn EShowR
 
-  breadcrumb (CTutorialR tid ssh csh tutn TUsersR)   = return (original tutn, Just $ CourseR tid ssh csh CTutorialListR)
-  breadcrumb (CTutorialR tid ssh csh tutn TEditR)    = return ("Bearbeiten", Just $ CTutorialR tid ssh csh tutn TUsersR)
-  breadcrumb (CTutorialR tid ssh csh tutn TDeleteR)  = return ("Löschen", Just $ CTutorialR tid ssh csh tutn TUsersR)
-  breadcrumb (CTutorialR tid ssh csh tutn TCommR)    = return ("Mitteilung", Just $ CTutorialR tid ssh csh tutn TUsersR)
+  breadcrumb (CourseR tid ssh csh (TutorialR tutn sRoute)) = case sRoute of
+    TUsersR  -> maybeT (i18nCrumb MsgBreadcrumbTutorial . Just $ CourseR tid ssh csh CTutorialListR) $ do
+      guardM . hasReadAccessTo $ CTutorialR tid ssh csh tutn TUsersR
+      return (original tutn, Just $ CourseR tid ssh csh CTutorialListR)
+    TEditR   -> i18nCrumb MsgMenuTutorialEdit . Just $ CTutorialR tid ssh csh tutn TUsersR
+    TDeleteR -> i18nCrumb MsgMenuTutorialDelete . Just $ CTutorialR tid ssh csh tutn TUsersR
+    TCommR   -> i18nCrumb MsgMenuTutorialComm . Just $ CTutorialR tid ssh csh tutn TUsersR
+    TRegisterR -> i18nCrumb MsgBreadcrumbTutorialRegister . Just $ CourseR tid ssh csh CShowR
+    TInviteR -> i18nCrumb MsgBreadcrumbTutorInvite . Just $ CTutorialR tid ssh csh tutn TUsersR
 
-  breadcrumb (CSheetR tid ssh csh shn SShowR)   = return (original shn, Just $ CourseR tid ssh csh SheetListR)
-  breadcrumb (CSheetR tid ssh csh shn SEditR)   = return ("Bearbeiten"   , Just $ CSheetR tid ssh csh shn SShowR)
-  breadcrumb (CSheetR tid ssh csh shn SDelR )   = return ("Löschen"      , Just $ CSheetR tid ssh csh shn SShowR)
-  breadcrumb (CSheetR tid ssh csh shn SSubsR)   = return ("Abgaben"      , Just $ CSheetR tid ssh csh shn SShowR)
-  breadcrumb (CSheetR tid ssh csh shn SAssignR) = return ("Zuteilung Korrekturen"     , Just $ CSheetR tid ssh csh shn SSubsR)
-  breadcrumb (CSheetR tid ssh csh shn SubmissionNewR)  = return ("Abgabe", Just $ CSheetR tid ssh csh shn SShowR)
-  breadcrumb (CSheetR tid ssh csh shn SubmissionOwnR)  = return ("Abgabe", Just $ CSheetR tid ssh csh shn SShowR)
-  breadcrumb (CSubmissionR tid ssh csh shn _ SubShowR) = return ("Abgabe", Just $ CSheetR tid ssh csh shn SShowR)
---           (CSubmissionR tid ssh csh shn _ SubArchiveR)  -- just for Download
-  breadcrumb (CSubmissionR tid ssh csh shn cid CorrectionR) = return ("Korrektur", Just $ CSubmissionR tid ssh csh shn cid SubShowR)
---           (CSubmissionR tid ssh csh shn _ SubDownloadR) -- just for Download
-  breadcrumb (CSheetR tid ssh csh shn SCorrR) = return ("Korrektoren", Just $ CSheetR tid ssh csh shn SShowR)
-  --         (CSheetR tid ssh csh shn SFileR) -- just for Downloads
+  breadcrumb (CourseR tid ssh csh (SheetR shn sRoute)) = case sRoute of
+    SShowR -> maybeT (i18nCrumb MsgBreadcrumbSheet . Just $ CourseR tid ssh csh SheetListR) $ do
+      guardM . hasReadAccessTo $ CSheetR tid ssh csh shn SShowR
+      return (original shn, Just $ CourseR tid ssh csh SheetListR)
+    SEditR -> i18nCrumb MsgMenuSheetEdit . Just $ CSheetR tid ssh csh shn SShowR
+    SDelR  -> i18nCrumb MsgMenuSheetDelete . Just $ CSheetR tid ssh csh shn SShowR
+    SSubsR -> i18nCrumb MsgMenuSubmissions . Just $ CSheetR tid ssh csh shn SShowR
+    SAssignR -> i18nCrumb MsgMenuCorrectionsAssign . Just $ CSheetR tid ssh csh shn SSubsR
+    SubmissionNewR -> i18nCrumb MsgMenuSubmissionNew . Just $ CSheetR tid ssh csh shn SShowR
+    SubmissionOwnR -> i18nCrumb MsgMenuSubmissionOwn . Just $ CSheetR tid ssh csh shn SShowR
+    SubmissionR cid sRoute' -> case sRoute' of
+      SubShowR -> do
+        mayList <- hasReadAccessTo $ CSheetR tid ssh csh shn SSubsR
+        if
+          | mayList
+            -> i18nCrumb MsgBreadcrumbSubmission . Just $ CSheetR tid ssh csh shn SSubsR
+          | otherwise
+            -> i18nCrumb MsgBreadcrumbSubmission . Just $ CSheetR tid ssh csh shn SShowR
+      CorrectionR -> i18nCrumb MsgMenuCorrection . Just $ CSubmissionR tid ssh csh shn cid SubShowR
+      SubDelR -> i18nCrumb MsgMenuSubmissionDelete . Just $ CSubmissionR tid ssh csh shn cid SubShowR
+      SubAssignR -> i18nCrumb MsgCorrectorAssignTitle . Just $ CSubmissionR tid ssh csh shn cid SubShowR
+      SInviteR -> i18nCrumb MsgBreadcrumbSubmissionUserInvite . Just $ CSubmissionR tid ssh csh shn cid SubShowR
+      SubArchiveR sft -> i18nCrumb sft . Just $ CSubmissionR tid ssh csh shn cid SubShowR
+      SubDownloadR _ _ -> i18nCrumb MsgBreadcrumbSubmissionFile . Just $ CSubmissionR tid ssh csh shn cid SubShowR
+    SCorrR -> i18nCrumb MsgMenuCorrectors . Just $ CSheetR tid ssh csh shn SShowR
+    SArchiveR -> i18nCrumb MsgBreadcrumbSheetArchive . Just $ CSheetR tid ssh csh shn SShowR
+    SIsCorrR -> i18nCrumb MsgBreadcrumbSheetIsCorrector . Just $ CSheetR tid ssh csh shn SShowR
+    SPseudonymR -> i18nCrumb MsgBreadcrumbSheetPseudonym . Just $ CSheetR tid ssh csh shn SShowR
+    SCorrInviteR -> i18nCrumb MsgBreadcrumbSheetCorrectorInvite . Just $ CSheetR tid ssh csh shn SShowR
+    SZipR sft -> i18nCrumb sft . Just $ CSheetR tid ssh csh shn SShowR
+    SFileR _ _ -> i18nCrumb MsgBreadcrumbSheetFile . Just $ CSheetR tid ssh csh shn SShowR
 
-  breadcrumb (CourseR tid ssh csh MaterialListR) = return ("Material"     , Just $ CourseR tid ssh csh CShowR)
-  breadcrumb (CourseR tid ssh csh MaterialNewR ) = return ("Neu"          , Just $ CourseR tid ssh csh MaterialListR)
-  breadcrumb (CMaterialR tid ssh csh mnm MShowR) = return (original mnm, Just $ CourseR tid ssh csh MaterialListR)
-  breadcrumb (CMaterialR tid ssh csh mnm MEditR) = return ("Bearbeiten"   , Just $ CMaterialR tid ssh csh mnm MShowR)
-  breadcrumb (CMaterialR tid ssh csh mnm MDelR)  = return ("Löschen"      , Just $ CMaterialR tid ssh csh mnm MShowR)
-  --         (CMaterialR tid ssh csh mnm MFileR) -- just for Downloads
+  breadcrumb (CourseR tid ssh csh MaterialListR) = i18nCrumb MsgMenuMaterialList . Just $ CourseR tid ssh csh CShowR
+  breadcrumb (CourseR tid ssh csh MaterialNewR ) = i18nCrumb MsgMenuMaterialNew . Just $ CourseR tid ssh csh MaterialListR
+  breadcrumb (CourseR tid ssh csh (MaterialR mnm sRoute)) = case sRoute of
+    MShowR -> maybeT (i18nCrumb MsgBreadcrumbMaterial . Just $ CourseR tid ssh csh MaterialListR) $ do
+      guardM . hasReadAccessTo $ CMaterialR tid ssh csh mnm MShowR
+      return (original mnm, Just $ CourseR tid ssh csh MaterialListR)
+    MEditR -> i18nCrumb MsgMenuMaterialEdit . Just $ CMaterialR tid ssh csh mnm MShowR
+    MDelR  -> i18nCrumb MsgMenuMaterialDelete . Just $ CMaterialR tid ssh csh mnm MShowR
+    MArchiveR -> i18nCrumb MsgBreadcrumbMaterialArchive . Just $ CMaterialR tid ssh csh mnm MShowR
+    MFileR _ -> i18nCrumb MsgBreadcrumbMaterialFile . Just $ CMaterialR tid ssh csh mnm MShowR
 
-  -- Others
-  breadcrumb (CorrectionsR)       = return ("Korrekturen", Just HomeR)
-  breadcrumb (CorrectionsUploadR) = return ("Hochladen", Just CorrectionsR)
+  breadcrumb CorrectionsR         = i18nCrumb MsgMenuCorrections Nothing
+  breadcrumb CorrectionsUploadR   = i18nCrumb MsgMenuCorrectionsUpload $ Just CorrectionsR
+  breadcrumb CorrectionsCreateR   = i18nCrumb MsgMenuCorrectionsCreate $ Just CorrectionsR
+  breadcrumb CorrectionsGradeR    = i18nCrumb MsgMenuCorrectionsGrade $ Just CorrectionsR
+  breadcrumb CorrectionsDownloadR = i18nCrumb MsgMenuCorrectionsDownload $ Just CorrectionsR
+
+  breadcrumb (CryptoUUIDDispatchR _) = i18nCrumb MsgBreadcrumbCryptoIDDispatch Nothing
+  
   breadcrumb (MessageR _) = do
     mayList <- (== Authorized) <$> evalAccess MessageListR False
-    return $ if
-      | mayList   -> ("Statusmeldung", Just MessageListR)
-      | otherwise -> ("Statusmeldung", Just HomeR)
-  breadcrumb (MessageListR) = return ("Statusmeldungen", Just AdminR)
-  breadcrumb  _ = return ("Uni2work", Nothing) -- Default is no breadcrumb at all
+    if
+      | mayList   -> i18nCrumb MsgBreadcrumbSystemMessage $ Just MessageListR
+      | otherwise -> i18nCrumb MsgBreadcrumbSystemMessage $ Just HomeR
+  breadcrumb (MessageListR) = i18nCrumb MsgMenuMessageList $ Just AdminR
+  -- breadcrumb  _ = return ("Uni2work", Nothing) -- Default is no breadcrumb at all
 
 submissionList :: TermId -> CourseShorthand -> SheetName -> UserId -> DB [E.Value SubmissionId]
 submissionList tid csh shn uid = E.select . E.from $ \(course `E.InnerJoin` sheet `E.InnerJoin` submission `E.InnerJoin` submissionUser) -> do
diff --git a/src/Handler/CryptoIDDispatch.hs b/src/Handler/CryptoIDDispatch.hs
index 8a34cde8d..9270fffe2 100644
--- a/src/Handler/CryptoIDDispatch.hs
+++ b/src/Handler/CryptoIDDispatch.hs
@@ -66,7 +66,7 @@ instance (CryptoRoute ciphertext plaintext, Dispatch ciphertext ps) => Dispatch
   
 
 getCryptoUUIDDispatchR :: UUID -> Handler ()
-getCryptoUUIDDispatchR uuid = dispatchID p uuid >>= maybe notFound (redirectWith found302)
+getCryptoUUIDDispatchR uuid = dispatchID p uuid >>= maybe notFound (redirectAccessWith movedPermanently301)
   where
     p :: Proxy '[ SubmissionId
                 , UserId
@@ -74,7 +74,7 @@ getCryptoUUIDDispatchR uuid = dispatchID p uuid >>= maybe notFound (redirectWith
     p = Proxy
 
 getCryptoFileNameDispatchR :: CI FilePath -> Handler ()
-getCryptoFileNameDispatchR path = dispatchID p path >>= maybe notFound (redirectWith found302)
+getCryptoFileNameDispatchR path = dispatchID p path >>= maybe notFound (redirectAccessWith movedPermanently301)
   where
     p :: Proxy '[ SubmissionId ] 
     p = Proxy
diff --git a/src/Utils/Lang.hs b/src/Utils/Lang.hs
index 82103b848..fe41e110f 100644
--- a/src/Utils/Lang.hs
+++ b/src/Utils/Lang.hs
@@ -61,7 +61,7 @@ highPrioRequestedLangs = fmap (concatMap $ fromMaybe []) . mapM runMaybeT $
   , lookupCookies "_LANG"
   , fmap pure . MaybeT $ lookupSession "_LANG"
   ]
-lowPrioRequestedLangs = fromMaybe [] . fmap (mapMaybe (either (const Nothing) Just . Text.decodeUtf8') . NWP.parseHttpAccept) <$> lookupHeader "Accept-Language"
+lowPrioRequestedLangs = maybe [] (mapMaybe (either (const Nothing) Just . Text.decodeUtf8') . NWP.parseHttpAccept) <$> lookupHeader "Accept-Language"
 
 languagesMiddleware :: forall site a. NonEmpty Lang -> HandlerFor site a -> HandlerFor site a
 languagesMiddleware avL act = do
diff --git a/test/MailSpec.hs b/test/MailSpec.hs
index ad54385c6..b386d3972 100644
--- a/test/MailSpec.hs
+++ b/test/MailSpec.hs
@@ -2,6 +2,7 @@ module MailSpec where
 
 import TestImport
 import Utils.DateTimeSpec ()
+import Model.Types.LanguagesSpec ()
 
 import Mail
 
@@ -9,10 +10,6 @@ instance Arbitrary MailSmtpData where
   arbitrary = genericArbitrary
   shrink = genericShrink
 
-instance Arbitrary MailLanguages where
-  arbitrary = fmap MailLanguages $ shuffle =<< sublistOf (toList appLanguages)
-  shrink = genericShrink
-
 instance Arbitrary MailContext where
   arbitrary = genericArbitrary
   shrink = genericShrink
@@ -26,8 +23,6 @@ spec = do
   parallel $ do
     lawsCheckHspec (Proxy @MailSmtpData)
       [ eqLaws, ordLaws, showReadLaws, monoidLaws ]
-    lawsCheckHspec (Proxy @MailLanguages)
-      [ eqLaws, ordLaws, showReadLaws, isListLaws, jsonLaws, hashableLaws, persistFieldLaws ]
     lawsCheckHspec (Proxy @MailContext)
       [ eqLaws, ordLaws, showReadLaws, jsonLaws, hashableLaws ]
     lawsCheckHspec (Proxy @VerpMode)
diff --git a/test/Model/Types/LanguagesSpec.hs b/test/Model/Types/LanguagesSpec.hs
new file mode 100644
index 000000000..7b2ed56dc
--- /dev/null
+++ b/test/Model/Types/LanguagesSpec.hs
@@ -0,0 +1,14 @@
+module Model.Types.LanguagesSpec where
+
+import TestImport
+
+
+instance Arbitrary Languages where
+  arbitrary = fmap Languages $ shuffle =<< sublistOf (toList appLanguages)
+  shrink = genericShrink
+
+
+spec :: Spec
+spec = do
+  lawsCheckHspec (Proxy @Languages)
+    [ eqLaws, ordLaws, showReadLaws, isListLaws, jsonLaws, hashableLaws, persistFieldLaws ]
diff --git a/test/Model/TypesSpec.hs b/test/Model/TypesSpec.hs
index f5f7d2efd..321d4c2e6 100644
--- a/test/Model/TypesSpec.hs
+++ b/test/Model/TypesSpec.hs
@@ -11,6 +11,7 @@ import qualified Data.Aeson as Aeson
 import qualified Data.Aeson.Types as Aeson
 
 import MailSpec ()
+import Model.Types.LanguagesSpec ()
 
 import System.IO.Unsafe
 import Yesod.Auth.Util.PasswordStore
@@ -279,6 +280,7 @@ instance Arbitrary Sex where
   arbitrary = genericArbitrary
 
 
+
 spec :: Spec
 spec = do
   parallel $ do
diff --git a/test/ModelSpec.hs b/test/ModelSpec.hs
index 936eccbbd..9c616915f 100644
--- a/test/ModelSpec.hs
+++ b/test/ModelSpec.hs
@@ -22,8 +22,6 @@ import Utils
 import System.FilePath
 import Data.Time
 
-import Mail (MailLanguages(..))
-
 
 instance Arbitrary EmailAddress where
     arbitrary = do
@@ -106,10 +104,7 @@ instance Arbitrary User where
 
     userDownloadFiles <- arbitrary
     userWarningDays <- arbitrary
-    userLanguages <- choose
-      [ pure Nothing
-      , fmap (Just . Languages) $ sublistOf =<< shuffle (toList appLanguages)
-      ]
+    userLanguages <- arbitrary
     userNotificationSettings <- arbitrary
     userCsvOptions <- arbitrary
     userShowSex <- arbitrary
diff --git a/test/TestImport.hs b/test/TestImport.hs
index 1b2704d88..46abcbe9a 100644
--- a/test/TestImport.hs
+++ b/test/TestImport.hs
@@ -138,7 +138,7 @@ createUser adjUser = do
     userDownloadFiles = userDefaultDownloadFiles
     userWarningDays = userDefaultWarningDays
     userShowSex = userDefaultShowSex
-    userMailLanguages = def
+    userLanguages = Nothing
     userNotificationSettings = def
     userCreated = now
     userLastLdapSynchronisation = Nothing

From 3fe278ec3087b7cb219a94c3b9fe28c0f3e204fa Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 22 Oct 2019 11:04:34 +0200
Subject: [PATCH 012/126] fix(i18n): i18n for all widgets

---
 messages/uniworx/de-de-formal.msg             | 25 +++++++-
 src/Handler/Admin.hs                          |  2 +-
 src/Handler/Corrections.hs                    | 10 ++--
 src/Handler/Course/List.hs                    |  2 +-
 src/Handler/ExamOffice/Exam.hs                |  2 +-
 src/Handler/Profile.hs                        |  1 +
 src/Handler/Users.hs                          |  2 +-
 src/Handler/Utils/Form.hs                     |  4 +-
 src/Handler/Utils/Table/Columns.hs            |  6 +-
 templates/adminFeatures.hamlet                | 23 ++++----
 templates/adminUser.hamlet                    |  6 +-
 templates/deletedUser.hamlet                  | 10 ++--
 .../admin-test/de-de-formal.hamlet}           |  0
 .../data-delete/de-de-formal.hamlet}          |  0
 .../i18n/profile-remarks/de-de-formal.hamlet  | 25 ++++++++
 .../messages/submissionFilesIgnored.hamlet    |  2 +-
 templates/profileData.hamlet                  | 59 +++++--------------
 templates/submission.hamlet                   |  9 ++-
 templates/widgets/asidenav/asidenav.hamlet    |  3 +-
 templates/widgets/fields/bool.hamlet          |  7 ++-
 templates/widgets/lipsum/lipsum.hamlet        | 10 ----
 21 files changed, 112 insertions(+), 96 deletions(-)
 rename templates/{adminTest.hamlet => i18n/admin-test/de-de-formal.hamlet} (100%)
 rename templates/{widgets/data-delete/data-delete.hamlet => i18n/data-delete/de-de-formal.hamlet} (100%)
 create mode 100644 templates/i18n/profile-remarks/de-de-formal.hamlet
 delete mode 100644 templates/widgets/lipsum/lipsum.hamlet

diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index 45a6a6e53..1ca265cc8 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -1,5 +1,7 @@
 PrintDebugForStupid name@Text: Debug message "#{name}"
 
+Logo: Uni2work
+
 BtnSubmit: Senden
 BtnAbort: Abbrechen
 BtnDelete: Löschen
@@ -143,6 +145,7 @@ CourseDeregisterUntilTip: Abmeldung ist ab "Anmeldungen von" bis zu diesem Zeitp
 CourseFilterSearch: Volltext-Suche
 CourseFilterRegistered: Registriert
 CourseFilterNone: Egal
+BoolIrrelevant: Egal
 CourseDeleteQuestion: Wollen Sie den unten aufgeführten Kurs wirklich löschen?
 CourseDeleted: Kurs gelöscht
 CourseUserTutorials: Angemeldete Tutorien
@@ -610,6 +613,7 @@ RatingExceedsMax: Bewertung übersteigt die erlaubte Maximalpunktzahl
 RatingNotExpected: Keine Bewertungen erlaubt
 RatingBinaryExpected: Bewertung muss 0 (=durchgefallen) oder 1 (=bestanden) sein
 RatingPointsRequired: Bewertung erfordert für dieses Blatt eine Punktzahl
+RatingFile: Bewertungsdatei
 
 SubmissionSinkExceptionDuplicateFileTitle file@FilePath: Dateiname #{show file} kommt mehrfach im Zip-Archiv vor
 SubmissionSinkExceptionDuplicateRating: Mehr als eine Bewertung gefunden.
@@ -740,6 +744,8 @@ StudyTerms: Studiengänge
 StudyTerm: Studiengang
 NoStudyTermsKnown: Nicht eingeschrieben
 StudyFeatureInference: Studiengangschlüssel-Inferenz
+StudyFeatureInferenceNoConflicts: Keine Konflikte beobachtet
+StudyFeatureInferenceConflictsHeading: Studiengangseinträge mit beobachteten Konflikten
 StudyFeatureAge: Fachsemester
 StudyFeatureDegree: Abschluss
 FieldPrimary: Hauptfach
@@ -958,6 +964,10 @@ SheetCreateExisting: Folgende Pseudonyme haben bereits abgegeben:
 CorrGrade: Korrekturen eintragen
 
 UserAccountDeleted name@Text: Konto für #{name} wurde gelöscht!
+UserSubmissionsDeleted n@Int: #{tshow n} Abgaben wurden unwiderruflich gelöscht.
+UserGroupSubmissionsKept n@Int: #{tshow n} Gruppenabgaben verbleiben in der Datenbank, aber die Zuordnung zum Benutzer wurde gelöscht. Gruppenabgaben können dadurch zu Einzelabgaben werden, die dann mit dem letzten Benutzer gelöscht werden.
+UserSubmissionGroupsDeleted count@Int64: #{tshow count} benannte Abgabengruppen wurden gelöscht, da sie ohne den Nutzer leer wären.
+UserAccountDeleteWarning: Achtung, dies löscht den kompletten Benutzer unwiderruflich und mit allen assoziierten Daten aus der Datenbank. Prüfungsdaten müssen jedoch langfristig gespeichert bleiben!
 
 HelpTitle : Hilfe
 HelpAnswer: Antworten an
@@ -2037,4 +2047,17 @@ ShowSex: Geschlechter anderer Nutzer anzeigen
 ShowSexTip: Sollen in Kursteilnehmer-Tabellen u.Ä. die Geschlechter der Nutzer angezeigt werden?
 
 MenuLanguage: Sprache
-LanguageChanged: Sprache erfolgreich geändert
\ No newline at end of file
+LanguageChanged: Sprache erfolgreich geändert
+
+ProfileCorrector: Korrektor
+ProfileCourses: Eigene Kurse
+ProfileCourseParticipations: Kursanmeldungen
+ProfileCourseExamResults: Prüfungsleistungen
+ProfileTutorials: Eigene Tutorien
+ProfileTutorialParticipations: Tutorien
+ProfileSubmissionGroups: Abgabegruppen
+ProfileSubmissions: Abgaben
+ProfileRemark: Hinweis
+ProfileGroupSubmissionDates: Bei Gruppenabgaben wird kein Datum angezeigt, wenn Sie die Gruppenabgabe nie selbst hochgeladen haben.
+ProfileCorrectorRemark: Die oberhalb angezeigte Tabelle zeigt nur prinzipielle Einteilungen als Korrektor zu einem Übungsblatt. Auch ohne Einteilung können Korrekturen einzeln zugewiesen werden, welche hier dann nicht aufgeführt werden.
+ProfileCorrections: Auflistung aller zugewiesenen Korrekturen
\ No newline at end of file
diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs
index 307c7acf9..5bcf4359a 100644
--- a/src/Handler/Admin.hs
+++ b/src/Handler/Admin.hs
@@ -214,7 +214,7 @@ postAdminTestR = do
   siteLayout locallyDefinedPageHeading $ do
   -- defaultLayout $ do
     setTitle "Uni2work Admin Testpage"
-    $(widgetFile "adminTest")
+    $(i18nWidgetFile "admin-test")
 
     [whamlet|<h2>Formular Demonstration|]
     wrapForm formWidget FormSettings
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 4d2c37aba..9b3937a5d 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -605,7 +605,7 @@ postCorrectionsR = do
         , prismAForm (singletonFilter "term"   ) mPrev $ aopt (lift `hoistField` selectField termOptions)   (fslI MsgTerm)
         , prismAForm (singletonFilter "school" ) mPrev $ aopt (lift `hoistField` selectField schoolOptions) (fslI MsgCourseSchool)
         , Map.singleton "sheet-search" . maybeToList <$> aopt (lift `hoistField` textField)                 (fslI MsgSheet)        (Just <$> listToMaybe =<< ((Map.lookup "sheet-search" =<< mPrev) <|> (Map.lookup "sheet" =<< mPrev)))
-        , prismAForm (singletonFilter "israted" . maybePrism _PathPiece) mPrev $ aopt boolField             (fslI MsgRatingTime)
+        , prismAForm (singletonFilter "israted" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant)             (fslI MsgRatingTime)
         ]
       courseOptions = runDB $ do
         courses <- selectList [] [Asc CourseShorthand] >>= filterM (\(Entity _ Course{..}) -> (== Authorized) <$> evalAccessCorrector courseTerm courseSchool courseShorthand)
@@ -650,8 +650,8 @@ postCCorrectionsR tid ssh csh = do
         -- "pseudonym" TODO DB only stores Word24
         , Map.singleton "sheet-search" . maybeToList <$> aopt textField (fslI MsgSheet)        (Just <$> listToMaybe =<< ((Map.lookup "sheet-search" =<< mPrev) <|> (Map.lookup "sheet" =<< mPrev)))
         , prismAForm (singletonFilter "corrector-name-email") mPrev $ aopt textField (fslI MsgCorrector)
-        , prismAForm (singletonFilter "isassigned" . maybePrism _PathPiece) mPrev $ aopt boolField (fslI MsgHasCorrector)
-        , prismAForm (singletonFilter "israted"    . maybePrism _PathPiece) mPrev $ aopt boolField (fslI MsgRatingTime)
+        , prismAForm (singletonFilter "isassigned" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgHasCorrector)
+        , prismAForm (singletonFilter "israted"    . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgRatingTime)
         ]
       psValidator = def & defaultPagesize PagesizeAll -- Assisstant always want to see them all at once anyway
   correctionsR whereClause colonnade filterUI psValidator $ Map.fromList
@@ -681,8 +681,8 @@ postSSubsR tid ssh csh shn = do
         [ prismAForm (singletonFilter "user-name-email")      mPrev $ aopt textField (fslI MsgCourseMembers)
         , prismAForm (singletonFilter "user-matriclenumber")  mPrev $ aopt textField (fslI MsgMatrikelNr)
         , prismAForm (singletonFilter "corrector-name-email") mPrev $ aopt textField (fslI MsgCorrector)
-        , prismAForm (singletonFilter "isassigned" . maybePrism _PathPiece) mPrev $ aopt boolField (fslI MsgHasCorrector)
-        , prismAForm (singletonFilter "israted"    . maybePrism _PathPiece) mPrev $ aopt boolField (fslI MsgRatingTime)
+        , prismAForm (singletonFilter "isassigned" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgHasCorrector)
+        , prismAForm (singletonFilter "israted"    . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgRatingTime)
         -- "pseudonym" TODO DB only stores Word24
         ]
       psValidator = def & defaultPagesize PagesizeAll -- Assisstant always want to see them all at once anyway
diff --git a/src/Handler/Course/List.hs b/src/Handler/Course/List.hs
index 7e815fba2..a9075cee3 100644
--- a/src/Handler/Course/List.hs
+++ b/src/Handler/Course/List.hs
@@ -176,7 +176,7 @@ makeCourseTable whereClause colChoices psValidator = do
       , Just  $ prismAForm (singletonFilter "lecturer") mPrev $ aopt textField (fslI MsgCourseLecturer)
       , Just  $ prismAForm (singletonFilter "search") mPrev $ aopt textField (fslI MsgCourseFilterSearch)
       , Just  $ prismAForm (singletonFilter "openregistration" . maybePrism _PathPiece) mPrev $ fmap (\x -> if isJust x && not (fromJust x) then Nothing else x) . aopt checkBoxField (fslI MsgCourseRegisterOpen)
-      , muid $> prismAForm (singletonFilter "registered" . maybePrism _PathPiece) mPrev (aopt boolField (fslI MsgCourseFilterRegistered))
+      , muid $> prismAForm (singletonFilter "registered" . maybePrism _PathPiece) mPrev (aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgCourseFilterRegistered))
       ]
     , dbtStyle = def
       { dbsFilterLayout = defaultDBSFilterLayout
diff --git a/src/Handler/ExamOffice/Exam.hs b/src/Handler/ExamOffice/Exam.hs
index 87f5bbf10..320822663 100644
--- a/src/Handler/ExamOffice/Exam.hs
+++ b/src/Handler/ExamOffice/Exam.hs
@@ -369,7 +369,7 @@ postEGradesR tid ssh csh examn = do
             , fltrStudyDegreeUI
             , fltrStudyFeaturesSemesterUI
             , fltrExamResultPointsUI examShowGrades
-            , \mPrev -> prismAForm (singletonFilter "is-synced" . maybePrism _PathPiece) mPrev $ aopt boolField (fslI MsgExamUserSynchronised)
+            , \mPrev -> prismAForm (singletonFilter "is-synced" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgExamUserSynchronised)
             ]
           dbtStyle = def { dbsFilterLayout = defaultDBSFilterLayout }
           dbtParams = DBParamsForm
diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index 7e133098e..170ce5dc4 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -373,6 +373,7 @@ makeProfileData (Entity uid User{..}) = do
   let ownTutorialTable = [whamlet|Übungsgruppen werden momentan leider noch nicht unterstützt.|]
   let tutorialTable    = [whamlet|Übungsgruppen werden momentan leider noch nicht unterstützt.|]
   lastLogin <- traverse (formatTime SelFormatDateTime) userLastAuthentication
+  let profileRemarks = $(i18nWidgetFile "profile-remarks")
   return $(widgetFile "profileData")
 
 
diff --git a/src/Handler/Users.hs b/src/Handler/Users.hs
index 2d405561e..e11f6a557 100644
--- a/src/Handler/Users.hs
+++ b/src/Handler/Users.hs
@@ -390,7 +390,7 @@ postAdminUserR uuid = do
           }
     userDataWidget <- runDB $ makeProfileData $ Entity uid user
     siteLayout heading $ do
-      let deleteWidget   = $(widgetFile "widgets/data-delete/data-delete")
+      let deleteWidget   = $(i18nWidgetFile "data-delete")
       $(widgetFile "adminUser")
 
 
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index 937d3eec3..73bcdb18e 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -925,8 +925,8 @@ jsonField hide = Field{..}
 boolField :: ( MonadHandler m
              , HandlerSite m ~ UniWorX
              )
-          => Field m Bool
-boolField = Field
+          => Maybe (SomeMessage UniWorX) -> Field m Bool
+boolField mkNone = Field
   { fieldParse = \e _ -> return $ boolParser e
   , fieldView = \theId name attrs val isReq -> $(widgetFile "widgets/fields/bool")
   , fieldEnctype = UrlEncoded
diff --git a/src/Handler/Utils/Table/Columns.hs b/src/Handler/Utils/Table/Columns.hs
index a5a0f72e2..150b3ffcd 100644
--- a/src/Handler/Utils/Table/Columns.hs
+++ b/src/Handler/Utils/Table/Columns.hs
@@ -203,7 +203,7 @@ fltrAllocationActive cTime queryAllocation = singletonMap "active" . FilterColum
         E.&&. E.maybe E.true  (\t -> E.val cTime E.<=. t) (allocation E.^. AllocationRegisterTo)
 
 fltrAllocationActiveUI :: DBFilterUI
-fltrAllocationActiveUI mPrev = prismAForm (singletonFilter "active" . maybePrism _PathPiece) mPrev $ aopt boolField (fslI MsgAllocationActive)
+fltrAllocationActiveUI mPrev = prismAForm (singletonFilter "active" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgAllocationActive)
 
 
 -----------
@@ -355,7 +355,7 @@ fltrApplicationVeto :: OpticFilterColumn t Bool
 fltrApplicationVeto queryVeto = singletonMap "veto" . FilterColumn . mkExactFilter $ view queryVeto
 
 fltrApplicationVetoUI :: DBFilterUI
-fltrApplicationVetoUI mPrev = prismAForm (singletonFilter "veto" . maybePrism _PathPiece) mPrev $ aopt boolField (fslI MsgCourseApplicationVeto)
+fltrApplicationVetoUI mPrev = prismAForm (singletonFilter "veto" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgCourseApplicationVeto)
 
 colApplicationRatingComment :: OpticColonnade (Maybe Text)
 colApplicationRatingComment resultComment = Colonnade.singleton (fromSortable header) body
@@ -407,7 +407,7 @@ fltrApplicationFiles :: OpticFilterColumn t Bool
 fltrApplicationFiles queryFiles = singletonMap "has-files" . FilterColumn . mkExactFilter $ view queryFiles
 
 fltrApplicationFilesUI :: DBFilterUI
-fltrApplicationFilesUI mPrev = prismAForm (singletonFilter "has-files" . maybePrism _PathPiece) mPrev $ aopt boolField (fslI MsgCourseApplicationFiles)
+fltrApplicationFilesUI mPrev = prismAForm (singletonFilter "has-files" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgCourseApplicationFiles)
 
 ---------------
 -- Files
diff --git a/templates/adminFeatures.hamlet b/templates/adminFeatures.hamlet
index ea5e214b6..db3db4626 100644
--- a/templates/adminFeatures.hamlet
+++ b/templates/adminFeatures.hamlet
@@ -1,18 +1,19 @@
+$newline never
 <section>
   ^{degreeTable}
 <section>
   ^{studytermsTable}
 <section>
-    <h2>_{MsgStudyFeatureInference}
+  <h2>_{MsgStudyFeatureInference}
+  $if null infConflicts
     <p>
-      $if null infConflicts
-        Kein Konflikte beobachtet.
-      $else
-        <h3>Studiengangseingträge mit beobachteten Konflikten:
-        <ul>
-          $forall (Entity _ (StudyTerms ky _ nm)) <- infConflicts
-            <li> #{show ky} - #{foldMap id nm}
-    ^{btnForm}
+      _{MsgStudyFeatureInferenceNoConflicts}
+  $else
+    <h3>_{MsgStudyFeatureInferenceConflictsHeading}
+    <ul>
+      $forall (Entity _ (StudyTerms ky _ nm)) <- infConflicts
+        <li> #{show ky} - #{foldMap id nm}
+  ^{btnForm}
 
-    <div .container>
-      ^{candidateTable}
+  <div .container>
+    ^{candidateTable}
diff --git a/templates/adminUser.hamlet b/templates/adminUser.hamlet
index bc91b4de5..af9c9f5c2 100644
--- a/templates/adminUser.hamlet
+++ b/templates/adminUser.hamlet
@@ -1,3 +1,4 @@
+$newline never
 <section>
   ^{userDataWidget}
 <section>
@@ -10,9 +11,6 @@
   ^{authForm}
 <section>
   <p>
-    Achtung, dieser Link löscht momentan noch den kompletten Benutzer
-    unwiderruflich aus der Live-Datenbank mit
-    <code>DELETE CASCADE uid
-    \ Prüfungs- und Klausurdaten müssen jedoch langfristig gespeichert werden!
+    _{MsgUserAccountDeleteWarning}
   <p>
     ^{modal "Benutzer löschen" (Right deleteWidget)}
diff --git a/templates/deletedUser.hamlet b/templates/deletedUser.hamlet
index 19ec61702..4b0bde4c8 100644
--- a/templates/deletedUser.hamlet
+++ b/templates/deletedUser.hamlet
@@ -1,3 +1,4 @@
+$newline never
 <div .container>
   <h1>
     _{MsgUserAccountDeleted userDisplayName}
@@ -6,13 +7,10 @@
   <div .container>
     #{mailtoHtml userEmail}
   <div .container>
-    #{deletedSubmissions} Abgaben wurden unwiederruflich gelöscht.
+    _{MsgUserSubmissionsDeleted deletedSubmissions}
   $if groupSubmissions > 0
     <div .container>
-      #{groupSubmissions} Gruppenabgaben verbleiben in der Datenbank,
-      aber die Zuordnung zum Benutzer wurden gelöscht.
-      Gruppenabgaben können dadurch zu Einzelabgaben werden,
-      welche dann vom letzten Benutzer gelöscht werden können.
+      _{MsgUserGroupSubmissionsKept groupSubmissions}
   $if deletedSubmissionGroups > 0
     <div .container>
-      #{deletedSubmissionGroups} benannte Abgabengruppen wurden gelöscht, da diese dadurch leer wurden.
+      _{MsgUserSubmissionGroupsDeleted deletedSubmissionGroups}
diff --git a/templates/adminTest.hamlet b/templates/i18n/admin-test/de-de-formal.hamlet
similarity index 100%
rename from templates/adminTest.hamlet
rename to templates/i18n/admin-test/de-de-formal.hamlet
diff --git a/templates/widgets/data-delete/data-delete.hamlet b/templates/i18n/data-delete/de-de-formal.hamlet
similarity index 100%
rename from templates/widgets/data-delete/data-delete.hamlet
rename to templates/i18n/data-delete/de-de-formal.hamlet
diff --git a/templates/i18n/profile-remarks/de-de-formal.hamlet b/templates/i18n/profile-remarks/de-de-formal.hamlet
new file mode 100644
index 000000000..ef726e64c
--- /dev/null
+++ b/templates/i18n/profile-remarks/de-de-formal.hamlet
@@ -0,0 +1,25 @@
+$newline text
+<section>
+  <h2>Hinweise
+  <ul>
+    <li>
+      Sichern Sie bitte Ihre Daten! Die Uni2work Datenbank wird täglich gesichert;
+      dennoch können wir Probleme noch nicht gänzlich ausschließen.
+    <li>
+      Nicht aufgeführt sind Zeitstempel mit Benutzerinformationen, z.B. bei der Editierung und Korrektur von Übungen, Übungsgruppenleiterschaft, Raumbuchungen, etc.
+    <li>
+      Sie können die
+      <a href=@{HelpR}>
+        Löschung Ihre Daten über eine Supportanfrage beantragen
+      . Ihre Daten werden dann nach Ablauf einer Frist gelöscht.
+      Daten, welche keiner gesetzlichen Aufbewahrungsfrist unterliegen
+      (z.B. Klausurnoten) verbleiben im System bis zur Ablauf der Aufbewahrungsfrist.
+      <p>
+      Benutzerdaten bleiben prinzipiell so lange gespeichert,
+      bis ein Institutsadministrator über die Exmatrikulation informiert wurde.
+      Dann wird der Account mit einer angemessenen zeitverzögerung gelöscht.
+      Anonymisierte Prüfungsnoten verbleiben aus statistischen Gründen dauerhaft im System.
+
+    <li>
+      Bei gemeinsamen Gruppenabgaben wird nur die Zuordnung zu diesem Benutzer gelöscht.
+      Die Abgabe selbst wird erst gelöscht, wenn alle Benutzer einer Abgabe deren Löschung veranlasst haben.
diff --git a/templates/messages/submissionFilesIgnored.hamlet b/templates/messages/submissionFilesIgnored.hamlet
index 628125d9f..82149984c 100644
--- a/templates/messages/submissionFilesIgnored.hamlet
+++ b/templates/messages/submissionFilesIgnored.hamlet
@@ -5,5 +5,5 @@
       $of Right fileTitle
         <li style="font-family: monospace">#{fileTitle}
       $of Left cID
-        <li>Bewertungsdatei für <span style="font-family: monospace">#{toPathPiece cID}</span>
+        <li>_{MsgRatingFile} (<span style="font-family: monospace">#{toPathPiece cID}</span>)
     
diff --git a/templates/profileData.hamlet b/templates/profileData.hamlet
index d35a0b82c..7ef70f398 100644
--- a/templates/profileData.hamlet
+++ b/templates/profileData.hamlet
@@ -1,3 +1,4 @@
+$newline never
 <section .profile>
   <dl .deflist.profile-dl>
       <dt .deflist__dt> _{MsgName}
@@ -23,14 +24,14 @@
             <li .list-ul__item>
               #{ssh}
     $if not $ null lecture_corrector
-      <dt .deflist__dt> Korrektor
+      <dt .deflist__dt>_{MsgProfileCorrector}
       <dd .deflist__dd>
         <ul .list-ul>
           $forall (E.Value tid, E.Value ssh, E.Value csh) <- lecture_corrector
             <li .list-ul__item>
               <a href=@{CourseR tid ssh csh CShowR}>#{tid}-#{ssh}-#{csh}
     $if not $ null studies
-      <dt .deflist__dt> Studiengänge
+      <dt .deflist__dt>_{MsgAdminFeaturesHeading}
       <dd .deflist__dd>
         <div .scrolltable>
           <table .table.table--striped.table--hover.table--condensed>
@@ -55,77 +56,49 @@
   <div .container>
     $if hasRows
       <div .container>
-        <h2> Eigene Kurse
+        <h2>_{MsgProfileCourses}
         <div .container>
           ^{ownedCoursesTable}
 
   <div .container>
-    <h2> Kursanmeldungen
+    <h2>_{MsgProfileCourseParticipations}
     <div .container>
       ^{enrolledCoursesTable}
 
   <div .container>
-    <h2> Noten
+    <h2>_{MsgProfileCourseExamResults}
     <div .container>
       ^{examTable}
 
   <div .container>
-    <h2> Eigene Übungsgruppen
+    <h2>_{MsgProfileTutorials}
     <div .container>
       ^{ownTutorialTable}
 
   <div .container>
-    <h2> Übungsgruppen
+    <h2>_{MsgProfileTutorialParticipations}
     <div .container>
       ^{tutorialTable}
 
   <div .container>
-    <h2> Abgabegruppen
+    <h2>_{MsgProfileSubmissionGroups}
     <div .container>
       ^{submissionGroupTable}
 
   <div .container>
-    <h2> Abgaben
+    <h2>_{MsgProfileSubmissions}
     <div .container>
       ^{submissionTable}
-      <em>Hinweis:
-      Bei Gruppenabgaben wird kein Datum angezeigt,
-      falls Sie die Gruppenabgabe nie selbst hochgeladen haben.
+      <em>_{MsgProfileRemark}
+      _{MsgProfileGroupSubmissionDates}
 
   <div .container>
     <h2> _{MsgCorrector}
     <div .container>
       ^{correctionsTable}
 
-    <h4> Hinweis:
-    Die oberhalb angezeigte Tabelle zeigt nur prinzipielle Einteilungen als Korrektor zu einem Übungsblatt;
-    auch ohne Einteilung können Korrekturen einzeln zugewiesen werden, welche hier nicht aufgeführt werden.
-    Hier finden Sie eine
-    <a href=@{CorrectionsR}>Auflistung aller tatsächlich zugewiesenen Korrekturen
-    .
+    <em>_{MsgProfileRemark}
+    _{MsgProfileCorrectorRemark}
+    <a href=@{CorrectionsR}>_{MsgProfileCorrections}
 
-
-<section>
-  <h2>_{MsgRemarks}
-  <ul>
-    <li>
-      Sichern Sie bitte Ihre Daten! Die Uni2work Datenbank wird täglich gesichert;
-      dennoch können wir Probleme noch nicht gänzlich ausschließen.
-    <li>
-      Nicht aufgeführt sind Zeitstempel mit Benutzerinformationen, z.B. bei der Editierung und Korrektur von Übungen, Übungsgruppenleiterschaft, Raumbuchungen, etc.
-    <li>
-      Sie können die
-      <a href=@{HelpR}>
-        Löschung Ihre Daten über eine Supportanfrage beantragen
-      . Ihre Daten werden dann nach Ablauf einer Frist gelöscht.
-      Daten, welche keiner gesetzlichen Aufbewahrungsfrist unterliegen
-      (z.B. Klausurnoten) verbleiben im System bis zur Ablauf der Aufbewahrungsfrist.
-      <p>
-      Benutzerdaten bleiben prinzipiell so lange gespeichert,
-      bis ein Institutsadministrator über die Exmatrikulation informiert wurde.
-      Dann wird der Account mit einer angemessenen zeitverzögerung gelöscht.
-      Anonymisierte Prüfungsnoten verbleiben aus statistischen Gründen dauerhaft im System.
-
-    <li>
-      Bei gemeinsamen Gruppenabgaben wird nur die Zuordnung zu diesem Benutzer gelöscht.
-      Die Abgabe selbst wird erst gelöscht, wenn alle Benutzer einer Abgabe deren Löschung veranlasst haben.
+^{profileRemarks}
diff --git a/templates/submission.hamlet b/templates/submission.hamlet
index 3b5728941..1a91970af 100644
--- a/templates/submission.hamlet
+++ b/templates/submission.hamlet
@@ -1,3 +1,4 @@
+$newline never
 $maybe cID <- mcid
   <section>
     $case sheetSubmissionMode
@@ -6,8 +7,12 @@ $maybe cID <- mcid
           _{MsgSubmissionNoUploadExpected}
       $of _
         <h2>
-          <a href=@{urlArchive cID}>Archiv
-          (<a href=@{urlOriginal cID}>Original</a>)
+          _{MsgSubmissionFiles}
+        <p>
+          <a href=@{urlArchive cID}>_{MsgSubmissionArchive}
+          \ (
+          <a href=@{urlOriginal cID}>_{MsgSubmissionOriginal}
+          )
 
         $maybe fileTable <- mFileTable
           <h3>_{MsgSubmissionFiles}
diff --git a/templates/widgets/asidenav/asidenav.hamlet b/templates/widgets/asidenav/asidenav.hamlet
index a5cea81db..9d483b90b 100644
--- a/templates/widgets/asidenav/asidenav.hamlet
+++ b/templates/widgets/asidenav/asidenav.hamlet
@@ -5,7 +5,8 @@ $newline never
       <div .asidenav__logo-lmu >
         #{logo}
 
-      <span .asidenav__logo-uni2work>UNI2WORK
+      <span .asidenav__logo-uni2work>
+        _{MsgLogo}
 
   <div .asidenav>
     $forall tid <- favouriteTerms
diff --git a/templates/widgets/fields/bool.hamlet b/templates/widgets/fields/bool.hamlet
index 0a2fc391d..76a5b0665 100644
--- a/templates/widgets/fields/bool.hamlet
+++ b/templates/widgets/fields/bool.hamlet
@@ -1,9 +1,10 @@
 $newline never
 <div .radio-group>
   $if not isReq
-    <div .radio>
-      <input id=#{theId}-none *{attrs} type=radio name=#{name} value=none checked>
-      <label for=#{theId}-none>_{MsgCourseFilterNone}
+    $maybe noneMsg <- mkNone
+      <div .radio>
+        <input id=#{theId}-none *{attrs} type=radio name=#{name} value=none checked>
+        <label for=#{theId}-none>_{noneMsg}
 
   <div .radio>
     <input id=#{theId}-yes *{attrs} type=radio name=#{name} value=yes :showVal id val:checked>
diff --git a/templates/widgets/lipsum/lipsum.hamlet b/templates/widgets/lipsum/lipsum.hamlet
deleted file mode 100644
index f147e1f57..000000000
--- a/templates/widgets/lipsum/lipsum.hamlet
+++ /dev/null
@@ -1,10 +0,0 @@
-<div>
-  <h2>A little lorem ipsum to make the page scrollable
-  Aute velit consectetur consequat excepteur ut in qui do reprehenderit sit consequat occaecat incididunt sint eu. Nulla cillum quis et sit labore aliquip et ad excepteur duis elit deserunt aute. Anim esse reprehenderit et ipsum et sit quis minim enim sint et pariatur duis nostrud. Do minim dolore adipisicing ullamco ad aute veniam id magna est proident tempor labore non. Mollit et laboris duis esse commodo ex tempor.
-  Elit labore qui dolor ea non ut anim occaecat do aliqua cillum qui esse. Aliqua nisi non veniam labore esse irure velit qui veniam labore consectetur ut. Tempor laboris anim officia veniam nostrud cupidatat reprehenderit aute incididunt nostrud dolore occaecat deserunt pariatur in non dolore.
-  Proident anim pariatur eu laborum Lorem duis cillum est anim magna sit pariatur eu. Nulla consectetur quis ea sunt proident sint laborum. Esse est ea Lorem mollit aute excepteur fugiat ipsum ipsum ad irure do reprehenderit voluptate. Sint tempor nulla mollit voluptate pariatur aliquip culpa amet ullamco fugiat incididunt minim sint ipsum exercitation eiusmod ad. Nostrud ipsum nulla cillum ex aute elit voluptate proident proident magna ut. Ipsum officia cillum officia nostrud enim fugiat ut. Voluptate laboris aute dolore incididunt aliquip sit sit. Ea ut laboris Lorem ea ad non nostrud aute tempor non nisi.
-  Qui cupidatat nisi id et excepteur sint aliquip fugiat sint reprehenderit aliquip enim anim aliqua sint dolore proident. Voluptate labore tempor laboris nisi eiusmod sunt occaecat deserunt adipisicing. Consectetur fugiat quis non ad laboris aliqua voluptate in eu id. Duis velit cillum aliquip dolor non ea mollit incididunt elit ex excepteur aute consequat amet.
-  Aute velit consectetur consequat excepteur ut in qui do reprehenderit sit consequat occaecat incididunt sint eu. Nulla cillum quis et sit labore aliquip et ad excepteur duis elit deserunt aute. Anim esse reprehenderit et ipsum et sit quis minim enim sint et pariatur duis nostrud. Do minim dolore adipisicing ullamco ad aute veniam id magna est proident tempor labore non. Mollit et laboris duis esse commodo ex tempor.
-  Elit labore qui dolor ea non ut anim occaecat do aliqua cillum qui esse. Aliqua nisi non veniam labore esse irure velit qui veniam labore consectetur ut. Tempor laboris anim officia veniam nostrud cupidatat reprehenderit aute incididunt nostrud dolore occaecat deserunt pariatur in non dolore.
-  Proident anim pariatur eu laborum Lorem duis cillum est anim magna sit pariatur eu. Nulla consectetur quis ea sunt proident sint laborum. Esse est ea Lorem mollit aute excepteur fugiat ipsum ipsum ad irure do reprehenderit voluptate. Sint tempor nulla mollit voluptate pariatur aliquip culpa amet ullamco fugiat incididunt minim sint ipsum exercitation eiusmod ad. Nostrud ipsum nulla cillum ex aute elit voluptate proident proident magna ut. Ipsum officia cillum officia nostrud enim fugiat ut. Voluptate laboris aute dolore incididunt aliquip sit sit. Ea ut laboris Lorem ea ad non nostrud aute tempor non nisi.
-  Qui cupidatat nisi id et excepteur sint aliquip fugiat sint reprehenderit aliquip enim anim aliqua sint dolore proident. Voluptate labore tempor laboris nisi eiusmod sunt occaecat deserunt adipisicing. Consectetur fugiat quis non ad laboris aliqua voluptate in eu id. Duis velit cillum aliquip dolor non ea mollit incididunt elit ex excepteur aute consequat amet.

From 155ed1d557e8b12fc40ac7de4efc9987a4e560f8 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 22 Oct 2019 14:03:30 +0200
Subject: [PATCH 013/126] fix(i18n): i18n in various places

---
 messages/campus/de.msg            |  1 +
 messages/dummy/de.msg             |  3 +-
 messages/pw-hash/de.msg           |  4 +-
 messages/uniworx/de-de-formal.msg | 29 +++++++++++-
 src/Auth/Dummy.hs                 |  5 +-
 src/Auth/LDAP.hs                  |  3 +-
 src/Auth/PWHash.hs                | 10 ++--
 src/Handler/Admin.hs              | 10 ++--
 src/Handler/Corrections.hs        |  7 +--
 src/Handler/Course/Edit.hs        |  5 +-
 src/Handler/Profile.hs            | 11 +++--
 src/Handler/Sheet.hs              | 10 ++--
 src/Handler/SystemMessage.hs      | 26 ++++++-----
 src/Handler/Term.hs               | 76 ++++++++-----------------------
 src/Handler/Utils/Form.hs         | 27 ++++-------
 15 files changed, 111 insertions(+), 116 deletions(-)

diff --git a/messages/campus/de.msg b/messages/campus/de.msg
index 9a4b384fc..43d544af9 100644
--- a/messages/campus/de.msg
+++ b/messages/campus/de.msg
@@ -1,5 +1,6 @@
 CampusIdentPlaceholder: Vorname.Nachname@campus.lmu.de
 CampusIdent: Campus-Kennung
 CampusPassword: Passwort
+CampusPasswordPlaceholder: Passwort
 CampusSubmit: Abschicken
 CampusInvalidCredentials: Ungültige Logindaten
\ No newline at end of file
diff --git a/messages/dummy/de.msg b/messages/dummy/de.msg
index 5a24922aa..16bd26af5 100644
--- a/messages/dummy/de.msg
+++ b/messages/dummy/de.msg
@@ -1,2 +1,3 @@
-DummyIdent: Nutzer-Kennung
+DummyIdent: Identifikation
+DummyIdentPlaceholder: Identifikation
 DummyNoFormData: Keine Formulardaten empfangen
\ No newline at end of file
diff --git a/messages/pw-hash/de.msg b/messages/pw-hash/de.msg
index 9fb1eb5e4..6a172120b 100644
--- a/messages/pw-hash/de.msg
+++ b/messages/pw-hash/de.msg
@@ -1,2 +1,4 @@
 PWHashIdent: Identifikation
-PWHashPassword: Passwort
\ No newline at end of file
+PWHashIdentPlaceholder: Identifikation
+PWHashPassword: Passwort
+PWHashPasswordPlaceholder: Passwort
\ No newline at end of file
diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index 1ca265cc8..1b164cc8d 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -274,6 +274,8 @@ SheetSubmissionMode: Abgabe-Modus
 SheetExercise: Aufgabenstellung
 SheetHint: Hinweis
 SheetHintFrom: Hinweis ab
+SheetHintFromPlaceholder: Datum, sonst nur für Korrektoren
+SheetSolutionFromPlaceholder: Datum, sonst nur für Korrektoren
 SheetSolution: Lösung
 SheetSolutionFrom: Lösung ab
 SheetMarking: Hinweise für Korrektoren
@@ -2060,4 +2062,29 @@ ProfileSubmissions: Abgaben
 ProfileRemark: Hinweis
 ProfileGroupSubmissionDates: Bei Gruppenabgaben wird kein Datum angezeigt, wenn Sie die Gruppenabgabe nie selbst hochgeladen haben.
 ProfileCorrectorRemark: Die oberhalb angezeigte Tabelle zeigt nur prinzipielle Einteilungen als Korrektor zu einem Übungsblatt. Auch ohne Einteilung können Korrekturen einzeln zugewiesen werden, welche hier dann nicht aufgeführt werden.
-ProfileCorrections: Auflistung aller zugewiesenen Korrekturen
\ No newline at end of file
+ProfileCorrections: Auflistung aller zugewiesenen Korrekturen
+
+GroupSizeNotNatural: „Gruppengröße“ muss eine natürliche Zahl sein
+AmbiguousEmail: E-Mail Adresse nicht eindeutig
+CourseDescriptionPlaceholder: Bitte mindestens die Modulbeschreibung angeben
+CourseHomepageExternalPlaceholder: Optionale externe URL
+PointsPlaceholder: Punktezahl
+RFC1766: RFC1766-Sprachcode
+
+TermShort: Kürzel
+TermCourseCount: Kurse
+TermStart: Semesteranfang
+TermEnd: Semesterende
+TermStartMustMatchName: Jahreszahl im Namenskürzel stimmt nicht mit Semesterbeginn überein.
+TermEndMustBeAfterStart: Semester darf nicht enden, bevor es beginnt.
+TermLectureEndMustBeAfterStart: Vorlesungszeit muss vor ihrem Ende anfgangen.
+TermStartMustBeBeforeLectureStart: Semester muss vor der Vorlesungszeit beginnen.
+TermEndMustBeAfterLectureEnd: Vorlesungszeit muss vor dem Semester enden.
+AdminPageEmpty: Diese Seite soll eine Übersichtsseite für Administratoren werden. Aktuell finden sich hier nur Links zu wichtigen Administrator-Funktionalitäten.
+HaveCorrectorAccess sheetName@SheetName: Sie haben Korrektor-Zugang zu #{original sheetName}.
+FavouritesPlaceholder: Anzahl Favoriten
+FavouritesNotNatural: Anzahl der Favoriten muss eine natürliche Zahl sein!
+FavouritesSemestersPlaceholder: Anzahl Semester
+FavouritesSemestersNotNatural: Anzahl der Favoriten-Semester muss eine natürliche Zahl sein!
+
+ProfileTitle: Benutzereinstellungen
\ No newline at end of file
diff --git a/src/Auth/Dummy.hs b/src/Auth/Dummy.hs
index 4bfc09d01..9f88b5ed6 100644
--- a/src/Auth/Dummy.hs
+++ b/src/Auth/Dummy.hs
@@ -13,6 +13,7 @@ import qualified Data.CaseInsensitive as CI
 
 
 data DummyMessage = MsgDummyIdent
+                  | MsgDummyIdentPlaceholder
                   | MsgDummyNoFormData
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
 
@@ -24,7 +25,9 @@ dummyForm :: ( RenderMessage (HandlerSite m) FormMessage
              , Button (HandlerSite m) ButtonSubmit
              , MonadHandler m
              ) => AForm m (CI Text)
-dummyForm = areq (ciField & addDatalist userList) (fslI MsgDummyIdent & noAutocomplete) Nothing
+dummyForm = wFormToAForm $ do
+  mr <- getMessageRender
+  aFormToWForm $ areq (ciField & addDatalist userList) (fslpI MsgDummyIdent (mr MsgDummyIdentPlaceholder) & noAutocomplete) Nothing
   where
     userList = fmap mkOptionList . runDB $ withReaderT projectBackend (map toOption <$> selectList [] [Asc UserIdent] :: ReaderT SqlBackend _ [Option UserIdent])
     toOption (Entity _ User{..}) = Option userDisplayName userIdent (CI.original userIdent)
diff --git a/src/Auth/LDAP.hs b/src/Auth/LDAP.hs
index 7863ec34a..e35bfce1b 100644
--- a/src/Auth/LDAP.hs
+++ b/src/Auth/LDAP.hs
@@ -36,6 +36,7 @@ data CampusLogin = CampusLogin
 data CampusMessage = MsgCampusIdentPlaceholder
                    | MsgCampusIdent
                    | MsgCampusPassword
+                   | MsgCampusPasswordPlaceholder
                    | MsgCampusSubmit
                    | MsgCampusInvalidCredentials
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
@@ -129,7 +130,7 @@ campusForm = do
   MsgRenderer mr <- getMsgRenderer
   
   ident <- wreq ciField (fslpI MsgCampusIdent (mr MsgCampusIdentPlaceholder) & addAttr "autofocus" "") Nothing
-  password <- wreq passwordField (fslI MsgCampusPassword) Nothing
+  password <- wreq passwordField (fslpI MsgCampusPassword (mr MsgCampusPasswordPlaceholder)) Nothing
 
   return $ CampusLogin
     <$> ident
diff --git a/src/Auth/PWHash.hs b/src/Auth/PWHash.hs
index b2194bf90..3fd716694 100644
--- a/src/Auth/PWHash.hs
+++ b/src/Auth/PWHash.hs
@@ -22,7 +22,9 @@ data HashLogin = HashLogin
   } deriving (Generic, Typeable)
 
 data PWHashMessage = MsgPWHashIdent
+                   | MsgPWHashIdentPlaceholder
                    | MsgPWHashPassword
+                   | MsgPWHashPasswordPlaceholder
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
 
 
@@ -30,9 +32,11 @@ hashForm :: ( RenderMessage (HandlerSite m) FormMessage
             , RenderMessage (HandlerSite m) PWHashMessage
             , MonadHandler m
             ) => AForm m HashLogin
-hashForm = HashLogin
-  <$> areq ciField (fslpI MsgPWHashIdent "Identifikation") Nothing
-  <*> areq passwordField (fslpI MsgPWHashPassword "Passwort") Nothing
+hashForm = wFormToAForm $ do
+  mr <- getMessageRender
+  aFormToWForm $ HashLogin
+    <$> areq ciField (fslpI MsgPWHashIdent (mr MsgPWHashIdentPlaceholder)) Nothing
+    <*> areq passwordField (fslpI MsgPWHashPassword (mr MsgPWHashPasswordPlaceholder)) Nothing
 
 
 hashLogin :: forall site.
diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs
index 5bcf4359a..740609be0 100644
--- a/src/Handler/Admin.hs
+++ b/src/Handler/Admin.hs
@@ -33,10 +33,7 @@ getAdminR :: Handler Html
 getAdminR = -- do
    siteLayoutMsg MsgAdminHeading $ do
       setTitleI MsgAdminHeading
-      [whamlet|
-        This shall become the Administrators' overview page.
-        Its current purpose is to provide links to some important admin functions
-      |]
+      i18n MsgAdminPageEmpty
 
 -- BEGIN - Buttons needed only here
 data ButtonCreate = CreateMath | CreateInf  -- Dummy for Example
@@ -74,7 +71,7 @@ emailTestForm = (,)
 makeDemoForm :: Int -> Form (Int,Bool,Double)
 makeDemoForm n = identifyForm ("adminTestForm" :: Text) $ \html -> do
     (result, widget) <- flip (renderAForm FormStandard) html $ (,,)
-        <$> areq (minIntField n "Zahl") (fromString $ "Ganzzahl > " ++ show n) Nothing
+        <$> areq (minIntFieldI n ("Zahl" :: Text)) (fromString $ "Ganzzahl > " ++ show n) Nothing
         <*  aformSection MsgFormBehaviour
         <*> areq checkBoxField "Muss nächste Zahl größer sein?" (Just True)
         <*> areq doubleField "Fliesskommazahl" Nothing
@@ -254,8 +251,9 @@ postAdminTestR = do
 getAdminErrMsgR, postAdminErrMsgR :: Handler Html
 getAdminErrMsgR = postAdminErrMsgR
 postAdminErrMsgR = do
+  MsgRenderer mr <- getMsgRenderer
   ((ctResult, ctView), ctEncoding) <- runFormPost . renderAForm FormStandard $
-        unTextarea <$> areq textareaField (fslpI MsgErrMsgCiphertext "Ciphertext") Nothing
+        unTextarea <$> areq textareaField (fslpI MsgErrMsgCiphertext (mr MsgErrMsgCiphertext)) Nothing
 
   plaintext <- formResultMaybe ctResult $ exceptT (\err -> Nothing <$ addMessageI Error err) (return . Just) . (encodedSecretBoxOpen :: Text -> ExceptT EncodedSecretBoxException Handler Value)
 
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 9b3937a5d..b9e16b4bb 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -714,13 +714,14 @@ postCorrectionR tid ssh csh shn cid = do
 
   results <- runDB $ correctionData tid ssh csh shn sub
 
+  MsgRenderer mr <- getMsgRenderer
   case results of
     [(Entity _ Course{..}, Entity _ Sheet{..}, Entity _ subm@Submission{..}, corrector)] -> do
       let ratingComment = fmap Text.strip submissionRatingComment >>= (\c -> c <$ guard (not $ null c))
           pointsForm = case sheetType of
             NotGraded  -> pure Nothing
             _otherwise -> aopt  (pointsFieldMax $ preview (_grading . _maxPoints) sheetType)
-                                (fslpI MsgRatingPoints "Punktezahl" & setTooltip sheetType)
+                                (fslpI MsgRatingPoints (mr MsgPointsPlaceholder) & setTooltip sheetType)
                                 (Just submissionRatingPoints)
 
       ((corrResult, corrForm'), corrEncoding) <- runFormPost . identifyForm FIDcorrection . renderAForm FormStandard $ (,,)
@@ -776,7 +777,6 @@ postCorrectionR tid ssh csh shn cid = do
             addMessageI Success MsgRatingFilesUpdated
             redirect $ CSubmissionR tid ssh csh shn cid CorrectionR
 
-      mr <- getMessageRender
       let sheetTypeDesc = mr sheetType
           heading = MsgCorrectionHead tid ssh csh shn cid
           headingWgt = [whamlet|
@@ -868,9 +868,10 @@ postCorrectionsCreateR = do
             , optionInternalValue = sid
             , optionExternalValue = toPathPiece (cID :: CryptoUUIDSheet)
             }
+  MsgRenderer mr <- getMsgRenderer
   ((pseudonymRes, pseudonymWidget), pseudonymEncoding) <- runFormPost . renderAForm FormStandard $ (,)
     <$> areq (selectField sheetOptions) (fslI MsgPseudonymSheet) Nothing
-    <*> (textToList <$> areq textareaField (fslpI MsgCorrectionPseudonyms "Pseudonyme" & setTooltip MsgCorrectionPseudonymsTip) Nothing)
+    <*> (textToList <$> areq textareaField (fslpI MsgCorrectionPseudonyms (mr MsgPseudonyms) & setTooltip MsgCorrectionPseudonymsTip) Nothing)
 
   case pseudonymRes of
     FormMissing -> return ()
diff --git a/src/Handler/Course/Edit.hs b/src/Handler/Course/Edit.hs
index 81dbe8573..b8fcf5748 100644
--- a/src/Handler/Course/Edit.hs
+++ b/src/Handler/Course/Edit.hs
@@ -256,7 +256,6 @@ makeCourseForm miButtonAction template = identifyForm FIDcourse . validateFormDB
 
             optionalActionW' (bool mforcedJust mpopt mayChange) allocationForm' (fslI MsgCourseAllocationParticipate & setTooltip MsgCourseAllocationParticipateTip) (is _Just . cfAllocation <$> template)
 
-    -- TODO: internationalization
     -- let autoUnzipInfo = [|Entpackt hochgeladene Zip-Dateien (*.zip) automatisch und fügt den Inhalt dem Stamm-Verzeichnis der Abgabe hinzu. TODO|]
 
     (result, widget) <- flip (renderAForm FormStandard) html $ CourseForm
@@ -267,9 +266,9 @@ makeCourseForm miButtonAction template = identifyForm FIDcourse . validateFormDB
             & setTooltip MsgCourseShorthandUnique)                      (cfShort      <$> template)
       <*> areq (schoolFieldFor userSchools)   (fslI MsgCourseSchool)    (cfSchool     <$> template)
       <*> areq termsField                     (fslI MsgCourseSemester)  (cfTerm       <$> template)
-      <*> aopt htmlField (fslpI MsgCourseDescription "Bitte mindestens die Modulbeschreibung angeben"
+      <*> aopt htmlField (fslpI MsgCourseDescription (mr MsgCourseDescriptionPlaceholder)
                          & setTooltip MsgCourseDescriptionTip)          (cfDesc       <$> template)
-      <*> aopt (urlField & cfStrip) (fslpI MsgCourseHomepageExternal "Optionale externe URL")
+      <*> aopt (urlField & cfStrip) (fslpI MsgCourseHomepageExternal (mr MsgCourseHomepageExternalPlaceholder))
                                                                         (cfLink       <$> template)
       <*> apopt checkBoxField  (fslI  MsgMaterialFree)                   (cfMatFree    <$> template)
       <*  aformSection MsgCourseFormSectionRegistration
diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index 170ce5dc4..b68c93006 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -79,15 +79,16 @@ instance RenderMessage UniWorX NotificationTriggerKind where
 
 makeSettingForm :: Maybe SettingsForm -> Form SettingsForm
 makeSettingForm template html = do
+    MsgRenderer mr <- getMsgRenderer
     (result, widget) <- flip (renderAForm FormStandard) html $ SettingsForm
         <$  aformSection MsgFormPersonalAppearance
         <*> areq (textField & cfStrip) (fslI MsgUserDisplayName & setTooltip MsgUserDisplayNameRulesBelow) (stgDisplayName <$> template)
         <*> areq (emailField & cfStrip & cfCI) (fslI MsgUserDisplayEmail & setTooltip MsgUserDisplayEmailTip) (stgDisplayEmail <$> template)
         <*  aformSection MsgFormCosmetics
-        <*> areq (natFieldI $ MsgNatField "Favoriten")
-            (fslpI MsgFavourites "Anzahl Favoriten" & setTooltip MsgFavouritesTip) (stgMaxFavourites <$> template)
-        <*> areq (natFieldI $ MsgNatField "Favoriten-Semester")
-            (fslpI MsgFavouriteSemesters "Anzahl Semester") (stgMaxFavouriteTerms <$> template)
+        <*> areq (natFieldI MsgFavouritesNotNatural)
+            (fslpI MsgFavourites (mr MsgFavouritesPlaceholder) & setTooltip MsgFavouritesTip) (stgMaxFavourites <$> template)
+        <*> areq (natFieldI MsgFavouritesSemestersNotNatural)
+            (fslpI MsgFavouriteSemesters (mr MsgFavouritesSemestersPlaceholder)) (stgMaxFavouriteTerms <$> template)
         <*> areq (selectField . return $ mkOptionList themeList)
             (fslI  MsgTheme) { fsId = Just "theme-select" } (stgTheme         <$> template)
         <*> areq (selectField $ dateTimeFormatOptions SelFormatDateTime) (fslI MsgDateTimeFormat) (stgDateTime <$> template)
@@ -318,7 +319,7 @@ postProfileR = do
   tResetTime <- traverse (formatTime SelFormatDateTime) userTokensIssuedAfter
 
   siteLayout [whamlet|_{MsgProfileFor} ^{nameWidget userDisplayName userSurname}|] $ do
-    setTitle . toHtml $ "Profil " <> userIdent
+    setTitleI MsgProfileTitle
     let settingsForm =
           wrapForm formWidget FormSettings
             { formMethod = POST
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 543865af2..caca8b576 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -91,7 +91,7 @@ makeSheetForm msId template = identifyForm FIDsheet $ \html -> do
     oldFileIds <- (return.) <$> case msId of
       Nothing    -> return $ partitionFileType mempty
       (Just sId) -> liftHandler $ runDB $ getFtIdMap sId
-    mr <- getMsgRenderer
+    mr'@(MsgRenderer mr) <- getMsgRenderer
     ctime <- ceilingQuarterHour <$> liftIO getCurrentTime
     (result, widget) <- flip (renderAForm FormStandard) html $ SheetForm
       <$> areq (textField & cfStrip & cfCI) (fslI MsgSheetName)         (sfName        <$> template)
@@ -103,9 +103,9 @@ makeSheetForm msId template = identifyForm FIDsheet $ \html -> do
             & setTooltip MsgSheetActiveFromTip)
                                                               (sfActiveFrom   <$> template)
       <*> areq utcTimeField   (fslI MsgSheetActiveTo)         (sfActiveTo     <$> template)
-      <*> aopt utcTimeField   (fslpI MsgSheetHintFrom "Datum, sonst nur für Korrektoren"
+      <*> aopt utcTimeField   (fslpI MsgSheetHintFrom (mr MsgSheetHintFromPlaceholder)
             & setTooltip MsgSheetHintFromTip)                 (sfHintFrom     <$> template)
-      <*> aopt utcTimeField   (fslpI MsgSheetSolutionFrom  "Datum, sonst nur für Korrektoren"
+      <*> aopt utcTimeField   (fslpI MsgSheetSolutionFrom (mr MsgSheetSolutionFromPlaceholder)
             & setTooltip MsgSheetSolutionFromTip)             (sfSolutionFrom <$> template)
       <* aformSection MsgSheetFormFiles
       <*> aopt (multiFileField $ oldFileIds SheetExercise) (fslI MsgSheetExercise) (sfSheetF <$> template)
@@ -124,7 +124,7 @@ makeSheetForm msId template = identifyForm FIDsheet $ \html -> do
       <*> aopt htmlField    (fslpI MsgSheetMarking "Html") (sfMarkingText <$> template)
     return $ case result of
       FormSuccess sheetResult
-        | errorMsgs <- validateSheet mr sheetResult
+        | errorMsgs <- validateSheet mr' sheetResult
         , not $ null errorMsgs ->
             (FormFailure errorMsgs, widget)
       _ -> (result, widget)
@@ -923,5 +923,5 @@ postSCorrInviteR = invitationR correctorInvitationConfig
 getSIsCorrR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html
 -- NOTE: The route SIsCorrR is only used to verfify corrector access rights to given sheet!
 getSIsCorrR _ _ _ shn = do
-  defaultLayout $ [whamlet|You have corrector access to #{shn}.|]
+  defaultLayout . i18n $ MsgHaveCorrectorAccess shn
 
diff --git a/src/Handler/SystemMessage.hs b/src/Handler/SystemMessage.hs
index c6a3c2214..3ae62b70f 100644
--- a/src/Handler/SystemMessage.hs
+++ b/src/Handler/SystemMessage.hs
@@ -23,6 +23,7 @@ postMessageR cID = do
         Nothing -> (systemMessageSummary, systemMessageContent)
         Just SystemMessageTranslation{..} -> (systemMessageTranslationSummary, systemMessageTranslationContent)
 
+  MsgRenderer mr <- getMsgRenderer
   let
     mkForm = do
       ((modifyRes, modifyView), modifyEnctype) <- runFormPost . identifyForm FIDSystemMessageModify . renderAForm FormStandard
@@ -31,9 +32,9 @@ postMessageR cID = do
           <*> aopt utcTimeField (fslI MsgSystemMessageTo) (Just systemMessageTo)
           <*> areq checkBoxField (fslI MsgSystemMessageAuthenticatedOnly) (Just systemMessageAuthenticatedOnly)
           <*> areq (selectField optionsFinite) (fslI MsgSystemMessageSeverity) (Just systemMessageSeverity)
-          <*> areq (langField False) (fslpI MsgSystemMessageLanguage "RFC1766-Sprachcode") (Just systemMessageDefaultLanguage)
-          <*> areq htmlField' (fslpI MsgSystemMessageContent "HTML") (Just systemMessageContent)
-          <*> aopt htmlField' (fslpI MsgSystemMessageSummary "HTML") (Just systemMessageSummary)
+          <*> areq (langField False) (fslpI MsgSystemMessageLanguage (mr MsgRFC1766)) (Just systemMessageDefaultLanguage)
+          <*> areq htmlField' (fslpI MsgSystemMessageContent "Html") (Just systemMessageContent)
+          <*> aopt htmlField' (fslpI MsgSystemMessageSummary "Html") (Just systemMessageSummary)
 
       ts <- runDB $ selectList [ SystemMessageTranslationMessage ==. smId ] [Asc SystemMessageTranslationLanguage]
       let ts' = Map.fromList $ (systemMessageTranslationLanguage . entityVal &&& id) <$> ts
@@ -45,9 +46,9 @@ postMessageR cID = do
           <$> fmap (Entity tId)
               ( SystemMessageTranslation
                   <$> pure systemMessageTranslationMessage
-                  <*> areq (langField False) (fslpI MsgSystemMessageLanguage "RFC1766-Sprachcode") (Just systemMessageTranslationLanguage)
-                  <*> areq htmlField' (fslpI MsgSystemMessageContent "HTML") (Just systemMessageTranslationContent)
-                  <*> aopt htmlField' (fslpI MsgSystemMessageSummary "HTML") (Just systemMessageTranslationSummary)
+                  <*> areq (langField False) (fslpI MsgSystemMessageLanguage (mr MsgRFC1766)) (Just systemMessageTranslationLanguage)
+                  <*> areq htmlField' (fslpI MsgSystemMessageContent "Html") (Just systemMessageTranslationContent)
+                  <*> aopt htmlField' (fslpI MsgSystemMessageSummary "Html") (Just systemMessageTranslationSummary)
               )
           <*> combinedButtonFieldF ""
 
@@ -56,9 +57,9 @@ postMessageR cID = do
       ((addTransRes, addTransView), addTransEnctype) <- runFormPost . identifyForm FIDSystemMessageAddTranslation . renderAForm FormStandard
         $ SystemMessageTranslation
           <$> pure smId
-          <*> areq (langField False) (fslpI MsgSystemMessageLanguage "RFC1766-Sprachcode") Nothing
-          <*> areq htmlField' (fslpI MsgSystemMessageContent "HTML") Nothing
-          <*> aopt htmlField' (fslpI MsgSystemMessageSummary "HTML") Nothing
+          <*> areq (langField False) (fslpI MsgSystemMessageLanguage (mr MsgRFC1766)) Nothing
+          <*> areq htmlField' (fslpI MsgSystemMessageContent "Html") Nothing
+          <*> aopt htmlField' (fslpI MsgSystemMessageSummary "Html") Nothing
 
       formResult modifyRes $ modifySystemMessage smId
 
@@ -252,14 +253,15 @@ postMessageListR = do
     FormSuccess (_, _selection) -- prop> null _selection
       -> addMessageI Error MsgSystemMessageEmptySelection
 
+  MsgRenderer mr <- getMsgRenderer
   ((addRes, addView), addEncoding) <- runFormPost . identifyForm FIDSystemMessageAdd . renderAForm FormStandard $ SystemMessage
     <$> aopt utcTimeField (fslI MsgSystemMessageFrom) Nothing
     <*> aopt utcTimeField (fslI MsgSystemMessageTo) Nothing
     <*> areq checkBoxField (fslI MsgSystemMessageAuthenticatedOnly) Nothing
     <*> areq (selectField optionsFinite) (fslI MsgSystemMessageSeverity) Nothing
-    <*> areq (langField False) (fslpI MsgSystemMessageLanguage "RFC1766-Sprachcode") (Just $ NonEmpty.head appLanguages)
-    <*> areq htmlField' (fslpI MsgSystemMessageContent "HTML") Nothing
-    <*> aopt htmlField' (fslpI MsgSystemMessageSummary "HTML") Nothing
+    <*> areq (langField False) (fslpI MsgSystemMessageLanguage (mr MsgRFC1766)) (Just $ NonEmpty.head appLanguages)
+    <*> areq htmlField' (fslpI MsgSystemMessageContent "Html") Nothing
+    <*> aopt htmlField' (fslpI MsgSystemMessageSummary "Html") Nothing
 
   case addRes of
     FormMissing -> return ()
diff --git a/src/Handler/Term.hs b/src/Handler/Term.hs
index 26c349c83..abce61c63 100644
--- a/src/Handler/Term.hs
+++ b/src/Handler/Term.hs
@@ -7,6 +7,8 @@ import qualified Data.Map as Map
 import qualified Database.Esqueleto as E
 
 import qualified Data.Set as Set
+
+import qualified Control.Monad.State.Class as State
   
 
 -- | Default start day of term for season,
@@ -18,32 +20,15 @@ defaultDay True  Summer = fromGregorian 2020  4  1
 defaultDay False Summer = fromGregorian 2020  9 30
 
 
-validateTerm :: Term -> [Text]
-validateTerm Term{..} =
-  [ msg  | (False, msg) <-
-    [ --startOk
-      ( termStart `withinTerm` termName
-      , "Jahreszahl im Namenskürzel stimmt nicht mit Semesterbeginn überein."
-      )
-    , -- endOk
-      ( termStart < termEnd
-      , "Semester darf nicht enden, bevor es begann."
-      )
-    , -- startOk
-      ( termLectureStart < termLectureEnd
-      , "Vorlesungszeit muss vor ihrem Ende anfgangen."
-      )
-    , -- lecStartOk
-      ( termStart <= termLectureStart
-      , "Semester muss vor der Vorlesungszeit beginnen."
-      )
-    , -- lecEndOk
-      ( termEnd >= termLectureEnd
-      , "Vorlesungszeit muss vor dem Semester enden."
-      )
-  ] ]
-
-
+validateTerm :: (MonadHandler m, HandlerSite m ~ UniWorX)
+             => FormValidator Term m ()
+validateTerm = do
+  Term{..} <- State.get
+  guardValidation MsgTermStartMustMatchName $ termStart `withinTerm` termName
+  guardValidation MsgTermEndMustBeAfterStart $ termStart < termEnd
+  guardValidation MsgTermLectureEndMustBeAfterStart $ termLectureStart < termLectureEnd
+  guardValidation MsgTermStartMustBeBeforeLectureStart $ termStart <= termLectureStart
+  guardValidation MsgTermEndMustBeAfterLectureEnd $ termEnd >= termLectureEnd
 
 
 getTermShowR :: Handler TypedContent
@@ -66,22 +51,22 @@ getTermShowR = do
     provideRep $ toJSON . map fst <$> runDB (E.select $ E.from termData)
     provideRep $ do
       let colonnadeTerms = widgetColonnade $ mconcat
-            [ sortable (Just "term-id") "Kürzel" $ \(Entity tid _, _) -> anchorCell
+            [ sortable (Just "term-id") (i18nCell MsgTermShort) $ \(Entity tid _, _) -> anchorCell
                 (TermCourseListR tid)
                 [whamlet|#{toPathPiece tid}|]
             , sortable (Just "lecture-start") (i18nCell MsgLectureStart) $ \(Entity _ Term{..},_) ->
                 cell $ formatTime SelFormatDate termLectureStart >>= toWidget
-            , sortable (Just "lecture-end") "Ende Vorlesungen"   $ \(Entity _ Term{..},_) ->
+            , sortable (Just "lecture-end") (i18nCell MsgTermLectureEnd) $ \(Entity _ Term{..},_) ->
                 cell $ formatTime SelFormatDate termLectureEnd >>= toWidget
-            , sortable Nothing "Aktiv" $ \(Entity _ Term{..},_) ->
+            , sortable Nothing (i18nCell MsgTermActive) $ \(Entity _ Term{..},_) ->
                 tickmarkCell termActive
-            , sortable Nothing "Kurse" $ \(_, E.Value numCourses) ->
+            , sortable Nothing (i18nCell MsgTermCourseCount) $ \(_, E.Value numCourses) ->
                 cell [whamlet|_{MsgNumCourses numCourses}|]
-            , sortable (Just "start") "Semesteranfang" $ \(Entity _ Term{..},_) ->
+            , sortable (Just "start") (i18nCell MsgTermStart) $ \(Entity _ Term{..},_) ->
                 cell $ formatTime SelFormatDate termStart >>= toWidget
-            , sortable (Just "end") "Semesterende"   $ \(Entity _ Term{..},_) ->
+            , sortable (Just "end") (i18nCell MsgTermEnd) $ \(Entity _ Term{..},_) ->
                 cell $ formatTime SelFormatDate termEnd >>= toWidget
-            , sortable Nothing "Feiertage im Semester" $ \(Entity _ Term{..},_) ->
+            , sortable Nothing (i18nCell MsgTermHolidays) $ \(Entity _ Term{..},_) ->
                 cell $ do
                   termHolidays' <- mapM (formatTime SelFormatDate) termHolidays
                   [whamlet|
@@ -248,7 +233,7 @@ termToTemplate (Just Term{..}) = TermFormTemplate
     }
 
 newTermForm :: TermFormTemplate -> Form Term
-newTermForm template html = do
+newTermForm template = validateForm validateTerm $ \html -> do
     mr <- getMessageRender
     let
       tidForm
@@ -264,7 +249,7 @@ newTermForm template html = do
         (fslI MsgTermHolidays & setTooltip MsgMassInputTip)
         True
         (tftHolidays template)
-    (result, widget) <- flip (renderAForm FormStandard) html $ Term
+    flip (renderAForm FormStandard) html $ Term
       <$> tidForm
       <*> areq dayField  (fslI MsgTermStartDay & setTooltip MsgTermStartDayTooltip) (tftStart template)
       <*> areq dayField  (fslI MsgTermEndDay   & setTooltip MsgTermEndDayTooltip)   (tftEnd   template)
@@ -272,24 +257,3 @@ newTermForm template html = do
       <*> areq dayField  (fslI MsgTermLectureStart) (tftLectureStart template)
       <*> areq dayField  (fslI MsgTermLectureEnd & setTooltip MsgTermLectureEndTooltip) (tftLectureEnd template)
       <*> areq checkBoxField (fslI MsgTermActive) (tftActive template)
-    return $ case result of
-      FormSuccess termResult
-        | errorMsgs <- validateTerm termResult
-        , not $ null errorMsgs ->
-          (FormFailure errorMsgs,
-                [whamlet|
-                  <div class="alert alert-danger">
-                    <div class="alert__content">
-                      <h4> Fehler:
-                      <ul>
-                        $forall errmsg <- errorMsgs
-                          <li> #{errmsg}
-                  ^{widget}
-                |]
-              )
-      _ -> (result, widget)
-{-
-  where
-    set :: Text -> FieldSettings site
-    set = bfs
--}
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index 73bcdb18e..c94045265 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -284,21 +284,12 @@ htmlField' = htmlField
 natFieldI :: (Monad m, Integral i, RenderMessage (HandlerSite m) msg, RenderMessage (HandlerSite m) FormMessage) => msg -> Field m i
 natFieldI msg = convertField fromInteger toInteger $ checkBool (>= 0) msg $ intMinField 0
 
-natField :: (Monad m, Integral i, RenderMessage (HandlerSite m) FormMessage) => Text -> Field m i
-natField d = convertField fromInteger toInteger $ checkBool (>= 0) (T.append  d " muss eine natürliche Zahl sein.") $ intMinField 0
-
-natIntField ::(Monad m, RenderMessage (HandlerSite m) FormMessage) => Text -> Field m Integer
-natIntField = natField
-
-posIntField :: (Monad m, Integral i, RenderMessage (HandlerSite m) FormMessage) => Text -> Field m i
-posIntField d = convertField fromInteger toInteger $ checkBool (> 0) (T.append  d " muss eine positive Zahl sein.") $ intMinField 1
-
 posIntFieldI :: (Monad m, Integral i, RenderMessage (HandlerSite m) msg, RenderMessage (HandlerSite m) FormMessage) => msg -> Field m i
 posIntFieldI msg = convertField fromInteger toInteger $ checkBool (> 0) msg $ intMinField 0
 
 -- | Field to request integral number > 'm'
-minIntField :: (Monad m, Integral i, Show i, RenderMessage (HandlerSite m) FormMessage) => i -> Text -> Field m i
-minIntField m d = checkBool (> m) (T.concat [d," muss größer als ", T.pack $ show m, " sein."]) $ intMinField m
+minIntFieldI :: (Monad m, Integral i, Show i, RenderMessage (HandlerSite m) FormMessage, RenderMessage (HandlerSite m) msg) => i -> msg -> Field m i
+minIntFieldI m msg = checkBool (> m) msg $ intMinField m
 
 pointsField :: (Monad m, HandlerSite m ~ UniWorX) => Field m Points
 pointsField = pointsFieldMinMax (Just 0) Nothing
@@ -831,7 +822,7 @@ sheetGroupAFormReq fs template = multiActionA selOptions fs (classify' <$> templ
   where
     selOptions = Map.fromList
       [ ( Arbitrary', Arbitrary
-          <$> apreq (natField "Gruppengröße") (fslI MsgSheetGroupMaxGroupsize & noValidate) (preview _maxParticipants =<< template)
+          <$> apreq (natFieldI MsgGroupSizeNotNatural) (fslI MsgSheetGroupMaxGroupsize & noValidate) (preview _maxParticipants =<< template)
         )
       , ( RegisteredGroups', pure RegisteredGroups )
       , ( NoGroups', pure NoGroups )
@@ -861,6 +852,10 @@ dayTimeField fs mutc = do
       | otherwise = (Nothing,Nothing)
 -}
 
+fieldTimeFormat :: String
+-- fieldTimeFormat = "%e.%m.%y %k:%M"
+fieldTimeFormat = "%Y-%m-%dT%H:%M:%S"
+  
 localTimeField :: (MonadHandler m, HandlerSite m ~ UniWorX) => Field m LocalTime
 localTimeField = Field
     { fieldParse = parseHelperGen readTime
@@ -873,11 +868,7 @@ localTimeField = Field
     , fieldEnctype = UrlEncoded
     }
   where
-    fieldTimeFormat :: String
-    --fieldTimeFormat = "%e.%m.%y %k:%M"
-    fieldTimeFormat = "%Y-%m-%dT%H:%M:%S"
-
-    -- `defaultTimeLocale` is okay here, since `fieldTimeFormat` does not contain any
+    -- `defaultTimeLocale` is okay here, since `fieldTimeFormat` does not contain any words
     readTime :: Text -> Either UniWorXMessage LocalTime
     readTime t =
       case parseTimeM True defaultTimeLocale fieldTimeFormat (T.unpack t) of
@@ -1149,7 +1140,7 @@ multiUserField onlySuggested suggestions = Field{..}
             case dbRes of
               [] -> return $ Left email
               [E.Value uid] -> return $ Right uid
-              _other -> throwE $ SomeMessage ("Ambiguous e-mail addr" :: Text)
+              _other -> throwE $ SomeMessage MsgAmbiguousEmail
 
 examResultField :: forall m res.
                    ( MonadHandler m

From 75677dc171943cbdd4abb872dd813a9bea40e40e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 22 Oct 2019 14:58:59 +0200
Subject: [PATCH 014/126] feat(i18n): get started on en-eu

---
 messages/uniworx/de-de-formal.msg |  10 +--
 messages/uniworx/en-eu.msg        | 141 ++++++++++++++++++++++++++++++
 2 files changed, 146 insertions(+), 5 deletions(-)

diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index 1b164cc8d..7e13cd5d5 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -73,9 +73,9 @@ Term: Semester
 TermPlaceholder: W/S + vierstellige Jahreszahl
 
 TermStartDay: Erster Tag
-TermStartDayTooltip: Üblicherweise immer 1.April oder 1.Oktober
+TermStartDayTooltip: Üblicherweise immer 1. April oder 1. Oktober
 TermEndDay: Letzter Tag
-TermEndDayTooltip: Üblicherweise immer 30.September oder 31.März
+TermEndDayTooltip: Üblicherweise immer 30. September oder 31. März
 TermHolidays: Feiertage
 TermHolidayPlaceholder: Feiertag
 TermLectureStart: Beginn Vorlesungen
@@ -111,8 +111,8 @@ CourseTutorial: Tutorium
 CourseSecretWrong: Falsches Passwort
 CourseSecret: Zugangspasswort
 CourseEditOk       tid@TermId ssh@SchoolId csh@CourseShorthand: Kurs #{tid}-#{ssh}-#{csh} wurde erfolgreich geändert.
-CourseNewDupShort  tid@TermId ssh@SchoolId csh@CourseShorthand: Kurs #{tid}-#{ssh}-#{csh} konnte nicht erstellt werden: Es gibt bereits einen anderen Kurs mit dem Kürzel #{csh} in diesem Semester.
-CourseEditDupShort tid@TermId ssh@SchoolId csh@CourseShorthand: Kurs #{tid}-#{ssh}-#{csh} konnte nicht geändert werden: Es gibt bereits einen anderen Kurs mit dem Kürzel #{csh} in diesem Semester.
+CourseNewDupShort  tid@TermId ssh@SchoolId csh@CourseShorthand: Kurs #{tid}-#{ssh}-#{csh} konnte nicht erstellt werden: Es gibt bereits einen anderen Kurs mit dem Kürzel #{csh} in diesem Semester und Institut.
+CourseEditDupShort tid@TermId ssh@SchoolId csh@CourseShorthand: Kurs #{tid}-#{ssh}-#{csh} konnte nicht geändert werden: Es gibt bereits einen anderen Kurs mit dem Kürzel #{csh} in diesem Semester und Institut.
 FFSheetName: Name
 TermCourseListHeading tid@TermId: Kursübersicht #{tid}
 TermSchoolCourseListHeading tid@TermId school@SchoolName: Kursübersicht #{tid} für #{school}
@@ -130,7 +130,7 @@ CourseMembersCountLimited n@Int max@Int: #{n}/#{max}
 CourseMembersCountOf n@Int mbNum@IntMaybe: #{n} Kursanmeldungen #{maybeToMessage " von " mbNum " möglichen"}
 CourseName: Name
 CourseDescription: Beschreibung
-CourseDescriptionTip: Beliebiges HTML-Markup ist gestattet
+CourseDescriptionTip: Beliebiges Html-Markup ist gestattet
 CourseHomepageExternal: Externe Homepage
 CourseShorthand: Kürzel
 CourseShorthandUnique: Muss nur innerhalb Institut und Semester eindeutig sein. Wird verbatim in die Url der Kursseite übernommen.
diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index c6e1dc4ad..5f7c3686a 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -1,2 +1,143 @@
+Logo: Uni2work
+
+BtnSubmit: Submit
+BtnAbort: Abort
+BtnDelete: Delete
+BtnRegister: Register
+BtnDeregister: Deregister
+BtnCourseRegister: Enrol for course
+BtnCourseDeregister: Leave course
+BtnCourseApply: Apply for course
+BtnCourseRetractApplication: Retract application
+BtnExamRegister: Enrol for exam
+BtnExamDeregister: Leave exam
+BtnHijack: Hijack session
+BtnSave: Save
+PressSaveToSave: Changes will only be saved after clicking "Save".
+BtnHandIn: Hand in submission
+BtnCandidatesInfer: Infer mapping
+BtnCandidatesDeleteConflicts: Delete conflicts
+BtnCandidatesDeleteAll: Delete all observations
+BtnResetTokens: Invalidate tokens
+BtnLecInvAccept: Accept
+BtnLecInvDecline: Decline
+BtnCorrInvAccept: Accept
+BtnCorrInvDecline: Decline
+BtnSubmissionsAssign: Assign submissions automatically
+
+Aborted: Aborted
+Remarks: Remarks
+Registered: Registered
+RegisteredSince: Registered since
+NotRegistered: Note enrolled for this course
+Registration: Registration
+RegisterFrom: Registration starts
+RegisterTo: Registration ends
+DeRegUntil: Deregistration until
+RegisterRetry: You haven't been enrolled. Press "Enrol for course" to enrol
+
+CourseRegistrationInterval: Registration
+CourseDirectRegistrationInterval: Direct registration
+CourseDeregisterUntil time: Deregistration only until #{time}
+
+GenericKey: Key
+GenericShort: Shorthand
+GenericIsNew: New
+GenericHasConflict: Conflict
+GenericBack: Back
+GenericChange: Change
+GenericNumChange: +/-
+GenericMin: Min
+GenericAvg: Avg
+GenericMax: Max
+GenericAll: All
+
+SummerTerm year: Summer semester #{year}
+WinterTerm year: Winter semester #{year}/#{succ year}
+SummerTermShort year: Summer #{year}
+WinterTermShort year: Winter #{year}/#{mod (succ year) 100}
+PSLimitNonPositive: “pagesize” must be greater than zero
+Page num: #{num}
+
+TermsHeading: Terms
+TermCurrent: Current term
+TermEditHeading: Edit term
+TermEditTid tid: Edit term #{tid}
+TermEdited tid: Successfully edited term #{tid}
+TermNewTitle: Edit/create term
+InvalidInput: Invalid input
+Term: Term
+TermPlaceholder: (W|S)<four digit year>
+
+TermStartDay: Starting day
+TermStartDayTooltip: Usually 1st of April or 1st of October
+TermEndDay: Last day
+TermEndDayTooltip: Usually 30th of September or 31st of March
+TermHolidays: Legal holidays
+TermHolidayPlaceholder: Legal holiday
+TermLectureStart: Lectures start
+TermLectureEnd: Lectures end
+TermLectureEndTooltip: Summer semesters are usually 14 weeks; winter semesters 15
+TermActive: Active
+
+SchoolListHeading: Departments
+SchoolHeading school: #{school}
+
+LectureStart: Lectures start
+
+Course: Course
+CourseShort: Shorthand
+CourseCapacity: Capacity
+CourseCapacityTip: Maximum permissable number of enrollments for this course; leave empty for unlimited capacity
+CourseNoCapacity: Course has reached maximum capacity
+TutorialNoCapacity: Tutorial has reached maximum capacity
+CourseNotEmpty: There are currently no participants enrolled for this course.
+CourseRegistration: Registration
+CourseRegisterOpen: Registration is open
+CourseRegisterOk: Successfully enrolled for course
+CourseDeregisterOk: Successfully left course
+CourseApplyOk: Successfully applied for course
+CourseRetractApplyOk: Successfully retracted application for course
+CourseDeregisterLecturerTip: If you deregister the participant you might loose access to this data
+CourseStudyFeature: Associated subject
+CourseStudyFeatureTip: For information purposes only (visible to course administrators)
+CourseStudyFeatureUpdated: Successfully updated associated subject
+CourseStudyFeatureNone: No associated subject
+CourseTutorial: Tutorial
+CourseSecretWrong: Wrong password
+CourseSecret: Access password
+CourseEditOk tid ssh csh: Successfully edited course #{tid}-#{ssh}-#{csh} 
+CourseNewDupShort tid ssh csh: Could not create course #{tid}-#{ssh}-#{csh}. Another course with shorthand #{csh} already exists for the given semester and school.
+CourseEditDupShort tid ssh csh: Could not edit course #{tid}-#{ssh}-#{csh}. Another course with shorthand #{csh} already exists for the given semester and school.
+FFSheetName: Name
+TermCourseListHeading tid: Courses #{tid}
+TermSchoolCourseListHeading tid school: Courses #{tid}, #{school}
+CourseListTitle: All courses
+TermCourseListTitle tid: Courses #{tid}
+TermSchoolCourseListTitle tid school: Courses #{tid}, #{school}
+CourseNewHeading: Create new course
+CourseEditHeading tid ssh csh: Edit course #{tid}-#{ssh}-#{csh}
+CourseEditTitle: Edit/Create course
+CourseMembers: Participants
+CourseMemberOf: Participant of
+CourseAssociatedWith: associated with
+CourseMembersCount n: #{n}
+CourseMembersCountLimited n max: #{n}/#{max}
+CourseMembersCountOf n mbNum: #{n} #{maybeToMessage "of " mbNum " "}participants
+CourseName: Title
+CourseDescription: Description
+CourseDescriptionTip: You may use arbitrary Html-Markup
+CourseHomepageExternal: External homepage
+CourseShorthand: Shorthand
+CourseShorthandUnique: Needs to be unique within school and term. Will be used verbatim within the url of the course page.
+CourseSemester: Semester
+CourseSchool: Department
+CourseSchoolShort: Department
+CourseSecretTip: Enrollment for this course will require the password, if set
+CourseSecretFormat: Arbitrary string
+CourseRegisterFromTip: When left empty students will not be able to enroll themselves
+CourseRegisterToTip: May be left empty to allow enrollment indefinitely
+
+
 MenuLanguage: Language
 LanguageChanged: Language changed successfully
\ No newline at end of file

From 73b0546db674914ca24e0f69c0c17a309e88fc1e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 22 Oct 2019 17:54:03 +0200
Subject: [PATCH 015/126] feat(info): start glossary

---
 messages/uniworx/de-de-formal.msg             |  8 +++++-
 routes                                        |  1 +
 src/Foundation.hs                             | 12 ++++++++-
 src/Handler/Info.hs                           | 21 +++++++++++++++
 src/Handler/Utils/I18n.hs                     | 27 ++++++++++++++++++-
 templates/glossary.cassius                    | 14 ++++++++++
 templates/glossary.hamlet                     |  5 ++++
 .../glossary/applicant.de-de-formal.hamlet    |  8 ++++++
 .../course-participant.de-de-formal.hamlet    |  8 ++++++
 9 files changed, 101 insertions(+), 3 deletions(-)
 create mode 100644 templates/glossary.cassius
 create mode 100644 templates/glossary.hamlet
 create mode 100644 templates/i18n/glossary/applicant.de-de-formal.hamlet
 create mode 100644 templates/i18n/glossary/course-participant.de-de-formal.hamlet

diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index 7e13cd5d5..a32e40c30 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -2087,4 +2087,10 @@ FavouritesNotNatural: Anzahl der Favoriten muss eine natürliche Zahl sein!
 FavouritesSemestersPlaceholder: Anzahl Semester
 FavouritesSemestersNotNatural: Anzahl der Favoriten-Semester muss eine natürliche Zahl sein!
 
-ProfileTitle: Benutzereinstellungen
\ No newline at end of file
+ProfileTitle: Benutzereinstellungen
+
+GlossaryTitle: Begriffsverzeichnis
+MenuGlossary: Begriffsverzeichnis
+
+Applicant: Bewerber
+CourseParticipant: Kursteilnehmer
\ No newline at end of file
diff --git a/routes b/routes
index b64e379b5..1c5500267 100644
--- a/routes
+++ b/routes
@@ -63,6 +63,7 @@
 /info/lecturer                InfoLecturerR    GET             !lecturer
 /info/data                    DataProtR        GET             !free
 /info/allocation              InfoAllocationR  GET             !free
+/info/glossary                GlossaryR        GET             !free
 /impressum                    ImpressumR       GET             !free
 /version                      VersionR         GET             !free
 
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 1b17acd0c..ffe945263 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -2182,7 +2182,9 @@ instance YesodBreadcrumbs UniWorX where
     if
       | mayList   -> i18nCrumb MsgBreadcrumbSystemMessage $ Just MessageListR
       | otherwise -> i18nCrumb MsgBreadcrumbSystemMessage $ Just HomeR
-  breadcrumb (MessageListR) = i18nCrumb MsgMenuMessageList $ Just AdminR
+  breadcrumb MessageListR = i18nCrumb MsgMenuMessageList $ Just AdminR
+
+  breadcrumb GlossaryR = i18nCrumb MsgMenuGlossary $ Just InfoR
   -- breadcrumb  _ = return ("Uni2work", Nothing) -- Default is no breadcrumb at all
 
 submissionList :: TermId -> CourseShorthand -> SheetName -> UserId -> DB [E.Value SubmissionId]
@@ -2480,6 +2482,14 @@ pageActions (InfoR) = [
       , menuItemModal = False
       , menuItemAccessCallback' = return True
       }
+  , MenuItem
+      { menuItemType  = PageActionPrime
+      , menuItemLabel = MsgMenuGlossary
+      , menuItemIcon  = Nothing
+      , menuItemRoute = SomeRoute GlossaryR
+      , menuItemModal = False
+      , menuItemAccessCallback' = return True
+      }
   ]
 pageActions (VersionR) = [
     MenuItem
diff --git a/src/Handler/Info.hs b/src/Handler/Info.hs
index 751bbe171..c4a5fe7dc 100644
--- a/src/Handler/Info.hs
+++ b/src/Handler/Info.hs
@@ -3,6 +3,9 @@ module Handler.Info where
 import Import
 import Handler.Utils
 
+import qualified Data.Map as Map
+import qualified Data.CaseInsensitive as CI
+
 import Development.GitRev
 
 -- | Versionsgeschichte
@@ -67,3 +70,21 @@ getInfoLecturerR =
       if currentTime > expiryTime
         then mempty
         else toWidget [whamlet| ^{iconTooltip tooltipNew (Just IconNew) False} |]
+
+getGlossaryR :: Handler Html
+getGlossaryR =
+  siteLayoutMsg' MsgGlossaryTitle $ do
+    setTitleI MsgGlossaryTitle
+    MsgRenderer mr <- getMsgRenderer
+    let
+      entries' = sortOn (CI.mk . view _2) $ do
+        (k, v) <- Map.toList entries
+        msg <- maybeToList $ Map.lookup k msgMap
+        return (k, mr msg, v)
+    $(widgetFile "glossary")
+  where
+    entries = $(i18nWidgetFiles "glossary")
+    msgMap = Map.fromList
+      [ ("applicant"         , MsgApplicant        )
+      , ("course-participant", MsgCourseParticipant)
+      ]
diff --git a/src/Handler/Utils/I18n.hs b/src/Handler/Utils/I18n.hs
index 1119191d2..f3b2e157a 100644
--- a/src/Handler/Utils/I18n.hs
+++ b/src/Handler/Utils/I18n.hs
@@ -9,6 +9,11 @@ import Language.Haskell.TH.Syntax (qRunIO)
 import qualified Data.List as List
 import qualified Data.List.NonEmpty as NonEmpty
 
+import qualified Data.Set as Set
+import qualified Data.Map as Map
+
+import qualified Data.Text as Text
+
 import System.Directory (listDirectory)
 import System.FilePath.Posix (takeBaseName)
 
@@ -40,4 +45,24 @@ i18nWidgetFile basename = do
     [ funD ws $ [ clause [litP $ stringL l] (normalB . widgetFile $ "i18n" </> basename </> l) []
                 | l <- unpack <$> NonEmpty.toList availableTranslations' -- One function definition for every available language
                 ] ++ [ clause [wildP] (normalB [e| error "selectLanguage returned an invalid translation" |]) [] ] -- Fallback mostly there so compiler does not complain about non-exhaustive pattern match
-    ] [e|selectLanguage availableTranslations' >>= $(varE ws)|]
\ No newline at end of file
+    ] [e|selectLanguage availableTranslations' >>= $(varE ws)|]
+
+i18nWidgetFiles :: FilePath -> Q Exp
+i18nWidgetFiles basename = do
+  let i18nDirectory = "templates" </> "i18n" </> basename
+  availableFiles <- qRunIO $ listDirectory i18nDirectory
+  let fileKinds' = fmap (pack . dropExtension . takeBaseName &&& toTranslation . pack . takeBaseName) availableFiles
+      fileKinds :: Map Text [Text]
+      fileKinds = sortWith (NTop . flip List.elemIndex (NonEmpty.toList appLanguages)) . Set.toList <$> Map.fromListWith Set.union [ (kind, Set.singleton l) | (kind, Just l) <- fileKinds' ]
+      toTranslation fName = listToMaybe . sortOn length . mapMaybe (flip Text.stripPrefix fName) $ map fst fileKinds'
+
+  availableTranslations' <- iforM fileKinds $ \kind -> maybe (fail $ "‘" <> i18nDirectory <> "’ has no translations for ‘" <> unpack kind <> "’") return . NonEmpty.nonEmpty
+
+  -- Dispatch to correct language (depending on user settings via `selectLanguage`) at run time
+  ws <- newName "ws" -- Name for dispatch function
+  letE
+    [ funD ws $ [ clause [litP $ stringL kind, litP $ stringL l] (normalB . widgetFile $ "i18n" </> basename </> kind <.> l) []
+                | (unpack -> kind, ls) <- Map.toList availableTranslations'
+                , l <- unpack <$> NonEmpty.toList ls
+                ] ++ [ clause [wildP, wildP] (normalB [e| error "selectLanguage returned an invalid translation" |]) [] ] -- Fallback mostly there so compiler does not complain about non-exhaustive pattern match
+    ] [e|imap (\kind ls -> selectLanguage ls >>= $(varE ws) kind) availableTranslations'|]
diff --git a/templates/glossary.cassius b/templates/glossary.cassius
new file mode 100644
index 000000000..226288fc5
--- /dev/null
+++ b/templates/glossary.cassius
@@ -0,0 +1,14 @@
+.glossary
+  dt, .dt
+    font-weight: 600
+
+    &.sec
+      font-style: italic
+      font-size: 0.9rem
+      font-weight: 600
+      color: var(--color-fontsec)
+  dd, .dd
+    margin-left: 12px
+
+  dd + dt, .dd + dt, dd + .dt, .dd + .dt
+    margin-top: 17px
\ No newline at end of file
diff --git a/templates/glossary.hamlet b/templates/glossary.hamlet
new file mode 100644
index 000000000..5feaa5dfa
--- /dev/null
+++ b/templates/glossary.hamlet
@@ -0,0 +1,5 @@
+$newline never
+<dl .glossary>
+  $forall (term, rTerm, wgt) <- entries'
+    <dt ##{term}>#{rTerm}
+    ^{wgt}
diff --git a/templates/i18n/glossary/applicant.de-de-formal.hamlet b/templates/i18n/glossary/applicant.de-de-formal.hamlet
new file mode 100644
index 000000000..700dac30a
--- /dev/null
+++ b/templates/i18n/glossary/applicant.de-de-formal.hamlet
@@ -0,0 +1,8 @@
+$newline never
+<dt .sec>
+  Bewerbung
+<dt .sec>
+  Zu einem Kurs bewerben
+<dd>
+  Studierende können eine Bewerbung für einen Kurs hinterlegen.<br />
+  Wird die Bewerbung akzeptiert (oder der Studierende dem Kurs zugeteilt) wird der Studierende zusätzlich Kursteilnehmer.
diff --git a/templates/i18n/glossary/course-participant.de-de-formal.hamlet b/templates/i18n/glossary/course-participant.de-de-formal.hamlet
new file mode 100644
index 000000000..5c543e376
--- /dev/null
+++ b/templates/i18n/glossary/course-participant.de-de-formal.hamlet
@@ -0,0 +1,8 @@
+$newline never
+<dt .sec>
+  Zu einem Kurs anmelden
+<dt .sec>
+  Von einem Kurs abmelden
+<dd>
+  Studierende, die sich explizit mit einem Kurs assoziiert haben (oder ihm zugeteilt wurden).<br />
+  Haben Zugriff auf Material und Teile des Kurses (Anmeldungen zu Tutorien, Prüfungen, ...)

From 7c8dbc9dcc0c79bb50f464eb565d1cebba83b4b5 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 22 Oct 2019 20:35:25 +0200
Subject: [PATCH 016/126] feat(i18n): more en-eu

---
 messages/uniworx/en-eu.msg | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index 5f7c3686a..a04d6b359 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -59,14 +59,14 @@ WinterTermShort year: Winter #{year}/#{mod (succ year) 100}
 PSLimitNonPositive: “pagesize” must be greater than zero
 Page num: #{num}
 
-TermsHeading: Terms
-TermCurrent: Current term
-TermEditHeading: Edit term
-TermEditTid tid: Edit term #{tid}
-TermEdited tid: Successfully edited term #{tid}
-TermNewTitle: Edit/create term
+TermsHeading: Semesters
+TermCurrent: Current semester
+TermEditHeading: Edit semester
+TermEditTid tid: Edit semester #{tid}
+TermEdited tid: Successfully edited semester #{tid}
+TermNewTitle: Edit/create semester
 InvalidInput: Invalid input
-Term: Term
+Term: Semester
 TermPlaceholder: (W|S)<four digit year>
 
 TermStartDay: Starting day
@@ -129,7 +129,7 @@ CourseDescription: Description
 CourseDescriptionTip: You may use arbitrary Html-Markup
 CourseHomepageExternal: External homepage
 CourseShorthand: Shorthand
-CourseShorthandUnique: Needs to be unique within school and term. Will be used verbatim within the url of the course page.
+CourseShorthandUnique: Needs to be unique within school and semester. Will be used verbatim within the url of the course page.
 CourseSemester: Semester
 CourseSchool: Department
 CourseSchoolShort: Department
@@ -137,6 +137,9 @@ CourseSecretTip: Enrollment for this course will require the password, if set
 CourseSecretFormat: Arbitrary string
 CourseRegisterFromTip: When left empty students will not be able to enroll themselves
 CourseRegisterToTip: May be left empty to allow enrollment indefinitely
+CourseDeregisterUntilTip: Participants may deregister from immediately after registration starts up to this time. May be left empty to allow deregistration indefinitely.
+CourseFilterSearch: Text search
+CourseFilterRegistered: Registered
 
 
 MenuLanguage: Language

From a4fc5551f1936a1e8fb5e7c28a2911fbc1ae8803 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 23 Oct 2019 19:57:16 +0200
Subject: [PATCH 017/126] feat(info-lecturer): add english translation; minor
 fixes in german

---
 .../i18n/info-lecturer/de-de-formal.hamlet    |  44 +-
 templates/i18n/info-lecturer/en-eu.hamlet     | 380 ++++++++++++++++++
 templates/i18n/info-lecturer/en.hamlet        | 380 ++++++++++++++++++
 3 files changed, 781 insertions(+), 23 deletions(-)
 create mode 100644 templates/i18n/info-lecturer/en-eu.hamlet
 create mode 100644 templates/i18n/info-lecturer/en.hamlet

diff --git a/templates/i18n/info-lecturer/de-de-formal.hamlet b/templates/i18n/info-lecturer/de-de-formal.hamlet
index ff5862480..815f88e3a 100644
--- a/templates/i18n/info-lecturer/de-de-formal.hamlet
+++ b/templates/i18n/info-lecturer/de-de-formal.hamlet
@@ -4,14 +4,14 @@ $newline text
   <h2>Veranstaltungen
 
   <dl .deflist>
-    <dt .deflist__dt> Kurs-Bezeichner
+    <dt .deflist__dt> Veranstaltungs-Bezeichner
     <dd .deflist__dd>
       <p>
         ^{newU2WFeat} Alle Veranstaltungen müssen ein Kürzel zur Identifikation besitzen,
         z.B. EiP, ProMo, SysPrak, etc.
       <p>
         Die Kombination aus Kürzel, Institut und Semester muss eindeutig sein.<br />
-        Ein Kurs, dessen ausgewähltes Kürzel nicht eindeutig ist wird beim Versuch des Erstellens mit einer entsprechenden Fehlermeldung abgelehnt.
+        Ein Kurs, dessen ausgewähltes Kürzel innerhalb des gewähltes Instituts und Semesters nicht eindeutig ist wird beim Versuch des Erstellens mit einer entsprechenden Fehlermeldung abgelehnt.
       <p>
         Empfehlungen für die Wahl eines Kurskürzels:
         <ul>
@@ -59,7 +59,7 @@ $newline text
     <dt .deflist__dt> Kurs-Passwort
     <dd .deflist__dd> ^{newU2WFeat} Die Anmeldung zum Kurs kann durch ein Passwort geschützt werden.
 
-    <dt .deflist__dt> Kurs-Assistenten
+    <dt .deflist__dt> Kurs-Veranstalter und Kurs-Assistenten
     <dd .deflist__dd>
       <p>
         Kurs-Veranstalter dürfen <em>beliebige</em> Personen
@@ -94,10 +94,9 @@ $newline text
         ^{probFeatInline} Im Normalfall entsprechen die
         Studiengangsinformationen dem aktuellen Stand, es kann jedoch in
         Einzelfällen passieren, dass veraltete Daten angezeigt werden.<br />
-        Es sollten also, ohne Rücksprache mit dem jeweiligen Studierenden, keine
-        schwerwiegenden Entscheidungen ausschließlich anhand der angezeigten
-        Studiengangsinformationen getroffen werden (z.B. Veto in einer
-        Zentralanmeldung).
+        Ohne Rücksprache mit dem Studierenden sollten also keine schwerwiegenden 
+        Entscheidungen getroffen werden, wenn diese ausschließlich auf dessen 
+        Studiengangsinformationen beruhen (z.B. Veto in einer Zentralanmeldung).
 
       <p>
         Falls anstatt eines Studienganges oder eines Studienabschlusses nur eine
@@ -122,8 +121,8 @@ $newline text
     <dt .deflist__dt> Aktuelles
     <dd .deflist__dd>
       <p>
-        ^{newFeat 2019 10 7} Es lassen sich, direkt auf der Kursübersichtsseite, Neuigkeiten in Bezug
-        auf die Veranstaltung auf der Übersichtsseite publizieren ("Aktuelles").
+        ^{newFeat 2019 10 7} Es lassen sich direkt auf der Kursübersichtsseite Neuigkeiten in Bezug
+        auf die Veranstaltung publizieren ("Aktuelles").
       <p>
         In Zukunft sind ein RSS-Feed und (opt-in) E-Mail-Benachrichtigungen
         hierfür geplant.
@@ -145,7 +144,7 @@ $newline text
     <dt .deflist__dt> Korrektoren
     <dd .deflist__dd>
       ^{newU2WFeat} Korrektoren und Korrekturweise werden ad hoc pro Übungsblatt vom Veranstalter festgelegt;
-      es gibt keine Eintragung von Korrektoren in der Veranstaltungskonfiguration mehr.
+      es gibt keine Eintragung von Korrektoren in der Veranstaltungskonfiguration mehr.<br />
       Um reinen Tutoren vorab Zugriff auf Lösungen zu gewähren, sollten diese
       als Korrektoren mit Korrekturanteil 0 eingetragen werden.
 
@@ -195,7 +194,7 @@ $newline text
         und entsprechende Benachrichtigungen sind geplant,
         aber noch nicht verfügbar.
 
-    <dt .deflist__dt> Papierabgaben
+    <dt .deflist__dt> Externe Abgaben
     <dd .deflist__dd>
       Externe Abgaben Form (z.B. Papierabgaben)
       können mit Pseudonymen verwaltet werden:
@@ -240,7 +239,7 @@ $newline text
       <br />
       Zusätzlich können beliebig viele <i>Ausnahmen</i> angelegt werden.
       <br />
-      Hierbei überschreibt eine Ausnahme, dass ein Termin nicht stattfindet, die reguläre Terminplanung (man gibt hierbei einen beliebigen Zeitpunkt innerhalb des regulären Termins an).
+      Hierbei überschreibt eine Ausnahme, dass ein Termin nicht stattfindet, die reguläre Terminplanung. Man gibt dafür einen beliebigen Zeitpunkt innerhalb des regulären Termins an. Daraufhin werden <em>alle</em> regulären Termine als ausfallend markiert, welche den angegebenen Zeitpunkt enthalten.
       <br />
       Eine Ausnahme, dass ein Termin außerplanmäßig stattfindet, überschreibt wiederrum Ausnahmen, die Termine ausfallen lassen.
       <br />
@@ -267,19 +266,18 @@ $newline text
       <p>
         Studenten können sich auf der Kursseite selbst zu Tutorien anmelden.
         <br />
-        Die Anmeldung erfolgt momentan noch auf <i>first come, first served</i>-Basis
+        Die Anmeldung erfolgt momentan noch auf <i>first come, first served</i>-Basis.
         <br />
-        Eine vorherige Anmeldung zum Kurs ist Voraussetzung
+        Eine vorherige Anmeldung zum Kurs ist Voraussetzung.
       <p>
         Die Anmeldung kann pro Tutoriumsgruppe zeitlich beschränkt werden.
       <p>
-        Tutoriumsgruppen können mit einer <i>Registrierungs-Gruppe</i> versehen werden.
+        Tutoriumsgruppen können mit einer <i>Registrierungs-Gruppe</i> versehen werden. 
+        Es handelt sich hierbei um einen beliebig wählbaren Text, der ansonsten keine Bedeutung hat.
         <br />
-        Es handelt sich hierbei um einen beliebig wählbaren Text der ansonsten keine Bedeutung hat.
-        <br />
-        Studenten wird die Anmeldung nur in einem Tutorium pro Registrierungs-Gruppe erlaubt.
+        Studenten wird die Anmeldung nur in <i>einem Tutorium pro Registrierungs-Gruppe</i> erlaubt.
 
-        Leere Registrierungs-Gruppen zählen hierbei als <i>verschieden</i>.
+        Leere Registrierungs-Gruppen (d.h. es wurde keine Registrierungs-Gruppe angegeben) zählen hierbei als verschieden.
       <p>
         Um die Anmeldung in beliebig viele Tutoriumsgruppen zuzulassen können alle Registrierungs-Gruppen leer gelassen werden.
     
@@ -289,8 +287,8 @@ $newline text
 
 
 <section id="exams">
-  <h2> Klausuren und Prüfungen
-  <p>  Das Verwalten von Klausuren und Prüfungen im Allgemeinen sind bereits großteils implementiert und einsetzbar. ^{newU2WFeat} In Erweiterung zu UniWorX werden nun auch allgemeinere Prüfungsformen unterstüzt, z.B. mündliche Prüfungen oder auch Praktika, bei denen die Teilnehmer in kleineren Gruppen zu verschiedenen Zeitpunkten und in verschiedenen Räumen geprüft werden.
+  <h2> Prüfungen
+  <p>  Das Verwalten von Prüfungen im Allgemeinen sind bereits großteils implementiert und einsetzbar. ^{newU2WFeat} In Erweiterung zu UniWorX werden nun neben Klausuren auch allgemeinere Prüfungsformen unterstüzt, z.B. mündliche Prüfungen oder auch Projektabnahmen, bei denen die Teilnehmer in kleineren Gruppen zu verschiedenen Zeitpunkten und in verschiedenen Räumen geprüft werden.
 
   <dl .deflist>
     <dt .deflist__dt> Anlegen/Editieren
@@ -301,7 +299,7 @@ $newline text
 
     <dt .deflist__dt> Termine/Räume
     <dd .deflist__dd>
-          ^{newU2WFeat} Eine Prüfung kann in mehrere Termine/Räume unterteilt sein, welche jeweils einen eigenen Ort und Zeitraum besitzen.
+          ^{newU2WFeat} Eine Prüfung kann in mehrere Termine/Räume unterteilt sein, welche jeweils einen eigenen Ort und Zeitraum besitzen. 
         <p>
           Im einfachsten Fall lassen sich damit Klausuren abbilden, welche gleichzeitig in verschiedenen Räumen stattfinden.
         <p>
@@ -408,7 +406,7 @@ $newline text
 
     <dt .deflist__dt> Wartung
     <dd .deflist__dd>
-      Planmäßige Wartungen werden ohne Ankündigung
+      Planmäßige Wartungen werden <i>ohne Ankündigung</i>
       immer um 2:00h nachts durchgeführt.
       Es wird daher empfohlen, keine kritischen Abgabefristen
       um oder kurz nach dieser Zeit einzustellen.
diff --git a/templates/i18n/info-lecturer/en-eu.hamlet b/templates/i18n/info-lecturer/en-eu.hamlet
new file mode 100644
index 000000000..01b1479f0
--- /dev/null
+++ b/templates/i18n/info-lecturer/en-eu.hamlet
@@ -0,0 +1,380 @@
+$newline text
+<section>
+<section>
+  <h2>Courses
+
+  <dl .deflist>
+    <dt .deflist__dt> Course Names
+    <dd .deflist__dd>
+      <p>
+        ^{newU2WFeat} Any course needs an abbreviation for identification, e.g. DBS, PXD, DM, ...
+      <p>
+        The combination of abbreviation, school and semester needs to be unique.<br />
+        Creating a course with an abbreviation that is not unique for the selected school and semester will be rejected (a corresponding error message will be shown).
+      <p>
+        Recommendations for course abbreviations:
+        <ul>
+          <li> Try to keep the abbreviation as short as possible (10 characters max.). 
+               In particular, we advice against choosing the full course title as its abbreviation.
+               A warning will be shown if an abbreviation exceeds the recommended length.
+          <li> Avoid adding identifiers for the school (e.g. "MATH"), the semester (e.g. "WS19") or the type (e.g. "SEM") of a course in its abbreviation.
+      <p>
+        ^{plannedFeatInline} It is planned to enable courses to have types (e.g. "Bachelor Seminar" or "Practical Course").<br />
+        Students will then be able to explicitely search for courses of a specific type.
+
+    <dt .deflist__dt> Clone Courses
+    <dd .deflist__dd>
+      <p>
+        Lecturers are able to clone <em>any</em> course of their school for the current semester.
+
+        When cloning a course, its abbreviation and description will be adopted;
+        but not exercise sheets, exams or registrations.
+      <p>
+        The course description can be composed in Html and
+        <em>should contain the module description!
+
+    <dt .deflist__dt> Unterstützung für verschiedene Institute
+    <dd .deflist__dd>
+      <p>
+        ^{newU2WFeat} Uni2work supports managing multiple schools; prefixing course titles with e.g. "[MATH]" are not necessary anymore.
+        Instead, there are now school filters for course lists.
+      <p>
+        The permissions of Uni2work administrators are limited to courses of their respective schools.
+        This means that a Uni2work administrator of the Institute of Informatics cannot access grades from courses of the Department of Maths.
+
+    <dt .deflist__dt> Access to Material
+    <dd .deflist__dd>
+      The access to exercise sheets, slides and other material can be made dependent on the registration for the course.
+
+    <dt .deflist__dt> Publish Material
+    <dd .deflist__dd>
+      Slides, code bundles etc. can now be distributed to the participants of a course; also password-protected if wanted.
+
+    <dt .deflist__dt> Course Passwords
+    <dd .deflist__dd> ^{newU2WFeat} The registration for a course can be password-protected.
+
+    <dt .deflist__dt> Course Lecturers and Assistants
+    <dd .deflist__dd>
+      <p>
+        Course administrators can assign <em>any</em> user as administrator of the course.
+
+        ^{newU2WFeat} Within a course, all course administrators have the same permissions. Most notably, every course administrator is allowed to edit the list of administrators for this course.
+
+      <p>
+        ^{newU2WFeat} Uni2work features "lecturer" and "assistant" as roles:
+        lecturers are essentially allowed to create new courses.
+        The lecturer permission is differentiated according to school.
+
+        Assistants have the same permissions as lecturers, but only for a particular course.
+
+      <p>
+        In UniWorX, there was the role "assistant", 
+        i.e. every "administrator" also had to be "lecturer"; 
+        there was no differentiation between schools.
+
+    <dt .deflist__dt> Course Participants
+    <dd .deflist__dd>
+      <p>
+        Course participants are now displayed alongside information regarding their study programmes.
+        Students of multiple programmes need to select a main subject when registering for a course.
+        This can speed up the process of reporting exam results.
+
+      <p>
+        ^{probFeatInline} Normally, information regarding students' study programmes is up to date;
+        however, outdated data is shown in some cases.<br />
+        Therefore, no decisions with severe consequences should be made without consulting the student 
+        first, if they are solely based on study programme information (e.g. veto in a central allocation
+        of practical courses and seminars).
+
+      <p>
+        If only a number (key) is shown instead of a study programme or degree, Uni2work did not yet learn a 
+        mapping from this key to its corresponding programme.<br />
+        Unfortunately, this needs to happen successively because we cannot get an up-to-date and complete 
+        mapping of those keys from the Studentenkanzlei (Student Office).<br />
+        ^{probFeatInline} It might happen that a more "general" study programme is shown than the actual 
+        one a student is enrolled in (e.g. Media Informatics instead of Human-Computer-Interaction). 
+        This problem should be fixed in the near future.
+
+    <dt .deflist__dt> From a Student's Point of View
+    <dd .deflist__dd>
+      <p>
+        ^{newU2WFeat} UniWorX had special links to view a page from a student's point of view ("Aus Studentensicht"), which are not necessary anymore in Uni2work. 
+        Instead, one can now #
+          <a href=@{AuthPredsR}>temporarily withdraw one's own permissions here
+        . To view one's own course from a participant's point of view, one deactivates #
+        the permission check "_{MsgAuthTagLecturer}" and/or "_{MsgAuthTagCorrector}".
+
+    <dt .deflist__dt> News
+    <dd .deflist__dd>
+      <p>
+        ^{newFeat 2019 10 7} On the course overview page, one can directly publish news concerning 
+        the course ("News").
+      <p>
+        An RSS feed and (opt-in) email notifications for course news are planned in the future.
+  
+    <dt .deflist__dt> Dates
+    <dd .deflist__dd>
+      <p>
+        ^{newFeat 2019 10 9} On the course overview page, one can publish dates concerning the course 
+        (e.g. weekly date of the lecture, one-time post-exam review, ...).
+      <p>
+        Email notifications on changes of the dates are planned in the future.
+
+<section>
+  <h2>Course Exercises
+
+  <dl .deflist>
+    <dt .deflist__dt> Correctors
+    <dd .deflist__dd>
+      ^{newU2WFeat} Correctors and correction method are selected by the course administrator ad-hoc per exercise sheet; 
+      there is no entry for correctors in the course configuration.<br />
+      To grant tutors that are no correctors permission to view solutions before the submission deadline, 
+      they should be registered as sheet correctors with 0 correction proportions. 
+
+      When creating a new sheet, the settings of the previous sheet are suggested automatically.
+
+    <dt .deflist__dt> Distribution
+    <dd .deflist__dd>
+      ^{newU2WFeat} Correctors can be marked as Absent or Excused per exercise sheet. This way, they will not be 
+      automatically assigned as correctors of any submissions. 
+
+      The difference between Absent and Excused correctors is that Absent correctors will be assigned more 
+      submissions in the upcoming sheets automatically, to make up for the proportion of the sheet they missed. 
+      For Excused correctors, no additional submissions will be assigned later on.
+
+    <dt .deflist__dt> Files
+    <dd .deflist__dd>
+      ^{newU2WFeat} The exercise sheet and its solution can consist of several files of any type. 
+      Instead of having to upload a ZIP file in case of multiple files, they can be uploaded one-by-one in Uni2work.
+
+    <dt .deflist__dt> Hints
+    <dd .deflist__dd>
+      In addition to exercise sheet and solution, hints (e.g. solutions to tutorial exercises) can be released 
+      on a specific date before the submission deadline.
+
+    <dt .deflist__dt> Visibility
+    <dd .deflist__dd>
+      <p>
+        Exercise sheets can be hidden from the participants up to a date "Visible from". 
+        This can be used to distribute preliminary sheets to tutors and correctors, 
+        i.e. when grading and deadlines are not yet fixed.
+      <p>
+        The participants only get to see the sheet only once it is visible. 
+        However, any files regarding the sheet can only be downloaded once the submission period has started, 
+        similar to UniWorX.
+
+    <dt .deflist__dt> Timestamps
+    <dd .deflist__dd>
+      <p>
+        Every file of an exercise sheet is annotated with a timestamp which is visible for the participants. 
+      <p>
+        A visual highlighting of edited/new files and corresponding notifications is planned, 
+        but not yet implemented.
+
+    <dt .deflist__dt> External Submissions
+    <dd .deflist__dd>
+      External submissions (e.g. of analogue form) 
+      can be managed using a pseudonym: 
+      <ul>
+        <li>
+          Create sheets with submission method
+          <i>External Submission with Pseudonym</i>
+        <li>
+          On the overview page of a single sheet, 
+          participants can generate a pseudonym for their solution.
+          Then they can mark their external submission with it.
+          <p>
+            The participants need to generate a new pseudonym for each exercise sheet to guarantee 
+            the anonymity of their submissions. 
+            However, no submission will be created in the system when generating a pseudonym, 
+            since not every participant that generates a pseudonym actually submits a solution afterwards. 
+        <li>
+          <p>
+            After the external submissions are distributed to the correctors, 
+            the correctors need to 
+            <a href="@{CorrectionsCreateR}">
+              Create a Submission
+            , which can then be corrected as usual.
+          <p>
+            Such submissions will be accounted for in the next distribution of 
+            submissions according to the corrector's correction proportions.
+
+<section>
+  <h2>Tutorials
+
+  <dl .deflist>
+    <dt .deflist__dt> Occurrences
+    <dd .deflist__dd>
+      Tutorials can consist of multiple regular occurrences which repeat on a weekly basis.
+      <br />
+      Additionally, an arbitrary number of <i>Exceptions</i> can be created.
+      <br />
+      An exception to an occurrence overrides the regular schedule. To add an exception, one enters an arbitrary date that lies inside the regular occurrence. <em>All</em> regular occurrences that contain the selected date will then be marked as exception.
+      <br />
+      An exception that an occurrence takes place in turn overrides exceptions that an occurrence does not take place.
+      <br />
+      This behaviour can be used to shift single occurrences by selecting a regular occurrence as an exception ("does not take place") and another date as a second exception ("does take place").
+
+    <dt .deflist__dt> Tutors
+    <dd .deflist__dd>
+      <p>
+        Tutors are selected ad-hoc per tutorial.
+        <br />
+        A tutorial can be assigned to an arbitrary number of tutors, and a tutor can be assigned to an arbitrary number of tutorials.
+
+      <p>
+        Tutors have access to the names and study programme information of all participants of their tutorials, can send messages to them (similar to course messages) and are able to remove participants from their tutorials.
+
+      <p>
+        ^{newFeat 2019 10 14} Optionally, tutors can be given full control over their tutorials (except deleting 
+        them), which means that they can edit rooms and dates of the tutorial.
+
+    <dt .deflist__dt> Registration
+    <dd .deflist__dd>
+      <p>
+        Students can register themselves for tutorials via the course page.
+        <br />
+        The registration proceeds on a <i>first come, first served</i> basis at the moment.
+        <br />
+        A prior registration for the course is required.
+      <p>
+        The registration period for a tutorial can be limited in time.
+      <p>
+        Tutorials can be provided with a <i>Registration Group</i>. 
+        A registration group consists of an arbitrary text that is of no further significance. 
+        However, participants are restricted on <i>one tutorial registration per registration group</i>.<br />
+
+        Empty registration groups (i.e. no registration groups have been assigned) count as distinct.
+      <p>
+        To allow registering for an arbitrary number of tutorials, one can leave every registration group empty.
+    
+    <dt .deflist__dt> ^{newFeat 2019 10 10} Late Registrations
+    <dt .deflist__dd>
+      Course administrators can assign course participants to tutorials using the list of course participants.
+
+
+<section id="exams">
+  <h2> Exams
+  <p>  Large parts of the management of exams have been implemented and are already usable.<br />
+  ^{newU2WFeat} In addition to UniWorX, Uni2work supports more general forms of exams (e.g. oral exams, practical exams), for which participants can be grouped and examined in different rooms and on different occurrences per group.
+
+  <dl .deflist>
+    <dt .deflist__dt> Create / Edit
+    <dd .deflist__dd>
+          Exams can be created by course administrators. 
+          A number of optional settings can be made immediately or later on, e.g. visibility or registration period.
+
+    <dt .deflist__dt> Occurrences/Rooms
+    <dd .deflist__dd>
+          ^{newU2WFeat} An exam can be divided into multiple Occurrences/Rooms; each Occurrence/Room can have an own Occurence and Room.
+        <p>
+          In its most simple form, there can be exams that can take place in multiple rooms.
+        <p>
+          There can also be exams that take place on different occurrences, e.g. oral exams for seminars or practical courses.<br />
+          These occurrences will be visible for the participants in forms of a table.
+
+    <dt .deflist__dt> Registrations
+    <dd .deflist__dd>
+          Participants can register for visible exams during the given registration period. 
+          The list(s) of participants can be edited online or via CSV export/import.
+
+    <dt .deflist__dt> ^{plannedFeat} Exam Allocations
+    <dd .deflist__dd>
+          Upon request, Uni2work can manage the distribution of participants to exams (rooms/occurrences) 
+          using some criteria, such as name or matriculation number.
+
+    <dt .deflist__dt> ^{plannedFeat} Markings
+    <dd .deflist__dd>
+          <p>
+             It is not possible to enter single exam markings (i.e. points per exam part) at the moment.<br />
+             This feature will be implemented in the near future.
+          <p>
+             Entering exam corrections will happen per exam part.
+          <p>
+             Optionally, course administrators will be able to assign exam correctors, who will then have permission to enter markings during the correction period.<br />
+             The permission to enter an exam marking for single exam parts can be granted to single exam correctors.
+          
+    <dt .deflist__dt> ^{newFeat 2019 9 25} Results
+    <dt .deflist__dd>
+          <p>
+            The calculation of exam results can be done automatically via Uni2work.<br />
+            For this, a grading scale needs to be specified. This scale will then be used to calculate 
+            the final results of all exam participants based on their achieved amount of points. 
+          <p>
+            ^{newU2WFeat} At first, the calculated results will be shown as suggestions only. 
+            These suggestions then require manual approval by the course administrator before being accepted 
+            as exam results, which can afterwards be sent to the Prüfungsämter (Examination Offices).
+
+          <p>
+            ^{newU2WFeat} The calculated suggestions can also be overriden manually, independent of the grading scale.
+
+    <dt .deflist__dt> ^{newFeat 2019 9 26} Exam Bonus
+    <dd .deflist__dd>
+          It is possible to calculate bonus points for an exam based on the number of exercise points achieved.<br />
+          The conditions for this calculation can be adjusted (e.g. only take bonus into account if the participant 
+          already passed without the bonus points).<br />
+          An upper bound of possible bonus points needs to be specified. The achieved bonus will then be calculated 
+          linearly by taking into account the proportion of achieved exercise points and the maximum number of 
+          bonus points.
+
+    <dt .deflist__dt> ^{plannedFeat} Door Signs
+    <dd .deflist__dd>
+          The printing of door signs ("Quiet please!") with matching exam information is a planned feature that is not yet implemented.
+
+    <dt .deflist__dt> ^{newFeat 2019 9 16} Reporting Exam Results
+    <dd .deflist__dd>
+        <p>
+          Final grades can be automatically sent to the Prüfungsämter (Exam Offices).
+        <p>
+          After finalizing an exam (by clicking a button on the list of exam participants), all associated 
+          Prüfungsämter will be notified that the grading process is finished for this exam.
+        <p>
+          ^{newU2WFeat} Once a Prüfungsamt has acknowledged the exam result of a participant, a check mark of the 
+          page "Exam Results" will be shown.<br />
+          In case of this check mark being absent even after a long period of time, a course administrator should 
+          look into reporting the exam result for this participant (e.g. by issueing a proof of participation).
+
+        <p>
+          ^{newU2WFeat} Course administrators are allowed to edit final results even after reporting the grades 
+          to the Prüfungsämter. The offices that are affected by these changes will be automatically notified.
+
+
+<section id="allocations">
+  <h2> Central Allocations
+
+  <dl .deflist>
+    <dt .deflist__dt> Naming Schema
+    <dd .deflist__dd>
+      Courses can possess an arbitrary title.<br />
+      ^{newU2WFeat} Makeshift abbreviations such as [SB], [ZP] etc. are not necessary anymore!
+
+    <dt .deflist__dt> Course Settings
+    <dd .deflist__dd>
+      <p>
+        ^{newU2WFeat} Where appropriate, the course settings are being overriden by necessary settings of the 
+        corresponding central allocation (meaning that course administrators cannot make any mistakes anymore).
+      <p>
+        In particular, the selected registration period will be ignored and any direct registration of students 
+        will be prohibited (also coming from course administrators!), until the central allocation process is 
+        finished and alternate students ("Nachrücker") are treated.
+
+    <dt .deflist__dt> Individual Applications
+    <dd .deflist__dd>
+      ^{newU2WFeat} Students are able to apply for each course separately. 
+      Application documents may consist of both free text and the submission of files (possibly with predefined 
+      filenames).
+      
+    <dt .deflist__dt> Feedback on Applications
+    <dd .deflist__dd>
+      If so desired, course administrators can send back feedback on student's applications.
+
+
+<section>
+  <h2>Miscellaneous
+  <dl .deflist>
+
+    <dt .deflist__dt> Planned Maintenance
+    <dd .deflist__dd>
+      Planned maintenance will be conducted <i>without prior notice</i> 
+      on 02:00 every night.<br />
+      Please refrain from scheduling any critical deadlines at exactly this time or shortly afterwards.
diff --git a/templates/i18n/info-lecturer/en.hamlet b/templates/i18n/info-lecturer/en.hamlet
new file mode 100644
index 000000000..f49d6a6d0
--- /dev/null
+++ b/templates/i18n/info-lecturer/en.hamlet
@@ -0,0 +1,380 @@
+$newline text
+<section>
+<section>
+  <h2>Courses
+
+  <dl .deflist>
+    <dt .deflist__dt> Course Names
+    <dd .deflist__dd>
+      <p>
+        ^{newU2WFeat} Any course needs an abbreviation for identification, e.g. DBS, PXD, DM, ...
+      <p>
+        The combination of abbreviation, school and semester needs to be unique.<br />
+        Creating a course with an abbreviation that is not unique for the selected school and semester will be rejected (a corresponding error message will be shown).
+      <p>
+        Recommendations for course abbreviations:
+        <ul>
+          <li> Try to keep the abbreviation as short as possible (10 characters max.). 
+               In particular, we advice against choosing the full course title as its abbreviation.
+               A warning will be shown if an abbreviation exceeds the recommended length.
+          <li> Avoid adding identifiers for the school (e.g. "MATH"), the semester (e.g. "WS19") or the type (e.g. "SEM") of a course in its abbreviation.
+      <p>
+        ^{plannedFeatInline} It is planned to enable courses to have types (e.g. "Bachelor Seminar" or "Practical Course").<br />
+        Students will then be able to explicitely search for courses of a specific type.
+
+    <dt .deflist__dt> Clone Courses
+    <dd .deflist__dd>
+      <p>
+        Lecturers are able to clone <em>any</em> course of their school for the current semester.
+
+        When cloning a course, its abbreviation and description will be adopted;
+        but not exercise sheets, exams or registrations.
+      <p>
+        The course description can be composed in Html and
+        <em>should contain the module description!
+
+    <dt .deflist__dt> Unterstützung für verschiedene Institute
+    <dd .deflist__dd>
+      <p>
+        ^{newU2WFeat} Uni2work supports managing multiple schools; prefixing course titles with e.g. "[MATH]" are not necessary anymore.
+        Instead, there are now school filters for course lists.
+      <p>
+        The permissions of Uni2work administrators are limited to courses of their respective schools.
+        This means that a Uni2work administrator of the Institute of Informatics cannot access grades from courses of the Department of Maths.
+
+    <dt .deflist__dt> Access to Material
+    <dd .deflist__dd>
+      The access to exercise sheets, slides and other material can be made dependent on the registration for the course.
+
+    <dt .deflist__dt> Publish Material
+    <dd .deflist__dd>
+      Slides, code bundles etc. can now be distributed to the participants of a course; also password-protected if wanted.
+
+    <dt .deflist__dt> Course Passwords
+    <dd .deflist__dd> ^{newU2WFeat} The registration for a course can be password-protected.
+
+    <dt .deflist__dt> Course Lecturers and Assistants
+    <dd .deflist__dd>
+      <p>
+        Course administrators can assign <em>any</em> user as administrator of the course.
+
+        ^{newU2WFeat} Within a course, all course administrators have the same permissions. Most notably, every course administrator is allowed to edit the list of administrators for this course.
+
+      <p>
+        ^{newU2WFeat} Uni2work features "lecturer" and "assistant" as roles:
+        lecturers are essentially allowed to create new courses.
+        The lecturer permission is differentiated according to school.
+
+        Assistants have the same permissions as lecturers, but only for a particular course.
+
+      <p>
+        In UniWorX, there was the role "assistant", 
+        i.e. every "administrator" also had to be "lecturer"; 
+        there was no differentiation between schools.
+
+    <dt .deflist__dt> Course Participants
+    <dd .deflist__dd>
+      <p>
+        Course participants are now displayed alongside information regarding their study programs.
+        Students of multiple programs need to select a main subject when registering for a course.
+        This can speed up the process of reporting exam results.
+
+      <p>
+        ^{probFeatInline} Normally, information regarding students' study programs is up to date;
+        however, outdated data is shown in some cases.<br />
+        Therefore, no decisions with severe consequences should be made without consulting the student 
+        first, if they are solely based on study program information (e.g. veto in a central allocation
+        of practical courses and seminars).
+
+      <p>
+        If only a number (key) is shown instead of a study program or degree, Uni2work did not yet learn a 
+        mapping from this key to its corresponding program.<br />
+        Unfortunately, this needs to happen successively because we cannot get an up-to-date and complete 
+        mapping of those keys from the Studentenkanzlei (Student Office).<br />
+        ^{probFeatInline} It might happen that a more "general" study program is shown than the actual 
+        one a student is enrolled in (e.g. Media Informatics instead of Human-Computer-Interaction). 
+        This problem should be fixed in the near future.
+
+    <dt .deflist__dt> From a Student's Point of View
+    <dd .deflist__dd>
+      <p>
+        ^{newU2WFeat} UniWorX had special links to view a page from a student's point of view ("Aus Studentensicht"), which are not necessary anymore in Uni2work. 
+        Instead, one can now #
+          <a href=@{AuthPredsR}>temporarily withdraw one's own permissions here
+        . To view one's own course from a participant's point of view, one deactivates #
+        the permission check "_{MsgAuthTagLecturer}" and/or "_{MsgAuthTagCorrector}".
+
+    <dt .deflist__dt> News
+    <dd .deflist__dd>
+      <p>
+        ^{newFeat 2019 10 7} On the course overview page, one can directly publish news concerning 
+        the course ("News").
+      <p>
+        An RSS feed and (opt-in) email notifications for course news are planned in the future.
+  
+    <dt .deflist__dt> Dates
+    <dd .deflist__dd>
+      <p>
+        ^{newFeat 2019 10 9} On the course overview page, one can publish dates concerning the course 
+        (e.g. weekly date of the lecture, one-time post-exam review, ...).
+      <p>
+        Email notifications on changes of the dates are planned in the future.
+
+<section>
+  <h2>Course Exercises
+
+  <dl .deflist>
+    <dt .deflist__dt> Correctors
+    <dd .deflist__dd>
+      ^{newU2WFeat} Correctors and correction method are selected by the course administrator ad-hoc per exercise sheet; 
+      there is no entry for correctors in the course configuration.<br />
+      To grant tutors that are no correctors permission to view solutions before the submission deadline, 
+      they should be registered as sheet correctors with 0 correction proportions. 
+
+      When creating a new sheet, the settings of the previous sheet are suggested automatically.
+
+    <dt .deflist__dt> Distribution
+    <dd .deflist__dd>
+      ^{newU2WFeat} Correctors can be marked as Absent or Excused per exercise sheet. This way, they will not be 
+      automatically assigned as correctors of any submissions. 
+
+      The difference between Absent and Excused correctors is that Absent correctors will be assigned more 
+      submissions in the upcoming sheets automatically, to make up for the proportion of the sheet they missed. 
+      For Excused correctors, no additional submissions will be assigned later on.
+
+    <dt .deflist__dt> Files
+    <dd .deflist__dd>
+      ^{newU2WFeat} The exercise sheet and its solution can consist of several files of any type. 
+      Instead of having to upload a ZIP file in case of multiple files, they can be uploaded one-by-one in Uni2work.
+
+    <dt .deflist__dt> Hints
+    <dd .deflist__dd>
+      In addition to exercise sheet and solution, hints (e.g. solutions to tutorial exercises) can be released 
+      on a specific date before the submission deadline.
+
+    <dt .deflist__dt> Visibility
+    <dd .deflist__dd>
+      <p>
+        Exercise sheets can be hidden from the participants up to a date "Visible from". 
+        This can be used to distribute preliminary sheets to tutors and correctors, 
+        i.e. when grading and deadlines are not yet fixed.
+      <p>
+        The participants only get to see the sheet only once it is visible. 
+        However, any files regarding the sheet can only be downloaded once the submission period has started, 
+        similar to UniWorX.
+
+    <dt .deflist__dt> Timestamps
+    <dd .deflist__dd>
+      <p>
+        Every file of an exercise sheet is annotated with a timestamp which is visible for the participants. 
+      <p>
+        A visual highlighting of edited/new files and corresponding notifications is planned, 
+        but not yet implemented.
+
+    <dt .deflist__dt> External Submissions
+    <dd .deflist__dd>
+      External submissions (e.g. of analogue form) 
+      can be managed using a pseudonym: 
+      <ul>
+        <li>
+          Create sheets with submission method
+          <i>External Submission with Pseudonym</i>
+        <li>
+          On the overview page of a single sheet, 
+          participants can generate a pseudonym for their solution.
+          Then they can mark their external submission with it.
+          <p>
+            The participants need to generate a new pseudonym for each exercise sheet to guarantee 
+            the anonymity of their submissions. 
+            However, no submission will be created in the system when generating a pseudonym, 
+            since not every participant that generates a pseudonym actually submits a solution afterwards. 
+        <li>
+          <p>
+            After the external submissions are distributed to the correctors, 
+            the correctors need to 
+            <a href="@{CorrectionsCreateR}">
+              Create a Submission
+            , which can then be corrected as usual.
+          <p>
+            Such submissions will be accounted for in the next distribution of 
+            submissions according to the corrector's correction proportions.
+
+<section>
+  <h2>Tutorials
+
+  <dl .deflist>
+    <dt .deflist__dt> Occurrences
+    <dd .deflist__dd>
+      Tutorials can consist of multiple regular occurrences which repeat on a weekly basis.
+      <br />
+      Additionally, an arbitrary number of <i>Exceptions</i> can be created.
+      <br />
+      An exception to an occurrence overrides the regular schedule. To add an exception, one enters an arbitrary date that lies inside the regular occurrence. <em>All</em> regular occurrences that contain the selected date will then be marked as exception.
+      <br />
+      An exception that an occurrence takes place in turn overrides exceptions that an occurrence does not take place.
+      <br />
+      This behavior can be used to shift single occurrences by selecting a regular occurrence as an exception ("does not take place") and another date as a second exception ("does take place").
+
+    <dt .deflist__dt> Tutors
+    <dd .deflist__dd>
+      <p>
+        Tutors are selected ad-hoc per tutorial.
+        <br />
+        A tutorial can be assigned to an arbitrary number of tutors, and a tutor can be assigned to an arbitrary number of tutorials.
+
+      <p>
+        Tutors have access to the names and study program information of all participants of their tutorials, can send messages to them (similar to course messages) and are able to remove participants from their tutorials.
+
+      <p>
+        ^{newFeat 2019 10 14} Optionally, tutors can be given full control over their tutorials (except deleting 
+        them), which means that they can edit rooms and dates of the tutorial.
+
+    <dt .deflist__dt> Registration
+    <dd .deflist__dd>
+      <p>
+        Students can register themselves for tutorials via the course page.
+        <br />
+        The registration proceeds on a <i>first come, first served</i> basis at the moment.
+        <br />
+        A prior registration for the course is required.
+      <p>
+        The registration period for a tutorial can be limited in time.
+      <p>
+        Tutorials can be provided with a <i>Registration Group</i>. 
+        A registration group consists of an arbitrary text that is of no further significance. 
+        However, participants are restricted on <i>one tutorial registration per registration group</i>.<br />
+
+        Empty registration groups (i.e. no registration groups have been assigned) count as distinct.
+      <p>
+        To allow registering for an arbitrary number of tutorials, one can leave every registration group empty.
+    
+    <dt .deflist__dt> ^{newFeat 2019 10 10} Late Registrations
+    <dt .deflist__dd>
+      Course administrators can assign course participants to tutorials using the list of course participants.
+
+
+<section id="exams">
+  <h2> Exams
+  <p>  Large parts of the management of exams have been implemented and are already usable.<br />
+  ^{newU2WFeat} In addition to UniWorX, Uni2work supports more general forms of exams (e.g. oral exams, practical exams), for which participants can be grouped and examined in different rooms and on different occurrences per group.
+
+  <dl .deflist>
+    <dt .deflist__dt> Create / Edit
+    <dd .deflist__dd>
+          Exams can be created by course administrators. 
+          A number of optional settings can be made immediately or later on, e.g. visibility or registration period.
+
+    <dt .deflist__dt> Occurrences/Rooms
+    <dd .deflist__dd>
+          ^{newU2WFeat} An exam can be divided into multiple Occurrences/Rooms; each Occurrence/Room can have an own Occurence and Room.
+        <p>
+          In its most simple form, there can be exams that can take place in multiple rooms.
+        <p>
+          There can also be exams that take place on different occurrences, e.g. oral exams for seminars or practical courses.<br />
+          These occurrences will be visible for the participants in forms of a table.
+
+    <dt .deflist__dt> Registrations
+    <dd .deflist__dd>
+          Participants can register for visible exams during the given registration period. 
+          The list(s) of participants can be edited online or via CSV export/import.
+
+    <dt .deflist__dt> ^{plannedFeat} Exam Allocations
+    <dd .deflist__dd>
+          Upon request, Uni2work can manage the distribution of participants to exams (rooms/occurrences) 
+          using some criteria, such as name or matriculation number.
+
+    <dt .deflist__dt> ^{plannedFeat} Markings
+    <dd .deflist__dd>
+          <p>
+             It is not possible to enter single exam markings (i.e. points per exam part) at the moment.<br />
+             This feature will be implemented in the near future.
+          <p>
+             Entering exam corrections will happen per exam part.
+          <p>
+             Optionally, course administrators will be able to assign exam correctors, who will then have permission to enter markings during the correction period.<br />
+             The permission to enter an exam marking for single exam parts can be granted to single exam correctors.
+          
+    <dt .deflist__dt> ^{newFeat 2019 9 25} Results
+    <dt .deflist__dd>
+          <p>
+            The calculation of exam results can be done automatically via Uni2work.<br />
+            For this, a grading scale needs to be specified. This scale will then be used to calculate 
+            the final results of all exam participants based on their achieved amount of points. 
+          <p>
+            ^{newU2WFeat} At first, the calculated results will be shown as suggestions only. 
+            These suggestions then require manual approval by the course administrator before being accepted 
+            as exam results, which can afterwards be sent to the Prüfungsämter (Examination Offices).
+
+          <p>
+            ^{newU2WFeat} The calculated suggestions can also be overriden manually, independent of the grading scale.
+
+    <dt .deflist__dt> ^{newFeat 2019 9 26} Exam Bonus
+    <dd .deflist__dd>
+          It is possible to calculate bonus points for an exam based on the number of exercise points achieved.<br />
+          The conditions for this calculation can be adjusted (e.g. only take bonus into account if the participant 
+          already passed without the bonus points).<br />
+          An upper bound of possible bonus points needs to be specified. The achieved bonus will then be calculated 
+          linearly by taking into account the proportion of achieved exercise points and the maximum number of 
+          bonus points.
+
+    <dt .deflist__dt> ^{plannedFeat} Door Signs
+    <dd .deflist__dd>
+          The printing of door signs ("Quiet please!") with matching exam information is a planned feature that is not yet implemented.
+
+    <dt .deflist__dt> ^{newFeat 2019 9 16} Reporting Exam Results
+    <dd .deflist__dd>
+        <p>
+          Final grades can be automatically sent to the Prüfungsämter (Exam Offices).
+        <p>
+          After finalizing an exam (by clicking a button on the list of exam participants), all associated 
+          Prüfungsämter will be notified that the grading process is finished for this exam.
+        <p>
+          ^{newU2WFeat} Once a Prüfungsamt has acknowledged the exam result of a participant, a check mark of the 
+          page "Exam Results" will be shown.<br />
+          In case of this check mark being absent even after a long period of time, a course administrator should 
+          look into reporting the exam result for this participant (e.g. by issueing a proof of participation).
+
+        <p>
+          ^{newU2WFeat} Course administrators are allowed to edit final results even after reporting the grades 
+          to the Prüfungsämter. The offices that are affected by these changes will be automatically notified.
+
+
+<section id="allocations">
+  <h2> Central Allocations
+
+  <dl .deflist>
+    <dt .deflist__dt> Naming Schema
+    <dd .deflist__dd>
+      Courses can possess an arbitrary title.<br />
+      ^{newU2WFeat} Makeshift abbreviations such as [SB], [ZP] etc. are not necessary anymore!
+
+    <dt .deflist__dt> Course Settings
+    <dd .deflist__dd>
+      <p>
+        ^{newU2WFeat} Where appropriate, the course settings are being overriden by necessary settings of the 
+        corresponding central allocation (meaning that course administrators cannot make any mistakes anymore).
+      <p>
+        In particular, the selected registration period will be ignored and any direct registration of students 
+        will be prohibited (also coming from course administrators!), until the central allocation process is 
+        finished and alternate students ("Nachrücker") are treated.
+
+    <dt .deflist__dt> Individual Applications
+    <dd .deflist__dd>
+      ^{newU2WFeat} Students are able to apply for each course separately. 
+      Application documents may consist of both free text and the submission of files (possibly with predefined 
+      filenames).
+      
+    <dt .deflist__dt> Feedback on Applications
+    <dd .deflist__dd>
+      If so desired, course administrators can send back feedback on student's applications.
+
+
+<section>
+  <h2>Miscellaneous
+  <dl .deflist>
+
+    <dt .deflist__dt> Planned Maintenance
+    <dd .deflist__dd>
+      Planned maintenance will be conducted <i>without prior notice</i> 
+      on 02:00 every night.<br />
+      Please refrain from scheduling any critical deadlines at exactly this time or shortly afterwards.

From 870f1df4d30182ef08d4c7b2f8bb15a6ea722925 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Fri, 25 Oct 2019 09:04:33 +0200
Subject: [PATCH 018/126] feat: more en-eu translations; minor fixes in
 de-de-formal

---
 messages/uniworx/de-de-formal.msg         |   6 +-
 messages/uniworx/en-eu.msg                | 161 +++++++++++++++++++++-
 templates/i18n/info-lecturer/en-eu.hamlet |  32 ++---
 templates/i18n/info-lecturer/en.hamlet    |  32 ++---
 4 files changed, 191 insertions(+), 40 deletions(-)

diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index a32e40c30..fb3841abe 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -150,7 +150,7 @@ CourseDeleteQuestion: Wollen Sie den unten aufgeführten Kurs wirklich löschen?
 CourseDeleted: Kurs gelöscht
 CourseUserTutorials: Angemeldete Tutorien
 CourseUserNote: Notiz
-CourseUserNoteTooltip: Nur für Dozenten dieses Kurses einsehbar
+CourseUserNoteTooltip: Nur für Verwalter dieses Kurses einsehbar
 CourseUserNoteSaved: Notizänderungen gespeichert
 CourseUserNoteDeleted: Teilnehmernotiz gelöscht
 CourseUserDeregister: Vom Kurs abmelden
@@ -187,7 +187,7 @@ CourseApplication: Bewerbung
 CourseApplicationIsParticipant: Kursteilnehmer
 
 CourseApplicationExists: Sie haben sich bereits für diesen Kurs beworben
-CourseApplicationInvalidAction: Angegeben Aktion kann nicht durchgeführt werden
+CourseApplicationInvalidAction: Angegebene Aktion kann nicht durchgeführt werden
 CourseApplicationCreated csh@CourseShorthand: Erfolgreich zu #{csh} beworben
 CourseApplicationEdited csh@CourseShorthand: Bewerbung zu #{csh} erfolgreich angepasst
 CourseApplicationNotEdited csh@CourseShorthand: Bewerbung zu #{csh} hat sich nicht verändert
@@ -2093,4 +2093,4 @@ GlossaryTitle: Begriffsverzeichnis
 MenuGlossary: Begriffsverzeichnis
 
 Applicant: Bewerber
-CourseParticipant: Kursteilnehmer
\ No newline at end of file
+CourseParticipant: Kursteilnehmer
diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index a04d6b359..31d865d0f 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -1,3 +1,5 @@
+
+
 Logo: Uni2work
 
 BtnSubmit: Submit
@@ -25,6 +27,7 @@ BtnCorrInvAccept: Accept
 BtnCorrInvDecline: Decline
 BtnSubmissionsAssign: Assign submissions automatically
 
+
 Aborted: Aborted
 Remarks: Remarks
 Registered: Registered
@@ -80,7 +83,8 @@ TermLectureEnd: Lectures end
 TermLectureEndTooltip: Summer semesters are usually 14 weeks; winter semesters 15
 TermActive: Active
 
-SchoolListHeading: Departments
+
+SchoolListHeading: Schools
 SchoolHeading school: #{school}
 
 LectureStart: Lectures start
@@ -88,7 +92,7 @@ LectureStart: Lectures start
 Course: Course
 CourseShort: Shorthand
 CourseCapacity: Capacity
-CourseCapacityTip: Maximum permissable number of enrollments for this course; leave empty for unlimited capacity
+CourseCapacityTip: Maximum permissable number of enrolments for this course; leave empty for unlimited capacity
 CourseNoCapacity: Course has reached maximum capacity
 TutorialNoCapacity: Tutorial has reached maximum capacity
 CourseNotEmpty: There are currently no participants enrolled for this course.
@@ -135,12 +139,159 @@ CourseSchool: Department
 CourseSchoolShort: Department
 CourseSecretTip: Enrollment for this course will require the password, if set
 CourseSecretFormat: Arbitrary string
-CourseRegisterFromTip: When left empty students will not be able to enroll themselves
-CourseRegisterToTip: May be left empty to allow enrollment indefinitely
+CourseRegisterFromTip: When left empty students will not be able to enrol themselves
+CourseRegisterToTip: May be left empty to allow enrolment indefinitely
 CourseDeregisterUntilTip: Participants may deregister from immediately after registration starts up to this time. May be left empty to allow deregistration indefinitely.
 CourseFilterSearch: Text search
 CourseFilterRegistered: Registered
+CourseFilterNone: Irrelevant
+BoolIrrelevant: Irrelevant
+CourseDeleteQuestion: Are you sure you want to delete the below-mentioned course?
+CourseDeleted: Course deleted
+CourseUserTutorials: Registered tutorials
+CourseUserNote: Note
+CourseUserNoteTooltip: Only visible to administrators of this course
+CourseUserNoteSaved: Note changes saved
+CourseUserNoteDeleted: User note deleted
+CourseUserDeregister: Deregister from course
+CourseUsersDeregistered count@Int64: #{show count} users deregistered from course
+CourseUserRegisterTutorial: Register for a tutorial
+CourseUsersTutorialRegistered count@Int64: #{show count} users registered for tutorial
+CourseUserSendMail: Send mail
+TutorialUserDeregister: Deregister from tutorial
+TutorialUserSendMail: Send mail
+TutorialUsersDeregistered count@Int64: #{show count} participants deregistered from tutorial
+CourseAllocationParticipate: Participate in central allocation
+CourseAllocationParticipateTip: If a course participates in a central allocation, you might lose some permissions that you would normally have (e.g. registering students for the course directly, deregistering students, ...)
+CourseAllocation: Central allocation
+CourseAllocationOption term@Text name@Text: #{name} (#{term})
+CourseAllocationMinCapacity: Minimum number of participants
+CourseAllocationMinCapacityTip: If there were fewer students being assigned to this course than this number, then these students would instead be assigned to other courses
+CourseAllocationMinCapacityMustBeNonNegative: Minimum number of participants must not be negative
+CourseApplicationInstructions: Instructions for application
+CourseApplicationInstructionsTip: Will be shown to students if they decide to apply for this course
+CourseApplicationTemplate: Application template
+CourseApplicationTemplateTip: Students can download this template if they decide to apply for this course
+CourseApplicationsText: Text application
+CourseApplicationsTextTip: Should students submit a plaintext application (in addition to submitted files if applicable)?
+CourseApplicationRatingsVisible: Feedback to applications
+CourseApplicationRatingsVisibleTip: Should students be allowed to view rating and commentaries on their application after the rating period?
+CourseApplicationRequired: Application procedure
+CourseApplicationRequiredTip: Should registrations for this course be provisional at first (without capacity constraint), until they are approved by a course administrator?
+CourseApplicationInstructionsApplication: Instructions for application
+CourseApplicationInstructionsRegistration: Instructions for registration
+CourseApplicationTemplateApplication: Application template(s)
+CourseApplicationTemplateRegistration: Registration template(s)
+CourseApplicationTemplateArchiveName tid@TermId ssh@SchoolId csh@CourseShorthand: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-application-templates
+CourseApplication: Application
+CourseApplicationIsParticipant: Course participant
+
+CourseApplicationExists: You already applied for this course
+CourseApplicationInvalidAction: Invalid action
+CourseApplicationCreated csh@CourseShorthand: Successfully applied for #{csh}
+CourseApplicationEdited csh@CourseShorthand: Successfully changed application for #{csh}
+CourseApplicationNotEdited csh@CourseShorthand: Application for #{csh} not changed
+CourseApplicationRated: Successfully edited rating
+CourseApplicationRatingDeleted: Successfully deleted rating
+CourseApplicationDeleted csh@CourseShorthand: Successfully withdrew application for #{csh}
+
+CourseApplicationTitle displayName@Text csh@CourseShorthand: Application for #{csh}: #{displayName}
+
+CourseApplicationText: Application text
+CourseApplicationFollowInstructions: Please follow the instructions for applications!
+CourseRegistrationText: Registration text
+CourseRegistrationFollowInstructions: Please follow the instructions for registrations!
+
+CourseApplicationFile: Application
+CourseApplicationFiles: Application file(s)
+CourseApplicationArchive: Zip archive for application files
+CourseRegistrationFile: Registration file
+CourseRegistrationFiles: Registration file(s)
+CourseRegistrationArchive: Zip archive for registration files
+CourseApplicationNoFiles: No file(s)
+CourseApplicationFilesNeedReupload: Application files need to be reuploaded every time the application is changed
+CourseRegistrationFilesNeedReupload: Registration files need to be reuploaded every time the registration is changed
+
+CourseApplicationDeleteToEdit: You need to withdraw your application and reapply to edit your application.
+CourseRegistrationDeleteToEdit: You need to deregister and reregister to edit your registration.
+
+CourseLoginToApply: You need to login to Uni2work before you can apply for this course.
+CourseLoginToRegister: Your need to login to Uni2work before you can register for this course.
+
+CourseApplicationArchiveName tid ssh csh appId displayName: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-#{foldCase (toPathPiece appId)}-#{foldCase displayName}
+CourseAllApplicationsArchiveName tid ssh csh: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-applications
+CourseApplicationsAllocatedDirectory: central
+CourseApplicationsNotAllocatedDirectory: direct
+
+CourseNoAllocationsAvailable: There are no ongoing central allocations
+AllocationStaffRegisterToExpired: You cannot change properties concerning the central allocation after the course registration period. Your changes have been discarded.
+
+CourseFormSectionRegistration: Registration
+CourseFormSectionAdministration: Administration
+
+CourseLecturers: Course administrators
+CourseLecturer: Lecturer
+CourseAssistant: Assistant
+CourseLecturerAlreadyAdded email: There already is a course administrator with email #{email}
+CourseRegistrationEndMustBeAfterStart: The end of the registration period must be before its start
+CourseDeregistrationEndMustBeAfterStart: The end of the deregistration period must be after the start of the registration period
+CourseUserMustBeLecturer: The current user needs to be a course administrator
+CourseAllocationRequiresCapacity: Course capacity needs to be specified if the course participates in a central allocation
+CourseAllocationTermMustMatch: Course semester needs to match the semester of the central allocation
+CourseAllocationCapacityMayNotBeChanged: The capacity of a course that participates in a central allocation must not be altered
+CourseShorthandTooLong: Long course shorthands may lead to display issues and might complicate communication with students. Please choose a more concise shorthand if possible.
+
+CourseLecturerRightsIdentical: All sorts of course administrators have the same permissions.
+
+School: Department
+
+NoSuchTerm tid: Semester #{tid} does not exist.
+NoSuchSchool ssh: Department #{ssh} does not exist.
+NoSuchCourseShorthand csh: There is no course with shorthand #{csh}.
+NoSuchCourse: No such course found.
+
+NoCourseDescription: This course does not provide a description.
+
+Sheet: Sheet
+SheetList       tid ssh csh          : #{tid}-#{ssh}-#{csh} Sheet Overview
+SheetNewHeading tid ssh csh          : #{tid}-#{ssh}-#{csh} New Exercise Sheet
+SheetNewOk      tid ssh csh sheetName: Successfully created sheet #{sheetName} in course #{tid}-#{ssh}-#{csh}.
+SheetTitle      tid ssh csh sheetName: #{tid}-#{ssh}-#{csh} #{sheetName}
+SheetTitleNew   tid ssh csh          : #{tid}-#{ssh}-#{csh}: New Exercise Sheet
+SheetEditHead   tid ssh csh sheetName: #{tid}-#{ssh}-#{csh} Edit #{sheetName}
+SheetEditOk     tid ssh csh sheetName: Successfully saved exercise sheet #{sheetName} in course #{tid}-#{ssh}-#{csh}
+SheetNameDup    tid ssh csh sheetName: There already is an exercise sheet #{sheetName} in course #{tid}-#{ssh}-#{csh}
+SheetDelHead    tid ssh csh sheetName: Do you really want to delete sheet #{sheetName} from course #{tid}-#{ssh}-#{csh}? Any associated submissions and corrections will be lost!
+SheetDelOk      tid ssh csh sheetName: #{tid}-#{ssh}-#{csh}: #{sheetName} has been deleted.
+SheetDelHasSubmissions objs: Incl. #{objs} #{pluralEN objs "submission" "submissions"}
+
+SheetDeleteQuestion: Do you really want to delete the below-mentioned exercise sheet and all associated submissions?
+SheetDeleted: Deleted exercise sheet
+
+SheetUploadMode: Submission of files
+SheetSubmissionMode: Submission mode
+SheetExercise: Assignment
+SheetHint: Hint
+SheetHintFrom: Hint from
+SheetHintFromPlaceholder: Date, correctors only otherwise
+SheetSolutionFromPlaceholder: Date, correctors only otherwise
+SheetSolution: Solution
+SheetSolutionFrom: Solution from
+SheetMarking: Marking hints for correctors
+SheetMarkingFiles: Correction
+SheetType: Marking
+SheetInvisible: This exercise sheet is currently invisible for participants!
+SheetName: Name
+SheetDescription: Description
+SheetGroup: Group submission
+SheetVisibleFrom: Visible from (for participants)
+SheetVisibleFromTip: Always invisible for participants and no submission possible if left empty; only leave this field empty for temporary/unfinished sheets
+SheetActiveFrom: Submission period start
+SheetActiveTo: Submission period end
+SheetHintFromTip: Always invisible for participants if left empty; correctors can always download hints
+SheetSolutionFromTip: Always invisible for participants if left empty; correctors can always download solutions
+SheetMarkingTip: 
 
 
 MenuLanguage: Language
-LanguageChanged: Language changed successfully
\ No newline at end of file
+LanguageChanged: Language changed successfully
diff --git a/templates/i18n/info-lecturer/en-eu.hamlet b/templates/i18n/info-lecturer/en-eu.hamlet
index 01b1479f0..dfaffdb6a 100644
--- a/templates/i18n/info-lecturer/en-eu.hamlet
+++ b/templates/i18n/info-lecturer/en-eu.hamlet
@@ -7,17 +7,17 @@ $newline text
     <dt .deflist__dt> Course Names
     <dd .deflist__dd>
       <p>
-        ^{newU2WFeat} Any course needs an abbreviation for identification, e.g. DBS, PXD, DM, ...
+        ^{newU2WFeat} Any course needs a shorthand for identification, e.g. DBS, PXD, DM, ...
       <p>
-        The combination of abbreviation, school and semester needs to be unique.<br />
-        Creating a course with an abbreviation that is not unique for the selected school and semester will be rejected (a corresponding error message will be shown).
+        The combination of shorthand, department and semester needs to be unique.<br />
+        Creating a course with a shorthand that is not unique for the selected department and semester will be rejected (a corresponding error message will be shown).
       <p>
-        Recommendations for course abbreviations:
+        Recommendations for course shorthands:
         <ul>
-          <li> Try to keep the abbreviation as short as possible (10 characters max.). 
-               In particular, we advice against choosing the full course title as its abbreviation.
-               A warning will be shown if an abbreviation exceeds the recommended length.
-          <li> Avoid adding identifiers for the school (e.g. "MATH"), the semester (e.g. "WS19") or the type (e.g. "SEM") of a course in its abbreviation.
+          <li> Try to keep the shorthand as short as possible (10 characters max.). 
+               In particular, we advice against choosing the full course title as its shorthand.
+               A warning will be shown if a shorthand exceeds the recommended length.
+          <li> Avoid adding identifiers for the department (e.g. "MATH"), the semester (e.g. "WS19") or the type (e.g. "SEM") of a course in its shorthand.
       <p>
         ^{plannedFeatInline} It is planned to enable courses to have types (e.g. "Bachelor Seminar" or "Practical Course").<br />
         Students will then be able to explicitely search for courses of a specific type.
@@ -25,9 +25,9 @@ $newline text
     <dt .deflist__dt> Clone Courses
     <dd .deflist__dd>
       <p>
-        Lecturers are able to clone <em>any</em> course of their school for the current semester.
+        Lecturers are able to clone <em>any</em> course of their department for the current semester.
 
-        When cloning a course, its abbreviation and description will be adopted;
+        When cloning a course, its shorthand and description will be adopted;
         but not exercise sheets, exams or registrations.
       <p>
         The course description can be composed in Html and
@@ -36,10 +36,10 @@ $newline text
     <dt .deflist__dt> Unterstützung für verschiedene Institute
     <dd .deflist__dd>
       <p>
-        ^{newU2WFeat} Uni2work supports managing multiple schools; prefixing course titles with e.g. "[MATH]" are not necessary anymore.
-        Instead, there are now school filters for course lists.
+        ^{newU2WFeat} Uni2work supports managing multiple departments; prefixing course titles with e.g. "[MATH]" are not necessary anymore.
+        Instead, there are now department filters for course lists.
       <p>
-        The permissions of Uni2work administrators are limited to courses of their respective schools.
+        The permissions of Uni2work administrators are limited to courses of their respective departments.
         This means that a Uni2work administrator of the Institute of Informatics cannot access grades from courses of the Department of Maths.
 
     <dt .deflist__dt> Access to Material
@@ -63,14 +63,14 @@ $newline text
       <p>
         ^{newU2WFeat} Uni2work features "lecturer" and "assistant" as roles:
         lecturers are essentially allowed to create new courses.
-        The lecturer permission is differentiated according to school.
+        The lecturer permission is differentiated according to department.
 
         Assistants have the same permissions as lecturers, but only for a particular course.
 
       <p>
         In UniWorX, there was the role "assistant", 
         i.e. every "administrator" also had to be "lecturer"; 
-        there was no differentiation between schools.
+        there was no differentiation between departments.
 
     <dt .deflist__dt> Course Participants
     <dd .deflist__dd>
@@ -346,7 +346,7 @@ $newline text
     <dt .deflist__dt> Naming Schema
     <dd .deflist__dd>
       Courses can possess an arbitrary title.<br />
-      ^{newU2WFeat} Makeshift abbreviations such as [SB], [ZP] etc. are not necessary anymore!
+      ^{newU2WFeat} Makeshift shorthands such as [SB], [ZP] etc. are not necessary anymore!
 
     <dt .deflist__dt> Course Settings
     <dd .deflist__dd>
diff --git a/templates/i18n/info-lecturer/en.hamlet b/templates/i18n/info-lecturer/en.hamlet
index f49d6a6d0..5a6afc414 100644
--- a/templates/i18n/info-lecturer/en.hamlet
+++ b/templates/i18n/info-lecturer/en.hamlet
@@ -7,17 +7,17 @@ $newline text
     <dt .deflist__dt> Course Names
     <dd .deflist__dd>
       <p>
-        ^{newU2WFeat} Any course needs an abbreviation for identification, e.g. DBS, PXD, DM, ...
+        ^{newU2WFeat} Any course needs a shorthand for identification, e.g. DBS, PXD, DM, ...
       <p>
-        The combination of abbreviation, school and semester needs to be unique.<br />
-        Creating a course with an abbreviation that is not unique for the selected school and semester will be rejected (a corresponding error message will be shown).
+        The combination of shorthand, department and semester needs to be unique.<br />
+        Creating a course with a shorthand that is not unique for the selected department and semester will be rejected (a corresponding error message will be shown).
       <p>
-        Recommendations for course abbreviations:
+        Recommendations for course shorthands:
         <ul>
-          <li> Try to keep the abbreviation as short as possible (10 characters max.). 
-               In particular, we advice against choosing the full course title as its abbreviation.
-               A warning will be shown if an abbreviation exceeds the recommended length.
-          <li> Avoid adding identifiers for the school (e.g. "MATH"), the semester (e.g. "WS19") or the type (e.g. "SEM") of a course in its abbreviation.
+          <li> Try to keep the shorthand as short as possible (10 characters max.). 
+               In particular, we advice against choosing the full course title as its shorthand.
+               A warning will be shown if a shorthand exceeds the recommended length.
+          <li> Avoid adding identifiers for the department (e.g. "MATH"), the semester (e.g. "WS19") or the type (e.g. "SEM") of a course in its shorthand.
       <p>
         ^{plannedFeatInline} It is planned to enable courses to have types (e.g. "Bachelor Seminar" or "Practical Course").<br />
         Students will then be able to explicitely search for courses of a specific type.
@@ -25,9 +25,9 @@ $newline text
     <dt .deflist__dt> Clone Courses
     <dd .deflist__dd>
       <p>
-        Lecturers are able to clone <em>any</em> course of their school for the current semester.
+        Lecturers are able to clone <em>any</em> course of their department for the current semester.
 
-        When cloning a course, its abbreviation and description will be adopted;
+        When cloning a course, its shorthand and description will be adopted;
         but not exercise sheets, exams or registrations.
       <p>
         The course description can be composed in Html and
@@ -36,10 +36,10 @@ $newline text
     <dt .deflist__dt> Unterstützung für verschiedene Institute
     <dd .deflist__dd>
       <p>
-        ^{newU2WFeat} Uni2work supports managing multiple schools; prefixing course titles with e.g. "[MATH]" are not necessary anymore.
-        Instead, there are now school filters for course lists.
+        ^{newU2WFeat} Uni2work supports managing multiple departments; prefixing course titles with e.g. "[MATH]" are not necessary anymore.
+        Instead, there are now department filters for course lists.
       <p>
-        The permissions of Uni2work administrators are limited to courses of their respective schools.
+        The permissions of Uni2work administrators are limited to courses of their respective departments.
         This means that a Uni2work administrator of the Institute of Informatics cannot access grades from courses of the Department of Maths.
 
     <dt .deflist__dt> Access to Material
@@ -63,14 +63,14 @@ $newline text
       <p>
         ^{newU2WFeat} Uni2work features "lecturer" and "assistant" as roles:
         lecturers are essentially allowed to create new courses.
-        The lecturer permission is differentiated according to school.
+        The lecturer permission is differentiated according to department.
 
         Assistants have the same permissions as lecturers, but only for a particular course.
 
       <p>
         In UniWorX, there was the role "assistant", 
         i.e. every "administrator" also had to be "lecturer"; 
-        there was no differentiation between schools.
+        there was no differentiation between departments.
 
     <dt .deflist__dt> Course Participants
     <dd .deflist__dd>
@@ -346,7 +346,7 @@ $newline text
     <dt .deflist__dt> Naming Schema
     <dd .deflist__dd>
       Courses can possess an arbitrary title.<br />
-      ^{newU2WFeat} Makeshift abbreviations such as [SB], [ZP] etc. are not necessary anymore!
+      ^{newU2WFeat} Makeshift shorthands such as [SB], [ZP] etc. are not necessary anymore!
 
     <dt .deflist__dt> Course Settings
     <dd .deflist__dd>

From 3058737021a5f9f949d2da7a3ca608eb71f34cc8 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 26 Oct 2019 13:10:55 +0200
Subject: [PATCH 019/126] feat(i18n): more en-eu

---
 messages/uniworx/de-de-formal.msg |  45 ++-
 messages/uniworx/en-eu.msg        | 561 ++++++++++++++++++++++++++++--
 src/Foundation.hs                 |   9 +
 src/Model/Migration.hs            |   2 +-
 4 files changed, 569 insertions(+), 48 deletions(-)

diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index fb3841abe..0ce2fca11 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -144,8 +144,8 @@ CourseRegisterToTip: Darf auch unbegrenzt offen bleiben
 CourseDeregisterUntilTip: Abmeldung ist ab "Anmeldungen von" bis zu diesem Zeitpunkt erlaubt. Die Abmeldung darf auch unbegrenzt erlaubt bleiben.
 CourseFilterSearch: Volltext-Suche
 CourseFilterRegistered: Registriert
-CourseFilterNone: Egal
-BoolIrrelevant: Egal
+CourseFilterNone: —
+BoolIrrelevant: —
 CourseDeleteQuestion: Wollen Sie den unten aufgeführten Kurs wirklich löschen?
 CourseDeleted: Kurs gelöscht
 CourseUserTutorials: Angemeldete Tutorien
@@ -483,7 +483,7 @@ HomeOpenAllocations: Offene Zentralanmeldungen
 HomeUpcomingSheets: Anstehende Übungsblätter
 HomeUpcomingExams: Bevorstehende Prüfungen
 
-NumCourses num@Int64: #{num} Kurse
+NumCourses num@Int64: #{num} #{pluralDE num "Kurs" "Kurse"}
 CloseAlert: Schliessen
 
 Name: Name
@@ -524,15 +524,15 @@ NatField name@Text: #{name} muss eine natürliche Zahl sein!
 JSONFieldDecodeFailure aesonFailure@String: Konnte JSON nicht parsen: #{aesonFailure}
 SecretJSONFieldDecryptFailure: Konnte versteckte vertrauliche Daten nicht entschlüsseln
 
-SubmissionsAlreadyAssigned num@Int64: #{num} Abgaben waren bereits einem Korrektor zugeteilt und wurden nicht verändert:
-SubmissionsAssignUnauthorized num@Int64: #{num} Abgaben können momentan nicht einem Korrektor zugeteilt werden (z.B. weil die Abgabe noch offen ist):
-UpdatedAssignedCorrectorSingle num@Int64: #{num} Abgaben wurden dem neuen Korrektor zugeteilt.
+SubmissionsAlreadyAssigned num@Int64: #{num} #{pluralDE num "Abgabe" "Abgaben"} waren bereits einem Korrektor zugeteilt und wurden nicht verändert:
+SubmissionsAssignUnauthorized num@Int64: #{num} #{pluralDE num "Abgabe" "Abgaben"} können momentan nicht einem Korrektor zugeteilt werden (z.B. weil die Abgabe noch offen ist):
+UpdatedAssignedCorrectorSingle num@Int64: #{num} #{pluralDE num "Abgabe" "Abgaben"} wurden dem neuen Korrektor zugeteilt.
 NoCorrector: Kein Korrektor
-RemovedCorrections num@Int64: Korrektur-Daten wurden von #{num} Abgaben entfernt.
-UpdatedAssignedCorrectorsAuto num@Int64: #{num} Abgaben wurden unter den Korrektoren aufgeteilt.
+RemovedCorrections num@Int64: Korrektur-Daten wurden von #{num} #{pluralDE num "Abgabe" "Abgaben"} entfernt.
+UpdatedAssignedCorrectorsAuto num@Int64: #{num} #{pluralDE num "Abgabe" "Abgaben"} wurden unter den Korrektoren aufgeteilt.
 UpdatedSheetCorrectorsAutoAssigned n@Int: #{n} #{pluralDE n "Abgabe wurde einem Korrektor" "Abgaben wurden Korrektoren"} zugteilt.
 UpdatedSheetCorrectorsAutoFailed n@Int: #{n} #{pluralDE n "Abgabe konnte" "Abgaben konnten"} nicht automatisch zugewiesen werden.
-CouldNotAssignCorrectorsAuto num@Int64: #{num} Abgaben konnten nicht automatisch zugewiesen werden:
+CouldNotAssignCorrectorsAuto num@Int64: #{num} #{pluralDE num "Abgabe konnte" "Abgaben konnten"} nicht automatisch zugewiesen werden:
 SelfCorrectors num@Int64: #{num} Abgaben wurden Abgebenden als eigenem Korrektor zugeteilt!
 
 SubmissionOriginal: Original
@@ -609,7 +609,7 @@ RatingNotUnicode uexc@UnicodeException: Bewertungsdatei nicht in UTF-8 kodiert:
 RatingMissingSeparator: Präambel der Bewertungsdatei konnte nicht identifziert werden
 RatingMultiple: Bewertungen enthält mehrere Punktzahlen für die gleiche Abgabe
 RatingInvalid parseErr@Text: Bewertungspunktzahl konnte nicht als Zahl verstanden werden: #{parseErr}
-RatingFileIsDirectory: Unerwarteter Fehler: Datei ist unerlaubterweise ein Verzeichnis
+RatingFileIsDirectory: Bewertungsdatei ist unerlaubterweise ein Verzeichnis
 RatingNegative: Bewertungspunkte dürfen nicht negativ sein
 RatingExceedsMax: Bewertung übersteigt die erlaubte Maximalpunktzahl
 RatingNotExpected: Keine Bewertungen erlaubt
@@ -621,9 +621,9 @@ SubmissionSinkExceptionDuplicateFileTitle file@FilePath: Dateiname #{show file}
 SubmissionSinkExceptionDuplicateRating: Mehr als eine Bewertung gefunden.
 SubmissionSinkExceptionRatingWithoutUpdate: Bewertung gefunden, es ist hier aber keine Bewertung der Abgabe möglich.
 SubmissionSinkExceptionForeignRating smid@CryptoFileNameSubmission: Fremde Bewertung für Abgabe #{toPathPiece smid} enthalten. Bewertungen müssen sich immer auf die gleiche Abgabe beziehen!
-SubmissionSinkExceptionInvalidFileTitleExtension file@FilePath: Dateiname #{show file} hat keine der für dieses Übungsblatt zulässigen Dateiendungen.
+SubmissionSinkExceptionInvalidFileTitleExtension file@FilePath: Dateiname „#{show file}“ hat keine der für dieses Übungsblatt zulässigen Dateiendungen.
 
-MultiSinkException name@Text error@Text: In Abgabe #{name} ist ein Fehler aufgetreten: #{error}
+MultiSinkException name@Text error@Text: In Abgabe „#{name}“ ist ein Fehler aufgetreten: #{error}
 
 NoTableContent: Kein Tabelleninhalt
 NoUpcomingSheetDeadlines: Keine anstehenden Übungsblätter
@@ -633,7 +633,7 @@ AdminHeading: Administration
 AdminUserHeading: Benutzeradministration
 AdminUserRightsHeading: Benutzerrechte
 AdminUserAuthHeading: Benutzer-Authentifizierung
-AdminUserHeadingFor: Benuterprofil für
+AdminUserHeadingFor: Benutzerprofil für
 AdminFor: Administrator
 LecturerFor: Dozent
 LecturersFor: Dozenten
@@ -641,7 +641,6 @@ AssistantFor: Assistent
 AssistantsFor: Assistenten
 TutorsFor n@Int: #{pluralDE n "Tutor" "Tutoren"}
 CorrectorsFor n@Int: #{pluralDE n "Korrektor" "Korrektoren"}
-ForSchools n@Int: für #{pluralDE n "Institut" "Institute"}
 UserListTitle: Komprehensive Benutzerliste
 AccessRightsSaved: Berechtigungen erfolgreich verändert
 AccessRightsNotChanged: Berechtigungen wurden nicht verändert
@@ -653,7 +652,7 @@ DateTimeFormat: Datums- und Uhrzeitformat
 DateFormat: Datumsformat
 TimeFormat: Uhrzeitformat
 DownloadFiles: Dateien automatisch herunterladen
-DownloadFilesTip: Wenn gesetzt werden Dateien von Abgaben und Übungsblättern automatisch als Download behandelt, ansonsten ist das Verhalten browserabhängig (es können z.B. PDFs im Browser geöffnet werden).
+DownloadFilesTip: Wenn gesetzt werden Dateien automatisch als Download behandelt, ansonsten ist das Verhalten browserabhängig (es können z.B. PDFs im Browser geöffnet werden).
 WarningDays: Fristen-Vorschau
 WarningDaysTip: Wie viele Tage im Voraus sollen Fristen von Klausuren etc. auf Ihrer Startseite angezeigt werden?
 NotificationSettings: Erwünschte Benachrichtigungen
@@ -731,8 +730,8 @@ UploadSpecificFileRequired: Zur Abgabe erforderlich
 
 NoSubmissions: Keine Abgabe
 CorrectorSubmissions: Abgabe extern mit Pseudonym
-UserSubmissions: Direkte Abgabe
-BothSubmissions: Abgabe direkt & extern mit Pseudonym
+UserSubmissions: Direkte Abgabe in Uni2work
+BothSubmissions: Abgabe direkt in Uni2work & extern mit Pseudonym
 
 SheetCorrectorSubmissionsTip: Abgabe erfolgt über ein Uni2work-externes Verfahren (zumeist in Papierform durch Einwurf) unter Angabe eines persönlichen Pseudonyms. Korrektoren können mithilfe des Pseudonyms später Korrekturergebnisse in Uni2work eintragen, damit Sie sie einsehen können.
 
@@ -744,7 +743,7 @@ SubmissionUpdated: Abgabe erfolgreich ersetzt
 AdminFeaturesHeading: Studiengänge
 StudyTerms: Studiengänge
 StudyTerm: Studiengang
-NoStudyTermsKnown: Nicht eingeschrieben
+NoStudyTermsKnown: Keine Studiengänge bekannt
 StudyFeatureInference: Studiengangschlüssel-Inferenz
 StudyFeatureInferenceNoConflicts: Keine Konflikte beobachtet
 StudyFeatureInferenceConflictsHeading: Studiengangseinträge mit beobachteten Konflikten
@@ -765,9 +764,9 @@ DegreeShort: Abschlusskürzel
 StudyTermsKey: Studiengangschlüssel
 StudyTermsName: Studiengang
 StudyTermsShort: Studiengangkürzel
-StudyTermsChangeSuccess: Zuordnung Abschlüsse aktualisiert
-StudyDegreeChangeSuccess: Zuordnung Studiengänge aktualisiert
-StudyCandidateIncidence: Anmeldevorgang
+StudyTermsChangeSuccess: Zuordnung Studiengänge aktualisiert
+StudyDegreeChangeSuccess: Zuordnung Abschlüsse aktualisiert
+StudyCandidateIncidence: Synchronisation
 AmbiguousCandidatesRemoved n@Int: #{show n} #{pluralDE n "uneindeutiger Kandidat" "uneindeutige Kandiaten"} entfernt
 RedundantCandidatesRemoved n@Int: #{show n} bereits #{pluralDE n "bekannter Kandidat" "bekannte Kandiaten"} entfernt
 CandidatesInferred n@Int: #{show n} neue #{pluralDE n "Studiengangszuordnung" "Studiengangszuordnungen"} inferiert
@@ -786,8 +785,8 @@ MailTestDateTime: Test der Datumsformattierung:
 
 German: Deutsch
 GermanGermany: Deutsch (Deutschland)
-English: English
-EnglishEurope: English (Europe)
+English: Englisch
+EnglishEurope: Englisch (Europa)
 
 MailSubjectSubmissionRated csh@CourseShorthand: Ihre #{csh}-Abgabe wurde korrigiert
 MailSubmissionRatedIntro courseName@Text termDesc@Text: Ihre Abgabe im Kurs #{courseName} (#{termDesc}) wurde korrigiert.
diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index 31d865d0f..84f27f32a 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -30,17 +30,17 @@ BtnSubmissionsAssign: Assign submissions automatically
 
 Aborted: Aborted
 Remarks: Remarks
-Registered: Registered
-RegisteredSince: Registered since
+Registered: Enrolled
+RegisteredSince: Enrolled since
 NotRegistered: Note enrolled for this course
-Registration: Registration
-RegisterFrom: Registration starts
-RegisterTo: Registration ends
+Registration: Enrolment
+RegisterFrom: Enrolment starts
+RegisterTo: Enrolment ends
 DeRegUntil: Deregistration until
 RegisterRetry: You haven't been enrolled. Press "Enrol for course" to enrol
 
-CourseRegistrationInterval: Registration
-CourseDirectRegistrationInterval: Direct registration
+CourseRegistrationInterval: Enrolment
+CourseDirectRegistrationInterval: Direct enrolment
 CourseDeregisterUntil time: Deregistration only until #{time}
 
 GenericKey: Key
@@ -84,7 +84,7 @@ TermLectureEndTooltip: Summer semesters are usually 14 weeks; winter semesters 1
 TermActive: Active
 
 
-SchoolListHeading: Schools
+SchoolListHeading: Department
 SchoolHeading school: #{school}
 
 LectureStart: Lectures start
@@ -96,8 +96,8 @@ CourseCapacityTip: Maximum permissable number of enrolments for this course; lea
 CourseNoCapacity: Course has reached maximum capacity
 TutorialNoCapacity: Tutorial has reached maximum capacity
 CourseNotEmpty: There are currently no participants enrolled for this course.
-CourseRegistration: Registration
-CourseRegisterOpen: Registration is open
+CourseRegistration: Enrolment
+CourseRegisterOpen: Enrolment is allowed
 CourseRegisterOk: Successfully enrolled for course
 CourseDeregisterOk: Successfully left course
 CourseApplyOk: Successfully applied for course
@@ -144,29 +144,29 @@ CourseRegisterToTip: May be left empty to allow enrolment indefinitely
 CourseDeregisterUntilTip: Participants may deregister from immediately after registration starts up to this time. May be left empty to allow deregistration indefinitely.
 CourseFilterSearch: Text search
 CourseFilterRegistered: Registered
-CourseFilterNone: Irrelevant
-BoolIrrelevant: Irrelevant
+CourseFilterNone: —
+BoolIrrelevant: —
 CourseDeleteQuestion: Are you sure you want to delete the below-mentioned course?
 CourseDeleted: Course deleted
 CourseUserTutorials: Registered tutorials
 CourseUserNote: Note
 CourseUserNoteTooltip: Only visible to administrators of this course
-CourseUserNoteSaved: Note changes saved
-CourseUserNoteDeleted: User note deleted
+CourseUserNoteSaved: Successfully saved note changes
+CourseUserNoteDeleted: Successfully deleted user note deleted
 CourseUserDeregister: Deregister from course
-CourseUsersDeregistered count@Int64: #{show count} users deregistered from course
+CourseUsersDeregistered count@Int64: Successfully deregistered #{show count} users from course
 CourseUserRegisterTutorial: Register for a tutorial
-CourseUsersTutorialRegistered count@Int64: #{show count} users registered for tutorial
+CourseUsersTutorialRegistered count@Int64: Successfully registered #{show count} users for tutorial
 CourseUserSendMail: Send mail
 TutorialUserDeregister: Deregister from tutorial
 TutorialUserSendMail: Send mail
-TutorialUsersDeregistered count@Int64: #{show count} participants deregistered from tutorial
+TutorialUsersDeregistered count@Int64: Successfully deregistered #{show count} participants from tutorial
 CourseAllocationParticipate: Participate in central allocation
 CourseAllocationParticipateTip: If a course participates in a central allocation, you might lose some permissions that you would normally have (e.g. registering students for the course directly, deregistering students, ...)
 CourseAllocation: Central allocation
 CourseAllocationOption term@Text name@Text: #{name} (#{term})
 CourseAllocationMinCapacity: Minimum number of participants
-CourseAllocationMinCapacityTip: If there were fewer students being assigned to this course than this number, then these students would instead be assigned to other courses
+CourseAllocationMinCapacityTip: If fewer students than this number were to be assigned to this course, then these students would instead be assigned to other courses
 CourseAllocationMinCapacityMustBeNonNegative: Minimum number of participants must not be negative
 CourseApplicationInstructions: Instructions for application
 CourseApplicationInstructionsTip: Will be shown to students if they decide to apply for this course
@@ -176,7 +176,7 @@ CourseApplicationsText: Text application
 CourseApplicationsTextTip: Should students submit a plaintext application (in addition to submitted files if applicable)?
 CourseApplicationRatingsVisible: Feedback to applications
 CourseApplicationRatingsVisibleTip: Should students be allowed to view rating and commentaries on their application after the rating period?
-CourseApplicationRequired: Application procedure
+CourseApplicationRequired: Applications required
 CourseApplicationRequiredTip: Should registrations for this course be provisional at first (without capacity constraint), until they are approved by a course administrator?
 CourseApplicationInstructionsApplication: Instructions for application
 CourseApplicationInstructionsRegistration: Instructions for registration
@@ -204,10 +204,10 @@ CourseRegistrationFollowInstructions: Please follow the instructions for registr
 
 CourseApplicationFile: Application
 CourseApplicationFiles: Application file(s)
-CourseApplicationArchive: Zip archive for application files
+CourseApplicationArchive: Zip archive of application files
 CourseRegistrationFile: Registration file
 CourseRegistrationFiles: Registration file(s)
-CourseRegistrationArchive: Zip archive for registration files
+CourseRegistrationArchive: Zip archive of registration files
 CourseApplicationNoFiles: No file(s)
 CourseApplicationFilesNeedReupload: Application files need to be reuploaded every time the application is changed
 CourseRegistrationFilesNeedReupload: Registration files need to be reuploaded every time the registration is changed
@@ -224,7 +224,7 @@ CourseApplicationsAllocatedDirectory: central
 CourseApplicationsNotAllocatedDirectory: direct
 
 CourseNoAllocationsAvailable: There are no ongoing central allocations
-AllocationStaffRegisterToExpired: You cannot change properties concerning the central allocation after the course registration period. Your changes have been discarded.
+AllocationStaffRegisterToExpired: You cannot change course properties concerning the central allocation after the course registration period. Your changes may have been discarded.
 
 CourseFormSectionRegistration: Registration
 CourseFormSectionAdministration: Administration
@@ -266,7 +266,7 @@ SheetDelOk      tid ssh csh sheetName: #{tid}-#{ssh}-#{csh}: #{sheetName} has be
 SheetDelHasSubmissions objs: Incl. #{objs} #{pluralEN objs "submission" "submissions"}
 
 SheetDeleteQuestion: Do you really want to delete the below-mentioned exercise sheet and all associated submissions?
-SheetDeleted: Deleted exercise sheet
+SheetDeleted: Successfully deleted exercise sheet
 
 SheetUploadMode: Submission of files
 SheetSubmissionMode: Submission mode
@@ -290,7 +290,520 @@ SheetActiveFrom: Submission period start
 SheetActiveTo: Submission period end
 SheetHintFromTip: Always invisible for participants if left empty; correctors can always download hints
 SheetSolutionFromTip: Always invisible for participants if left empty; correctors can always download solutions
-SheetMarkingTip: 
+SheetMarkingTip: Instructions for correction, visible only to correctors
+SheetPseudonym: Personal pseudonym
+SheetGeneratePseudonym: Generate
+
+SheetFormType: Valuation & submission
+SheetFormTimes: Times
+SheetFormFiles: Files
+
+SheetErrVisibility: "Submission period start" must be after "Visible from"
+SheetErrDeadlineEarly: "Submission period end" must be after "Submission period start"
+SheetErrHintEarly: "Hint from" must be after "Submission period start"
+SheetErrSolutionEarly: "Solution from" must be after "Submission period end"
+SheetNoCurrent: There is no currently active exercise sheet
+SheetNoOldUnassigned: All submissions for inactive sheets are already assigned to correctors.
+SheetsUnassignable name: Submission for #{name} may not currently be assigned to correctors.
+
+Deadline: Deadline
+Done: Submitted
+
+Submission: Submission-number
+SubmissionsCourse tid ssh csh: All submissions for Course #{tid}-#{ssh}-#{csh}
+SubmissionsSheet sheetName: Submissions for #{sheetName}
+SubmissionWrongSheet: Submission does not belong to the given sheet.
+SubmissionAlreadyExists: You already have a submission for this sheet.
+SubmissionEditHead tid ssh csh sheetName: #{tid}-#{ssh}-#{csh} #{sheetName}: Edit/Create submission
+CorrectionHead tid ssh csh sheetName cid: #{tid}-#{ssh}-#{csh} #{sheetName}: Marking
+SubmissionMembers: Submittors
+SubmissionMember: Submittor
+SubmissionArchive: Zip-archive of submission files
+SubmissionFile: Submission file
+SubmissionFiles: Submitted files
+SubmissionAlreadyExistsFor email: #{email} already has a submission for this sheet.
+SubmissionUsersEmpty: Submissions may not be created without submittors.
+SubmissionUserAlreadyAdded: This user is already configured as a submittor
+NoOpenSubmissions: No open submissions exist
+
+SubmissionsDeleteQuestion n: Do you really want to delete the #{pluralEN n "submission" "submissions"} mentioned below?
+SubmissionsDeleted n: #{pluralEN n "Submission" "Submissions"} deleted
+
+SubmissionGroupName: Group name
+
+CorrectionsTitle: Assigned corrections
+CourseCorrectionsTitle: Corrections for this course
+CorrectorsHead sheetName: Correctors for #{sheetName}
+CorrectorAssignTitle: Assign corrector
+
+MaterialName: Name
+MaterialType: Type
+MaterialTypePlaceholder: Slides, Code, Example, ...
+MaterialTypeSlides: Slides
+MaterialTypeCode: Code
+MaterialTypeExample: Example
+MaterialDescription: Description
+MaterialVisibleFrom: Visible to participants from
+MaterialVisibleFromTip: Never visible to participants if left empty; leaving the date empty is only sensible for unfinished course material or when course material should be provided only to sheet correctors
+MaterialVisibleFromEditWarning: This course material has already been published and should not be edited. Doing so might confuse the participants.
+MaterialInvisible: This course material is currently invisible to participants!
+MaterialFiles: Files
+MaterialHeading materialName: Course material “#{materialName}”
+MaterialListHeading: Course materials
+MaterialNewHeading: Publish new course material
+MaterialNewTitle: New course material
+MaterialEditHeading materialName: Edit course material “#{materialName}”
+MaterialEditTitle materialName: Edit course material “#{materialName}”
+MaterialSaveOk tid ssh csh materialName: Successfully saved “#{materialName}” for course #{tid}-#{ssh}-#{csh}
+MaterialNameDup tid ssh csh materialName: Course material with the name “#{materialName}” already exists for course #{tid}-#{ssh}-#{csh}
+MaterialDeleteCaption: Do you really want to delete the course material mentioned below?
+MaterialDelHasFiles count: including #{count} #{pluralEN count "file" "files"}
+MaterialIsVisible: Caution, this course material has already been published.
+MaterialDeleted materialName: Successfully deleted course material “#{materialName}”
+MaterialArchiveName tid ssh csh materialName: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-#{foldedCase materialName}
+
+Unauthorized: You do not have explicit authorisation.
+UnauthorizedAnd l r: (#{l} AND #{r})
+UnauthorizedOr l r: (#{l} OR #{r})
+UnauthorizedNot r: (NOT #{r})
+UnauthorizedNoToken: No authorisation-token was provided with your request.
+UnauthorizedTokenExpired: Your authorisation-token is expired.
+UnauthorizedTokenNotStarted: Your authorisation-token is not yet valid.
+UnauthorizedTokenInvalid: Your authorisation-taken could not be processed.
+UnauthorizedTokenInvalidAuthority: Your authorisation-token is based in an user's rights who does not exist anymore.
+UnauthorizedToken404: Authorisation-tokens cannot be processed on error pages.
+UnauthorizedSiteAdmin: You are no system-wide administrator.
+UnauthorizedSchoolAdmin: You are no administrator for this department.
+UnauthorizedAdminEscalation: You aren't an administrator for all departments for which this user is an administrator.
+UnauthorizedExamOffice: You are not part of an exam office.
+UnauthorizedExamExamOffice: You are not part of the appropriate exam office for any of the participants of this exam.
+UnauthorizedSchoolLecturer: You are no lecturer for this department.
+UnauthorizedLecturer: You are no administrator for this course.
+UnauthorizedAllocationLecturer: You are no administrator for any of the courses of this central allocation.
+UnauthorizedCorrector: You are no sheet corrector for this course.
+UnauthorizedSheetCorrector: You are no corrector for this sheet.
+UnauthorizedCorrectorAny: You are no corrector for any course.
+UnauthorizedRegistered: You are no participant in this course.
+UnauthorizedAllocationRegistered: You are no participant in this central allocation.
+UnauthorizedExamResult: You have no results in this exam.
+UnauthorizedParticipant: The specified user is no participant of this course.
+UnauthorizedParticipantSelf: You are no participant of this course.
+UnauthorizedApplicant: The specified user is no applicant for this course.
+UnauthorizedApplicantSelf: You are no applicant for this course.
+UnauthorizedCourseTime: This course does not currently allow enrollment.
+UnauthorizedAllocationRegisterTime: This central allocation does not currently allow applications.
+UnauthorizedSheetTime: This sheet is not currently available.
+UnauthorizedApplicationTime: This allocation is not currently available.
+UnauthorizedMaterialTime: This course material is not currently available.
+UnauthorizedTutorialTime: This tutorial does not currently allow registration.
+UnauthorizedCourseNewsTime: This news item is not currently available.
+UnauthorizedExamTime: This exam is not currently available.
+UnauthorizedSubmissionOwner: You are no submittor for this submission.
+UnauthorizedSubmissionRated: This submission is not yet marked.
+UnauthorizedSubmissionCorrector: You are no corrector for this submission.
+OnlyUploadOneFile: Please only upload one file
+DeprecatedRoute: This view is deprecated and will be removed.
+UnfreeMaterials: Course material are not publicly accessable.
+MaterialFree: Course material is publicly available.
+UnauthorizedWrite: You do not have the write permission necessary to perform this action
+UnauthorizedSystemMessageTime: This system-message is not currently available.
+UnauthorizedSystemMessageAuth: This system-message is only available to logged in users.
+UnsupportedAuthPredicate authTagT shownRoute: “#{authTagT}” was applied to a route which does not support it: “#{shownRoute}”
+UnauthorizedDisabledTag authTag: Auth predicate “#{toPathPiece authTag}” is disabled for your session
+UnknownAuthPredicate tag: Auth predicate “#{tag}” is unknown
+UnauthorizedRedirect: The requested view does not exist or you haven't the required permissions to access it.
+UnauthorizedSelf: You are not the specified user.
+UnauthorizedTutorialTutor: You are no tutor for this tutorial.
+UnauthorizedTutorialTutorControl: Tutors may not edit this tutorial.
+UnauthorizedCourseTutor: You are no tutor for this course.
+UnauthorizedTutor: You are no tutor.
+UnauthorizedTutorialRegisterGroup: You are already registered for a tutorial with the same registration group.
+UnauthorizedLDAP: Specified user does not log in with their campus account.
+UnauthorizedPWHash: Specified user does not log in with an Uni2work-account.
+
+UnauthorizedPasswordResetToken: This authorisation-token may no longer be used to change passwords
+
+UnauthorizedAllocatedCourseRegister: Direct enrollment to this course is currently not allowed due to participation in a central allocation
+UnauthorizedAllocatedCourseDeregister: Deregistration from this course is currently not allowed due to participation in a central allocation
+UnauthorizedAllocatedCourseDelete: Courses that participate in a central allocation may not be deleted
+
+EMail: Email
+EMailUnknown email: Email #{email} does not belong to any known user.
+NotAParticipant email tid csh: #{email} is not a participant of #{tid}-#{csh}.
+TooManyParticipants: You have specified more than the allowed number of submittors.
+
+AddCorrector: Additional corrector
+CorrectorExists: User already is a corrector
+SheetCorrectorsTitle tid ssh csh sheetName: Correctors for #{tid}-#{ssh}-#{csh} #{sheetName}
+CountTutProp: Tutorials count against proportion
+CountTutPropTip: If submissions are assigned by tutorial, do those assignments count with regard to the set proportion?
+AutoAssignCorrs: Automatically assign corrections after expiration of the submission period
+Corrector: Corrector
+Correctors: Correctors
+CorState: State
+CorByTut: Assign by tutorial
+CorProportion: Proportion
+CorDeficitProportion: Deficit (proportion)
+CorByProportionOnly proportion: #{rationalToFixed3 proportion} parts
+CorByProportionIncludingTutorial proportion: #{rationalToFixed3 proportion} parts - tutorials
+CorByProportionExcludingTutorial proportion: #{rationalToFixed3 proportion} parts + tutorials
+
+RowCount count: #{count} matching #{pluralEN count "entry" "entries"}
+DeleteRow: Delete
+ProportionNegative: Proportions may not be negative
+CorrectorUpdated: Successfully updated corrector
+CorrectorsUpdated: Successfully updated correctors
+CorrectorsPlaceholder: Correctors...
+CorrectorsDefaulted: List of correctors was automatically generated based on those of preceding sheets for this course. No data has been saved, yet.
+
+Users: Users
+HomeHeading: Current events
+LoginHeading: Authentication
+LoginTitle: Authentication
+ProfileHeading: Settings
+ProfileFor: Settings for
+ProfileDataHeading: Personal information
+InfoHeading: Information
+VersionHeading: Version history
+ImpressumHeading: Imprint
+DataProtHeading: Data protection
+SystemMessageHeading: Uni2work system message
+SystemMessageListHeading: Uni2work system message
+NotificationSettingsHeading displayName: Notification settings for #{displayName}
+TokensLastReset: Tokens last reset
+TokensResetSuccess: Successfully invalidated all authorisation tokens
+
+HomeOpenAllocations: Active central allocations
+HomeUpcomingSheets: Upcoming exercise sheets
+HomeUpcomingExams: Upcoming exams
+
+NumCourses num: #{num} #{pluralEN num "course" "courses"}
+CloseAlert: Close
+
+Name: Name
+MatrikelNr: Matriculation
+LdapSynced: LDAP-synchronised
+LdapSyncedBefore: Last LDAP-synchronisation before
+NoMatrikelKnown: No matriculation
+Theme: Theme
+Favourites: Number of saved favourites
+FavouritesTip: Only relevant for automatically generated favourites (“visited recently”)
+FavouriteSemesters: Maximum number of semesters in favourites bar
+Plugin: Plugin
+Ident: Identification
+LastLogin: Last login
+Settings: Settings
+SettingsUpdate: Successfully updated settings
+NotificationSettingsUpdate: Successfully updated notification settings
+Never: Never
+
+PreviouslyUploadedInfo: Files already uploaded:
+PreviouslyUploadedDeletionInfo: (Files not checked will be deleted)
+MultiFileUploadInfo: (Choose multiple files using Shift or Ctrl)
+AddMoreFiles: Additional files:
+
+NrColumn: #
+SelectColumn: Selection
+DBTablePagesize: Entries per page
+DBTablePagesizeAll: All
+
+CorrDownload: Download
+CorrUploadField: Corrections
+CorrUpload: Upload corrections
+CorrSetCorrector: Assign corrector
+CorrSetCorrectorTooltip: Submissions already assigned to a corrector must first be assigned to “<None>” before they can be assigned again.
+CorrAutoSetCorrector: Distribute corrections
+CorrDelete: Delete submissions
+NatField name: #{name} must be a natural number!
+JSONFieldDecodeFailure aesonFailure: Could not parse JSON: #{aesonFailure}
+SecretJSONFieldDecryptFailure: Could not decrypt hidden data
+
+SubmissionsAlreadyAssigned num: #{num} #{pluralEN num "correction" "corrections"} were already assigned to a corrector and were left unchanged:
+SubmissionsAssignUnauthorized num: #{num} #{pluralEN num "correction" "corrections"} cannot currently be assigned to correctors (e.g. because changes to submissions are still allowed)
+UpdatedAssignedCorrectorSingle num: Successfully assigned #{num} #{pluralEN num "correction" "corrections"} to the corrector.
+NoCorrector: No corrector
+RemovedCorrections num: Successfully deleted #{num} #{pluralEN num "correction" "corrections"}
+UpdatedAssignedCorrectorsAuto num: Successfully distributed #{num} #{pluralEN num "correction" "corrections"} among correctors.
+UpdatedSheetCorrectorsAutoAssigned n: Successfully distributed #{n} #{pluralEN n "correction" "corrections"} among correctors.
+UpdatedSheetCorrectorsAutoFailed n: #{n} #{pluralEN n "correction" "corrections"} could not be distributed.
+CouldNotAssignCorrectorsAuto num: #{num} #{pluralEN num "correction" "corrections"} could not be distributed:
+SelfCorrectors num: #{num} #{pluralEN num "correction was" "corrections were"} assigned to correctors that are also submittors for their correction!
+
+SubmissionOriginal: Original
+SubmissionCorrected: Marked
+SubmissionArchiveName: submissions
+SubmissionTypeArchiveName tid ssh csh shn subId renderedSfType: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-#{foldedCase shn}-#{foldCase (toPathPiece subId)}-#{foldCase renderedSfType}
+
+CorrectionSheets: Corrections by sheet
+CorrectionCorrectors: Corrections by corrector
+AssignSubmissionExceptionNoCorrectors: No correctors configured
+AssignSubmissionExceptionNoCorrectorsByProportion: No correctors have any non-zero proportion
+AssignSubmissionExceptionSubmissionsNotFound n: #{n} #{pluralEN n "submission" "submissions"} could not be identified
+NrSubmittorsTotal: Submittors
+NrSubmissionsTotal: Submissions
+NrSubmissionsTotalShort: Subm
+NrSubmissionsUnassigned: No corrector
+NoCorrectorAssigned: No corrector
+NrCorrectors: Correctors
+NrSubmissionsNewlyAssigned: Newly assigned
+NrSubmissionsNotAssigned: Not assigned
+NrSubmissionsNotCorrected: Not corrected
+NrSubmissionsNotCorrectedShort: N.corr.
+CorrectionTime: Correction time
+AssignSubmissionsRandomWarning: The assignment preview might be different from the actual assignment if multiple sheets are being distributed. This is due to the fact that only assigned submissions are considered when handling corrector-deficits. Due to this being a randomised process small differences are also possible for a single sheet.
+
+CorrectionsUploaded num: Successfully saved #{num} #{pluralEN num "correction" "corrections"}:
+NoCorrectionsUploaded: No corrections could be found within the uploaded file.
+
+RatingBy: Marked by
+HasCorrector: Corrector assigned
+AssignedTime: Assigned
+AchievedBonusPoints: Bonus points achieved
+AchievedNormalPoints: Points achieved
+AchievedPoints: Points achieved
+AchievedPassPoints: Points achieved to pass
+AchievedPasses: Passed sheets
+AchievedOf achieved possible: #{achieved} of #{possible}
+PassAchievedOf points passingPoints maxPoints: #{points} of #{maxPoints} (pass at #{passingPoints})
+PassedResult: Result
+Passed: Passed
+NotPassed: Failed
+RatingTime: Marked
+RatingComment: Comment
+SubmissionUsers: Submittors
+Rating: Marking
+RatingPoints: Points
+RatingDone: Rating visible
+RatingPercent: Achieved
+RatingFiles: Marked files
+PointsNotPositive: Points may not be negative
+PointsTooHigh maxPoints: Points may not be more than #{maxPoints}
+PointsTooLow minPoints: Points may not be less than #{minPoints}
+RatingPointsDone: Correction counts as marked iff “Points” is set
+ColumnRatingPoints: Points
+Pseudonyms: Pseudonyms
+
+Files: Files
+FileTitle: Filename
+FileModified: Last changed
+VisibleFrom: Published
+AccessibleSince: Accessible since
+
+Corrected: Marked
+CorrectionAchievedPoints: Achieved points
+CorrectionAchievedPass: Passed
+FileCorrected: Marked (files)
+FileCorrectedDeleted: Marked (deleted)
+RatingUpdated: Successfully updated correction
+RatingDeleted: Successfully reset correction
+RatingFilesUpdated: Corrected files successfully overwritten
+
+RatingNotUnicode uexc: Marking file is not UTF-8 encoded: #{tshow uexc}
+RatingMissingSeparator: Preamble of the marking file could not be identified
+RatingMultiple: Correction contains multiple markings
+RatingInvalid parseErr: Marking points could not be parsed as a number: #{parseErr}
+RatingFileIsDirectory: Marking file must not be a directory
+RatingNegative: Marking points may not be negative
+RatingExceedsMax: Marking points exceed maximum
+RatingNotExpected: No marking points expected for this sheet
+RatingBinaryExpected: Marking must be 0 (=failed) or 1(=passed)
+RatingPointsRequired: Marking points required for this sheet
+RatingFile: Marking file
+
+SubmissionSinkExceptionDuplicateFileTitle file: File #{show file} occurs multiple files within zip-archive.
+SubmissionSinkExceptionDuplicateRating: Found more than one marking file
+SubmissionSinkExceptionRatingWithoutUpdate: Marking file found without permission
+SubmissionSinkExceptionForeignRating smid: Foreign marking file for submission #{toPathPiece smid} found.
+SubmissionSinkExceptionInvalidFileTitleExtension file: Filename “#{show file}” does not have any of the file extensions allowed for this sheet.
+
+MultiSinkException name error: An error occurred in submission “#{name}”: #{error}
+
+NoTableContent: No entries
+NoUpcomingSheetDeadlines: No upcoming sheets
+NoUpcomingExams difftime: No exams for your courses occurr or allow registration in the next #{difftime}
+
+AdminHeading: Administration
+AdminUserHeading: User administration
+AdminUserRightsHeading: User permissions
+AdminUserAuthHeading: User authentication
+AdminUserHeadingFor: Profile of
+AdminFor: Administrator
+LecturerFor: Lecturer
+LecturersFor: Lecturers
+AssistantFor: Assistant
+AssistantsFor: Assistants
+TutorsFor n: #{pluralEN n "Tutor" "Tutors"}
+CorrectorsFor n: #{pluralEN n "Corrector" "Correctors"}
+UserListTitle: Comprehensive list of users
+AccessRightsSaved: Successfully updated permissions
+AccessRightsNotChanged: Permissions left unchanged
+
+LecturersForN n: #{pluralEN n "Lecturer" "Lecturers"}
+
+Date: Date
+DateTimeFormat: Date and time format
+DateFormat: Date format
+TimeFormat: Time format
+DownloadFiles: Automatically download files
+DownloadFilesTip: When set, files are automatically treated as downloads. Otherwise behaviour is browser dependent (PDFs might, for example, be opened within the browser)
+WarningDays: Deadline-preview
+WarningDaysTip: How many days ahead should deadlines regarding exams etc. be displayed on the homepage?
+NotificationSettings: Desired notifications
+UserSchools: Relevant departments
+UserSchoolsTip: You will only receive department-wide notifications for the selected departments.
+FormNotifications: Notifications
+FormBehaviour: Behaviour
+FormCosmetics: Interface
+FormPersonalAppearance: Public data
+FormFieldRequiredTip: Marked fields need to be filled
+
+ActiveAuthTags: Active authorisation predicates
+
+InvalidDateTimeFormat: Invalid date and time format. YYYY-MM-DDTHH:MM[:SS] expected
+AmbiguousUTCTime: The given timestamp cannot be converted to UTC unambiguously
+IllDefinedUTCTime: The given timestamp cannot be converted to UTC
+
+LastEdits: Latest edits
+EditedBy name time: #{time} by #{name}
+LastEdit: Latest edit
+LastEditByUser: Your last edit
+NoEditByUser: Not edited by you
+
+SubmissionFilesIgnored n: Ignored #{n} #{pluralEN n "file" "files"}
+SubmissionDoesNotExist smid: There is no submission “#{toPathPiece smid}”.
+
+LDAPLoginTitle: Campus login
+PWHashLoginTitle: Uni2work login
+PWHashLoginNote: Use this form if you have received special credentials from the Uni2work-team. Most users need to use campus login!
+DummyLoginTitle: Development login
+LoginNecessary: Please log in first!
+
+InternalLdapError: Internal error during campus login
+
+CampusUserInvalidEmail: Could not determine email address during campus login
+CampusUserInvalidDisplayName: Could not determine display name during campus login
+CampusUserInvalidGivenName: Could not determine given name during campus login
+CampusUserInvalidSurname: Could not determine surname during campus login
+CampusUserInvalidTitle: Could not determine title during campus login
+CampusUserInvalidMatriculation: Could not determine matriculation during campus login
+CampusUserInvalidFeaturesOfStudy parseErr: Could not determine features of study during campus login
+CampusUserInvalidAssociatedSchools parseErr: Could not determine associated departments during campus login
+CampusUserInvalidSex: Could not determine gender during campus login
+
+CorrectorNormal: Normal
+CorrectorMissing: Missing
+CorrectorExcused: Excused
+CorrectorStateTip: Missing correctors are assigned additional corrections during later sheets. Excused correctors are not assigned any additional deficit.
+
+DayIsAHoliday tid name date: “#{name}” (#{date}) is a legal holiday
+DayIsOutOfLecture tid name date: “#{name}” (#{date}) is not within lecture period of #{tid}
+DayIsOutOfTerm tid name date: “#{name}” (#{date}) is not within #{tid}
+
+UploadModeNone: No Upload
+UploadModeAny: Upload arbitrary files
+UploadModeSpecific: Upload pre-defined files
+
+UploadModeUnpackZips: Upload multiple files
+UploadModeUnpackZipsTip: If upload of multiple files is permitted, supported archive formats are also accepted. Archives are automatically unpacked during upload.
+
+AutoUnzip: Automatically unpack ZIPs
+AutoUnzipInfo: Automatically unpacks ZIP-files (*.zip) and adds their content to the root directory.
+
+UploadModeExtensionRestriction: Allowed file extensions
+UploadModeExtensionRestrictionTip: Comma-separated. If no file extensions are specified, uploads are not restricted.
+UploadModeExtensionRestrictionEmpty: List of permitted file extensions may not be emptyy
+
+UploadSpecificFiles: Pre-defined files
+NoUploadSpecificFilesConfigured: If pre-defined files are selected, at least one file needs to be configured.
+UploadSpecificFilesDuplicateNames: Names of pre-defined files must be unique
+UploadSpecificFilesDuplicateLabels: Labels of pre-defined files must be unique
+UploadSpecificFileLabel: Label
+UploadSpecificFileName: Filename
+UploadSpecificFileRequired: Required for submission
+
+NoSubmissions: No submission
+CorrectorSubmissions: External submission via pseudonym
+UserSubmissions: Direct submission in Uni2work
+BothSubmissions: Submission either directly in Uni2work or externally via pseudonym
+
+SheetCorrectorSubmissionsTip: Submissions are expected to be handed in through some Uni2work-external procedure (usually on paper) marked with your personal pseudonym. Correctors can, using the pseudonym, register the marking in Uni2work for you to review.
+
+SubmissionNoUploadExpected: No upload of files expected.
+SubmissionReplace: Replace submission
+SubmissionCreated: Successfully created submission
+SubmissionUpdated: Successfully replaced submission
+
+AdminFeaturesHeading: Features of study
+StudyTerms: Fields of study
+StudyTerm: Field of study
+NoStudyTermsKnown: No known features of study
+StudyFeatureInference: Infer field of study mapping
+StudyFeatureInferenceNoConflicts: No observed conflicts
+StudyFeatureInferenceConflictsHeading: Fields of study with observed conflicts
+StudyFeatureAge: Semester
+StudyFeatureDegree: Degree
+FieldPrimary: Major
+FieldSecondary: Minor
+ShortFieldPrimary: Mj
+ShortFieldSecondary: Mn
+NoStudyField: No field of study
+StudyFeatureType: 
+StudyFeatureValid: Valid
+StudyFeatureUpdate: Updated
+
+DegreeKey: Degree key
+DegreeName: Degree
+DegreeShort: Degree shorthand
+StudyTermsKey: Field key
+StudyTermsName: Field of study
+StudyTermsShort: Field shorthand
+StudyTermsChangeSuccess: Successfully updated fields of study
+StudyDegreeChangeSuccess: Successfully updated degrees
+StudyCandidateIncidence: Synchronisation
+AmbiguousCandidatesRemoved n: Successfully removed #{n} ambiguous #{pluralEN n "candidate" "candidates"}
+RedundantCandidatesRemoved n: Successfully removed #{n} rendundant #{pluralEN n "candidate" "candidates"}
+CandidatesInferred n: Successfully inferred #{n} field #{pluralEN n "mapping" "mappings"}
+NoCandidatesInferred: No new mappings inferred
+AllIncidencesDeleted: Successfully deleted all observations
+StudyTermIsNew: New
+StudyFeatureConflict: Observed conflicts in field mapping
+
+MailTestFormEmail: Email address
+MailTestFormLanguages: Language settings
+
+MailTestSubject: Uni2work test email
+MailTestContent: This is a test email sent by Uni2work. No action on your part is required.
+MailTestDateTime: Test of datetime formatting:
+
+German: German
+GermanGermany: German (Germany)
+English: English
+EnglishEurope: English (Europe)
+
+MailSubjectSubmissionRated csh: Your #{csh}-submission was marked
+MailSubmissionRatedIntro courseName termDesc: Your submission for #{courseName} (#{termDesc}) was marked.
+
+MailSubjectSheetActive csh sheetName: #{sheetName} in #{csh} was released
+MailSheetActiveIntro courseName termDesc sheetName: You may now download #{sheetName} for #{courseName} (#{termDesc}).
+
+MailSubjectCourseRegistered csh: You were enrolled for #{csh}
+MailSubjectCourseRegisteredOther displayName csh: #{displayName} was enrolled for #{csh}
+MailSubjectCourseRegisteredIntro courseName termDesc: You were enrolled for the course “#{courseName}” (#{termDesc})
+MailSubjectCourseRegisteredIntroOther displayName courseName termDesc: #{displayName} was enrolled for the course “#{courseName}” (#{termDesc}).
+
+MailSubjectExamResult csh examn: Results for #{examn} in #{csh} are now available
+MailExamResultIntro courseName termDesc examn: You may now view your result for #{examn} of the course #{courseName} (#{termDesc}).
+
+MailSubjectExamOfficeExamResults csh examn: Results for #{examn} of #{courseName} are now available
+MailExamOfficeExamResultsIntro courseName termDesc examn: A course administrator has made the results for #{examn} of the course #{courseName} (#{termDesc}) available.
+
+MailSubjectExamOfficeExamResultsChanged csh examn: Results for #{examn} of #{csh} were changed
+MailExamOfficeExamResultsChangedIntro courseName termDesc examn: A course administrator has changed exam results for #{examn} of the course #{courseName} (#{termDesc}).
+
+MailSubjectExamRegistrationActive csh examn: Registration is now allowed for #{examn} of #{csh}
+MailExamRegistrationActiveIntro courseName termDesc examn: You may now register for #{examn} of the course #{courseName} (#{termDesc}).
+
+MailSubjectExamRegistrationSoonInactive csh examn: Registration for #{examn} of #{csh} ends shortly
 
 
 MenuLanguage: Language
diff --git a/src/Foundation.hs b/src/Foundation.hs
index ffe945263..b509bcd30 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -243,6 +243,15 @@ noneMoreDE num noneText someText
   | num == 0  = noneText
   | otherwise = someText
 
+pluralEN :: (Eq a, Num a)
+            =>    a -- ^ Count
+            -> Text -- ^ Singular
+            -> Text -- ^ Plural
+            -> Text
+pluralEN num singularForm pluralForm
+  | num == 1  = singularForm
+  | otherwise = pluralForm
+
 -- Convenience Type for Messages, since Yesod messages cannot deal with compound type identifiers
 type IntMaybe  = Maybe Int
 type TextList  = [Text]
diff --git a/src/Model/Migration.hs b/src/Model/Migration.hs
index b22bae8fd..f75aa2ef5 100644
--- a/src/Model/Migration.hs
+++ b/src/Model/Migration.hs
@@ -581,7 +581,7 @@ customMigrations = Map.fromListWith (>>)
     , whenM (tableExists "user") $
         [executeQQ|
           ALTER TABLE "user" ADD COLUMN "languages" jsonb;
-          UPDATE TABLE "user" SET "languages" = "mail_languages" where "mail_languages" <> '[]';
+          UPDATE "user" SET "languages" = "mail_languages" where "mail_languages" <> '[]';
           ALTER TABLE "user" DROP COLUMN "mail_languages";
         |]
     )

From 67e40fd3e71a90b13ce75be33cbad7c229b1899c Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 28 Oct 2019 10:42:24 +0100
Subject: [PATCH 020/126] feat(i18n): more en-eu

---
 messages/uniworx/en-eu.msg | 17 +++++++++++++----
 src/Foundation.hs          | 21 +++++++++++++++++++++
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index 84f27f32a..22879d45a 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -788,13 +788,13 @@ MailSheetActiveIntro courseName termDesc sheetName: You may now download #{sheet
 
 MailSubjectCourseRegistered csh: You were enrolled for #{csh}
 MailSubjectCourseRegisteredOther displayName csh: #{displayName} was enrolled for #{csh}
-MailSubjectCourseRegisteredIntro courseName termDesc: You were enrolled for the course “#{courseName}” (#{termDesc})
-MailSubjectCourseRegisteredIntroOther displayName courseName termDesc: #{displayName} was enrolled for the course “#{courseName}” (#{termDesc}).
+MailCourseRegisteredIntro courseName termDesc: You were enrolled for the course “#{courseName}” (#{termDesc})
+MailCourseRegisteredIntroOther displayName courseName termDesc: #{displayName} was enrolled for the course “#{courseName}” (#{termDesc}).
 
 MailSubjectExamResult csh examn: Results for #{examn} in #{csh} are now available
 MailExamResultIntro courseName termDesc examn: You may now view your result for #{examn} of the course #{courseName} (#{termDesc}).
 
-MailSubjectExamOfficeExamResults csh examn: Results for #{examn} of #{courseName} are now available
+MailSubjectExamOfficeExamResults csh examn: Results for #{examn} of #{csh} are now available
 MailExamOfficeExamResultsIntro courseName termDesc examn: A course administrator has made the results for #{examn} of the course #{courseName} (#{termDesc}) available.
 
 MailSubjectExamOfficeExamResultsChanged csh examn: Results for #{examn} of #{csh} were changed
@@ -803,7 +803,16 @@ MailExamOfficeExamResultsChangedIntro courseName termDesc examn: A course admini
 MailSubjectExamRegistrationActive csh examn: Registration is now allowed for #{examn} of #{csh}
 MailExamRegistrationActiveIntro courseName termDesc examn: You may now register for #{examn} of the course #{courseName} (#{termDesc}).
 
-MailSubjectExamRegistrationSoonInactive csh examn: Registration for #{examn} of #{csh} ends shortly
+MailSubjectExamRegistrationSoonInactive csh examn: The registration period for #{examn} of #{csh} ends shortly
+MailExamRegistrationSoonInactiveIntro courseName termDesc examn: Soon you will no longer be allowed to register for #{examn} of #{courseName} (#{termDesc}).
+
+MailSubjectSubmissionsUnassigned csh sheetName: Corrections for #{sheetName} of #{csh} could not be distributed
+MailSubmissionsUnassignedIntro n courseName termDesc sheetName: #{n} corrections for #{sheetName} of the course #{courseName} (#{termDesc}) could not be automatically distributed.
+
+MailSubjectSheetSoonInactive csh sheetName: The submission period for #{sheetName} of #{csh} ends shortly
+MailSheetSoonInactiveIntro courseName termDesc sheetName: Soon you will no longer be allowed to submit for #{sheetName} of the course #{courseName} (#{termDesc}).
+MailSubjectSheetInactive csh sheetName: The submission period for #{sheetName} of #{csh} has ended
+MailSheetInactiveIntro courseName termDesc sheetName n num: The submission period for #{sheetName} of the course #{courseName} (#{termDesc}) has ended. #{noneOneMoreEN num "" "One participant" (toMessage num <> " participants")}#{noneOneMoreEN n "" "" (" made " <> toMessage num)}#{noneOneMoreEN n "There were no submissions" " made one submission" " submissions"}.
 
 
 MenuLanguage: Language
diff --git a/src/Foundation.hs b/src/Foundation.hs
index b509bcd30..7d75f5a98 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -252,6 +252,27 @@ pluralEN num singularForm pluralForm
   | num == 1  = singularForm
   | otherwise = pluralForm
 
+noneOneMoreEN :: (Eq a, Num a)
+            =>    a -- ^ Count
+            -> Text -- ^ None
+            -> Text -- ^ Singular
+            -> Text -- ^ Plural
+            -> Text
+noneOneMoreEN num noneText singularForm pluralForm
+  | num == 0  = noneText
+  | num == 1  = singularForm
+  | otherwise = pluralForm
+
+noneMoreEN :: (Eq a, Num a)
+            =>    a -- ^ Count
+            -> Text -- ^ None
+            -> Text -- ^ Some
+            -> Text
+noneMoreEN num noneText someText
+  | num == 0  = noneText
+  | otherwise = someText
+
+
 -- Convenience Type for Messages, since Yesod messages cannot deal with compound type identifiers
 type IntMaybe  = Maybe Int
 type TextList  = [Text]

From 83a458ddf530941663108db705067fe129fb8bcc Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 29 Oct 2019 14:21:23 +0100
Subject: [PATCH 021/126] feat(i18n): additional en-eu

---
 messages/uniworx/de-de-formal.msg             |   26 +-
 messages/uniworx/en-eu.msg                    | 1301 ++++++++++++++++-
 src/Foundation.hs                             |   11 +
 src/Handler/Utils/Form.hs                     |   15 +-
 templates/i18n/admin-test/en-eu.hamlet        |   65 +
 templates/i18n/allocation-info/en-eu.hamlet   |   88 ++
 templates/i18n/changelog/en-eu.hamlet         |  253 ++++
 .../en-eu.hamlet                              |   27 +
 .../en-eu.hamlet                              |   25 +
 templates/i18n/data-delete/en-eu.hamlet       |   25 +
 .../computed-values-tip/en-eu.hamlet          |   23 +
 .../i18n/featureList/de-de-formal.hamlet      |    1 -
 templates/i18n/featureList/en-eu.hamlet       |    7 +
 templates/i18n/html-input/de-de-formal.hamlet |    5 +-
 templates/i18n/html-input/en-eu.hamlet        |   10 +
 .../i18n/implementation/de-de-formal.hamlet   |    4 +-
 templates/i18n/implementation/en-eu.hamlet    |   30 +
 templates/i18n/knownBugs/en-eu.hamlet         |    6 +
 .../i18n/profile-remarks/de-de-formal.hamlet  |   25 +-
 templates/i18n/profile-remarks/en-eu.hamlet   |   24 +
 .../profile/displayNameRules/en-eu.hamlet     |    9 +
 .../tokenExplanation/de-de-formal.hamlet      |    8 +-
 .../profile/tokenExplanation/en-eu.hamlet     |   17 +
 .../set-display-email/de-de-formal.hamlet     |    3 +-
 templates/i18n/set-display-email/en-eu.hamlet |    5 +
 templates/i18n/sheet-edit/de-de-formal.hamlet |    9 +-
 templates/i18n/sheet-edit/en-eu.hamlet        |   24 +
 .../table/csv-import-explanation/en-eu.hamlet |   54 +
 .../i18n/unauth-home/de-de-formal.hamlet      |    5 +-
 templates/i18n/unauth-home/en-eu.hamlet       |    6 +
 30 files changed, 2049 insertions(+), 62 deletions(-)
 create mode 100644 templates/i18n/admin-test/en-eu.hamlet
 create mode 100644 templates/i18n/allocation-info/en-eu.hamlet
 create mode 100644 templates/i18n/changelog/en-eu.hamlet
 create mode 100644 templates/i18n/corrections-upload-instructions/en-eu.hamlet
 create mode 100644 templates/i18n/course-exam-office-explanation/en-eu.hamlet
 create mode 100644 templates/i18n/data-delete/en-eu.hamlet
 create mode 100644 templates/i18n/exam-users/computed-values-tip/en-eu.hamlet
 create mode 100644 templates/i18n/featureList/en-eu.hamlet
 create mode 100644 templates/i18n/html-input/en-eu.hamlet
 create mode 100644 templates/i18n/implementation/en-eu.hamlet
 create mode 100644 templates/i18n/knownBugs/en-eu.hamlet
 create mode 100644 templates/i18n/profile-remarks/en-eu.hamlet
 create mode 100644 templates/i18n/profile/displayNameRules/en-eu.hamlet
 create mode 100644 templates/i18n/profile/tokenExplanation/en-eu.hamlet
 create mode 100644 templates/i18n/set-display-email/en-eu.hamlet
 create mode 100644 templates/i18n/sheet-edit/en-eu.hamlet
 create mode 100644 templates/i18n/table/csv-import-explanation/en-eu.hamlet
 create mode 100644 templates/i18n/unauth-home/en-eu.hamlet

diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index 0a00e838e..e665c10f7 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -868,9 +868,9 @@ MailSubjectExamOfficeUserInvitation displayName@Text: Berücksichtigung von Prü
 MailSubjectPasswordReset: Uni2work-Passwort ändern bzw. setzen
 
 SheetGrading: Bewertung
-SheetGradingPoints maxPoints@Points: #{maxPoints} Punkte
-SheetGradingPassPoints maxPoints@Points passingPoints@Points: Bestanden ab #{passingPoints} von #{maxPoints} Punkten
-SheetGradingPassBinary:  Bestanden/Nicht Bestanden
+SheetGradingPoints maxPoints@Points: #{maxPoints} #{pluralDE maxPoints "Punkt" "Punkte"}
+SheetGradingPassPoints maxPoints@Points passingPoints@Points: Bestanden ab #{passingPoints} von #{maxPoints} #{pluralDE maxPoints "Punkt" "Punkten"}
+SheetGradingPassBinary: Bestanden/Nicht Bestanden
 SheetGradingInfo: "Bestanden nach Punkten" zählt sowohl zur maximal erreichbaren Gesamtpunktzahl also auch zur Anzahl der zu bestehenden Blätter.
 
 SheetGradingCount': Anzahl
@@ -924,10 +924,10 @@ NotificationTriggerExamRegistrationSoonInactive: Ich kann mich bald nicht mehr f
 NotificationTriggerExamDeregistrationSoonInactive: Ich kann mich bald nicht mehr von einer Prüfung abmelden
 NotificationTriggerExamResult: Ich kann ein neues Prüfungsergebnis einsehen
 NotificationTriggerAllocationStaffRegister: Ich kann Kurse bei einer neuen Zentralanmeldung eintragen 
-NotificationTriggerAllocationAllocation: Ich kann Zentralanmeldung-Bewerbungen für einen meiner Kurse bewerten
+NotificationTriggerAllocationAllocation: Ich kann Zentralanmeldungs-Bewerbungen für einen meiner Kurse bewerten
 NotificationTriggerAllocationRegister: Ich kann mich bei einer neuen Zentralanmeldung bewerben
-NotificationTriggerAllocationOutdatedRatings: Zentralanmeldung-Bewerbungen für einen meiner Kurse wurden verändert, nachdem sie bewertet wurden
-NotificationTriggerAllocationUnratedApplications: Bewertungen zu Zentralanmeldung-Bewerbungen für einen meiner Kurse stehen aus
+NotificationTriggerAllocationOutdatedRatings: Zentralanmeldungs-Bewerbungen für einen meiner Kurse wurden verändert, nachdem sie bewertet wurden
+NotificationTriggerAllocationUnratedApplications: Bewertungen zu Zentralanmeldungs-Bewerbungen für einen meiner Kurse stehen aus
 NotificationTriggerAllocationResults: Plätze wurden für eine meiner Zentralanmeldungen verteilt
 NotificationTriggerExamOfficeExamResults: Ich kann neue Prüfungsergebnisse einsehen
 NotificationTriggerExamOfficeExamResultsChanged: Prüfungsergebnisse wurden verändert
@@ -1041,7 +1041,6 @@ EncodedSecretBoxCouldNotDecodeNonce: Konnte secretbox-nonce nicht dekodieren
 EncodedSecretBoxCouldNotOpenSecretBox: Konnte libsodium-secretbox nicht öffnen (Verschlüsselte Daten sind nicht authentisch)
 EncodedSecretBoxCouldNotDecodePlaintext aesonErr@String: Konnte Klartext nicht JSON-dekodieren: #{aesonErr}
 ErrMsgHeading: Fehlermeldung entschlüsseln
-ErrorCryptoIdMismatch: Verschlüsselte Id der Abgabe passte nicht zu anderen Daten
 
 InvalidRoute: Konnte URL nicht interpretieren
 
@@ -1122,7 +1121,7 @@ MenuExamAddMembers: Prüfungsteilnehmer hinzufügen
 MenuExamOfficeExams: Prüfungen
 MenuExamOfficeFields: Fächer
 MenuExamOfficeUsers: Benutzer
-MenuLecturerInvite: Dozenten hinzufügen
+MenuLecturerInvite: Funktionäre hinzufügen
 MenuAllocationInfo: Hinweise zum Ablauf einer Zentralanmeldung
 MenuCourseApplicationsFiles: Dateien aller Bewerbungen
 MenuSchoolList: Institute
@@ -1262,7 +1261,7 @@ RGTutorialParticipants: Tutorium-Teilnehmer
 
 MultiSelectFieldTip: Mehrfach-Auswahl ist möglich (Umschalt bzw. Strg)
 MultiEmailFieldTip: Es sind mehrere, Komma-separierte, E-Mail-Addressen möglich
-EmailInvitationWarning: Dem System ist kein Nutzer mit dieser Addresse bekannt. Es wird eine Einladung per E-Mail versandt.
+EmailInvitationWarning: Es konnte kein Nutzer mit dieser Addresse im System gefunden werden (ggf. unter gewissen Einschränkungen). Es wird eine Einladung per E-Mail versandt.
 
 LecturerInvitationAccepted lType@Text csh@CourseShorthand: Sie wurden als #{lType} für #{csh} eingetragen
 LecturerInvitationDeclined csh@CourseShorthand: Sie haben die Einladung, Kursverwalter für #{csh} zu werden, abgelehnt
@@ -1355,7 +1354,7 @@ TutorialTutorControlled: Tutoren dürfen Tutorium editieren
 TutorialTutorControlledTip: Sollen Tutoren beliebige Aspekte dieses Tutoriums (Name, Registrierungs-Gruppe, Raum, Zeit, andere Tutoren, ...) beliebig editieren dürfen?
 
 CourseExams: Prüfungen
-CourseTutorials: Übungen
+CourseTutorials: Tutorien
 
 ParticipantsN n@Int: #{n} Teilnehmer
 TutorialDeleteQuestion: Wollen Sie das unten aufgeführte Tutorium wirklich löschen?
@@ -1478,7 +1477,7 @@ ExamBonusRoundNonPositive: Vielfaches, auf das gerundet werden soll, muss positi
 ExamBonusRoundTip: Bonuspunkte werden kaufmännisch auf ein Vielfaches der angegeben Zahl gerundet.
 
 ExamAutomaticOccurrenceAssignment: Automatische Termin- bzw. Raumzuteilung
-ExamAutomaticOccurrenceAssignmentTip: Sollen Prüfungsteilnehmer zum Zeitpunkt der Bekanntgabe der Raum- bzw. Terminzuteilung automatisch auf die zur Verfügung stehenden Räume bzw. Termine verteilt werden? Manuelle Umverteilung bzw. vorheriges Festlegen von Zuteilungen einzelner Teilnehmer ist trotzdem möglich.
+ExamAutomaticOccurrenceAssignmentTip: Sollen Prüfungsteilnehmer automatisch auf die zur Verfügung stehenden Räume bzw. Termine verteilt werden? Manuelle Umverteilung bzw. vorheriges Festlegen von Zuteilungen einzelner Teilnehmer ist trotzdem möglich.
 ExamOccurrenceRule: Verfahren
 ExamOccurrenceRuleParticipant: Termin- bzw. Raumzuteilungsverfahren
 ExamRoomManual': Keine automatische Zuteilung
@@ -1523,7 +1522,7 @@ ExamPartName: Titel
 ExamPartNameTip: Wird den Studierenden angezeigt
 ExamPartMaxPoints: Maximalpunktzahl
 ExamPartWeight: Gewichtung
-ExamPartWeightTip: Wird vor Anzeige oder Notenberechnung mit der erreichten Punktzahl und der Maximalpunktzahl multipliziert; Änderungen hier passen auch bestehende Korrekturergebnisse an
+ExamPartWeightTip: Wird vor Anzeige oder automatischen Notenberechnung mit der erreichten Punktzahl und der Maximalpunktzahl multipliziert; Änderungen hier passen also auch bestehende Korrekturergebnisse an (derart geänderte Noten müssen erneut manuell übernommen werden)
 ExamPartResultPoints: Erreichte Punkte
 
 ExamNameTaken exam@ExamName: Es existiert bereits eine Prüfung mit Namen #{exam}
@@ -1945,7 +1944,7 @@ AcceptApplicationsSecondaryRandom: Zufällig
 AcceptApplicationsSecondaryTime: Nach Zeitpunkt der Bewerbung
 
 CsvOptions: CSV-Optionen
-CsvOptionsTip: Diese Einstellungen betreffen nur den CSV-Export; beim Import werden die verwendeten Einstellungen automatisch ermittelt. Als Zeichenkodierung wird beim Import stets Unicode erwartet.
+CsvOptionsTip: Diese Einstellungen betreffen primär den CSV-Export; beim Import werden die meisten Einstellungen automatisch ermittelt. Als Zeichenkodierung wird beim Import die selbe Kodierung wie beim Export erwartet.
 CsvFormatOptions: Dateiformat
 CsvTimestamp: Zeitstempel
 CsvTimestampTip: Soll an den Namen jeder exportierten CSV-Datei ein Zeitstempel vorne angehängt werden?
@@ -1964,6 +1963,7 @@ CsvDelimiterNull: Null-Byte
 CsvDelimiterTab: Tabulator
 CsvDelimiterComma: Komma
 CsvDelimiterColon: Doppelpunkt
+CsvDelimiterSemicolon: Strichpunkt
 CsvDelimiterBar: Senkrechter Strich
 CsvDelimiterSpace: Leerzeichen
 CsvDelimiterUnitSep: Teilgruppentrennzeichen
diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index 22879d45a..bfa5628c2 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -1,4 +1,4 @@
-
+PrintDebugForStupid name@Text: Debug message "#{name}"
 
 Logo: Uni2work
 
@@ -182,20 +182,20 @@ CourseApplicationInstructionsApplication: Instructions for application
 CourseApplicationInstructionsRegistration: Instructions for registration
 CourseApplicationTemplateApplication: Application template(s)
 CourseApplicationTemplateRegistration: Registration template(s)
-CourseApplicationTemplateArchiveName tid@TermId ssh@SchoolId csh@CourseShorthand: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-application-templates
+CourseApplicationTemplateArchiveName tid ssh csh: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-application-templates
 CourseApplication: Application
 CourseApplicationIsParticipant: Course participant
 
 CourseApplicationExists: You already applied for this course
 CourseApplicationInvalidAction: Invalid action
-CourseApplicationCreated csh@CourseShorthand: Successfully applied for #{csh}
-CourseApplicationEdited csh@CourseShorthand: Successfully changed application for #{csh}
-CourseApplicationNotEdited csh@CourseShorthand: Application for #{csh} not changed
+CourseApplicationCreated csh: Successfully applied for #{csh}
+CourseApplicationEdited csh: Successfully changed application for #{csh}
+CourseApplicationNotEdited csh: Application for #{csh} not changed
 CourseApplicationRated: Successfully edited rating
 CourseApplicationRatingDeleted: Successfully deleted rating
-CourseApplicationDeleted csh@CourseShorthand: Successfully withdrew application for #{csh}
+CourseApplicationDeleted csh: Successfully withdrew application for #{csh}
 
-CourseApplicationTitle displayName@Text csh@CourseShorthand: Application for #{csh}: #{displayName}
+CourseApplicationTitle displayName csh: Application for #{csh}: #{displayName}
 
 CourseApplicationText: Application text
 CourseApplicationFollowInstructions: Please follow the instructions for applications!
@@ -287,6 +287,7 @@ SheetGroup: Group submission
 SheetVisibleFrom: Visible from (for participants)
 SheetVisibleFromTip: Always invisible for participants and no submission possible if left empty; only leave this field empty for temporary/unfinished sheets
 SheetActiveFrom: Submission period start
+SheetActiveFromTip: The exercise sheet will only be available for download starting at this time
 SheetActiveTo: Submission period end
 SheetHintFromTip: Always invisible for participants if left empty; correctors can always download hints
 SheetSolutionFromTip: Always invisible for participants if left empty; correctors can always download solutions
@@ -369,7 +370,8 @@ UnauthorizedNot r: (NOT #{r})
 UnauthorizedNoToken: No authorisation-token was provided with your request.
 UnauthorizedTokenExpired: Your authorisation-token is expired.
 UnauthorizedTokenNotStarted: Your authorisation-token is not yet valid.
-UnauthorizedTokenInvalid: Your authorisation-taken could not be processed.
+UnauthorizedTokenInvalid: Your authorisation-token could not be processed.
+UnauthorizedTokenInvalidRoute: Your authorisation-token is not valid for this page.
 UnauthorizedTokenInvalidAuthority: Your authorisation-token is based in an user's rights who does not exist anymore.
 UnauthorizedToken404: Authorisation-tokens cannot be processed on error pages.
 UnauthorizedSiteAdmin: You are no system-wide administrator.
@@ -401,6 +403,8 @@ UnauthorizedExamTime: This exam is not currently available.
 UnauthorizedSubmissionOwner: You are no submittor for this submission.
 UnauthorizedSubmissionRated: This submission is not yet marked.
 UnauthorizedSubmissionCorrector: You are no corrector for this submission.
+UnauthorizedUserSubmission: Users may not directly submit for this exercise sheet.
+UnauthorizedCorrectorSubmission: Correctors may not create submissions for this exercise sheet.
 OnlyUploadOneFile: Please only upload one file
 DeprecatedRoute: This view is deprecated and will be removed.
 UnfreeMaterials: Course material are not publicly accessable.
@@ -457,7 +461,7 @@ CorrectorsPlaceholder: Correctors...
 CorrectorsDefaulted: List of correctors was automatically generated based on those of preceding sheets for this course. No data has been saved, yet.
 
 Users: Users
-HomeHeading: Current events
+HomeHeading: Home
 LoginHeading: Authentication
 LoginTitle: Authentication
 ProfileHeading: Settings
@@ -620,7 +624,7 @@ MultiSinkException name error: An error occurred in submission “#{name}”: #{
 
 NoTableContent: No entries
 NoUpcomingSheetDeadlines: No upcoming sheets
-NoUpcomingExams difftime: No exams for your courses occurr or allow registration in the next #{difftime}
+NoUpcomingExams difftime: No exams for your courses occur or allow registration in the next #{difftime}
 
 AdminHeading: Administration
 AdminUserHeading: User administration
@@ -688,7 +692,7 @@ CampusUserInvalidTitle: Could not determine title during campus login
 CampusUserInvalidMatriculation: Could not determine matriculation during campus login
 CampusUserInvalidFeaturesOfStudy parseErr: Could not determine features of study during campus login
 CampusUserInvalidAssociatedSchools parseErr: Could not determine associated departments during campus login
-CampusUserInvalidSex: Could not determine gender during campus login
+CampusUserInvalidSex: Could not determine sex during campus login
 
 CorrectorNormal: Normal
 CorrectorMissing: Missing
@@ -765,6 +769,7 @@ RedundantCandidatesRemoved n: Successfully removed #{n} rendundant #{pluralEN n
 CandidatesInferred n: Successfully inferred #{n} field #{pluralEN n "mapping" "mappings"}
 NoCandidatesInferred: No new mappings inferred
 AllIncidencesDeleted: Successfully deleted all observations
+IncidencesDeleted n: Successfully deleted #{show n} #{pluralEN n "observation" "observations"}
 StudyTermIsNew: New
 StudyFeatureConflict: Observed conflicts in field mapping
 
@@ -806,6 +811,9 @@ MailExamRegistrationActiveIntro courseName termDesc examn: You may now register
 MailSubjectExamRegistrationSoonInactive csh examn: The registration period for #{examn} of #{csh} ends shortly
 MailExamRegistrationSoonInactiveIntro courseName termDesc examn: Soon you will no longer be allowed to register for #{examn} of #{courseName} (#{termDesc}).
 
+MailSubjectExamDeregistrationSoonInactive csh examn: Deregistration for #{examn} in #{csh} ends shortly
+MailExamDeregistrationSoonInactiveIntro courseName termDesc examn: Soon you will no longer be allowed to deregister from #{examn} of #{courseName} (#{termDesc}).
+
 MailSubjectSubmissionsUnassigned csh sheetName: Corrections for #{sheetName} of #{csh} could not be distributed
 MailSubmissionsUnassignedIntro n courseName termDesc sheetName: #{n} corrections for #{sheetName} of the course #{courseName} (#{termDesc}) could not be automatically distributed.
 
@@ -814,6 +822,1277 @@ MailSheetSoonInactiveIntro courseName termDesc sheetName: Soon you will no longe
 MailSubjectSheetInactive csh sheetName: The submission period for #{sheetName} of #{csh} has ended
 MailSheetInactiveIntro courseName termDesc sheetName n num: The submission period for #{sheetName} of the course #{courseName} (#{termDesc}) has ended. #{noneOneMoreEN num "" "One participant" (toMessage num <> " participants")}#{noneOneMoreEN n "" "" (" made " <> toMessage num)}#{noneOneMoreEN n "There were no submissions" " made one submission" " submissions"}.
 
+MailSubjectCorrectionsAssigned csh sheetName: You were assigned corrections for #{sheetName} of #{csh}
+MailCorrectionsAssignedIntro courseName termDesc sheetName n: You were assigned #{n} #{pluralEN n "correction" "corrections"} for #{sheetName} of #{courseName} (#{termDesc}).
+
+MailSubjectUserRightsUpdate name: Permissions for #{name} changed
+MailUserRightsIntro name email: #{name} <#{email}> now has the following permissions:
+MailNoLecturerRights: You don't currently have lecturer permissions for any department.
+MailLecturerRights n: As a lecturer you may create new courses within your #{pluralEN n "department" "departments"}.
+
+MailSubjectUserAuthModeUpdate: Your Uni2work login
+UserAuthModePWHashChangedToLDAP: You can now log in to Uni2work using your Campus-account
+UserAuthModeLDAPChangedToPWHash: You can now log in to Uni2work using your Uni2work-internal account
+NewPasswordLinkTip: You can set the password for your Uni2work-internal account on the following page:
+NewPasswordLink: Set password
+AuthPWHashTip: You now need to use the login form labeled "Uni2work login". Please ensure that you have already set a password when you try to log in.
+PasswordResetEmailIncoming: For security reasons you will receive a link to the page on which you can set and later change your password in a separate email.
+
+MailEditNotifications: Enable/Disable notifications
+MailSubjectSupport: Support request
+MailSubjectSupportCustom customSubject: [Support] #{customSubject}
+
+CommCourseSubject: Course message
+MailSubjectLecturerInvitation tid ssh csh: [#{tid}-#{ssh}-#{csh}] Invitation to be a course administrator
+InvitationAcceptDecline: Accept/Decline invitation
+InvitationFromTip displayName: You are receiving this invitation because #{displayName} has caused it to be sent from within Uni2work.
+InvitationUniWorXTip: Uni2work is a web based teaching management system at LMU Munich.
+
+MailSubjectParticipantInvitation tid ssh csh: [#{tid}-#{ssh}-#{csh}] Invitation to be a course participant
+
+MailSubjectCorrectorInvitation tid ssh csh shn: [#{tid}-#{ssh}-#{csh}] Invitation to be a corrector for #{shn}
+
+MailSubjectTutorInvitation tid ssh csh tutn: [#{tid}-#{ssh}-#{csh}] Invitation to be a tutor for #{tutn}
+
+MailSubjectExamCorrectorInvitation tid ssh csh examn: [#{tid}-#{ssh}-#{csh}] Invitation to be a corrector for #{examn}
+
+MailSubjectExamRegistrationInvitation tid ssh csh examn: [#{tid}-#{ssh}-#{csh}] Invitation to be a participant of #{examn}
+
+MailSubjectSubmissionUserInvitation tid ssh csh shn: [#{tid}-#{ssh}-#{csh}] Invitation to participate in a submission for #{shn}
+
+MailSubjectExamOfficeUserInvitation displayName: Consideration of your exam achievements within Uni2work
+
+MailSubjectPasswordReset: Set/Change Uni2work password
+
+SheetGrading: Marking
+SheetGradingPoints maxPoints: #{maxPoints} #{pluralEN maxPoints "point" "points"}
+SheetGradingPassPoints maxPoints passingPoints: Pass with #{passingPoints} of #{maxPoints} #{pluralEN maxPoints "point" "points"}
+SheetGradingPassBinary: Pass/Fail
+SheetGradingInfo: "Passing by points" counts both towards the maximum achievable number of points and towards the number of sheets that can be passed.
+
+SheetGradingCount': Number
+SheetGradingPoints': Points
+SheetGradingPassing': Passing
+SheetGradingPassPoints': Passing by points
+SheetGradingPassBinary': Pass/Fail
+
+SheetTypeBonus grading: Bonus
+SheetTypeNormal grading: Normal
+SheetTypeInformational grading: Informational
+SheetTypeNotGraded: Not marked
+SheetTypeInfoNotGraded: "Not marked" means that there will be no feedback at all.
+SheetTypeInfoBonus: Sheets marked "bonus" count normally but do not increase either the maximum number of points or the count of sheets that can be passed.
+SheetTypeInfoInformational: Sheets marked "informational" do not counted anywhere. They are marked only as feedback for participants.
+SheetGradingBonusIncluded: Achieved bonus points are already counted among the achieved normal Their marking points.
+SummaryTitle: Summary of
+SheetGradingSummaryTitle intgr: #{intgr} #{pluralEN intgr "sheet" "sheets"}
+SubmissionGradingSummaryTitle intgr: #{intgr} #{pluralEN intgr "submission" "submissions"}
+
+SheetTypeBonus': Bonus
+SheetTypeNormal': Normal
+SheetTypeInformational': Informational
+SheetTypeNotGraded': Not marked
+
+SheetGradingMaxPoints: Maximum number of points
+SheetGradingPassingPoints: Points necessary to pass
+
+SheetGroupArbitrary: Arbitrary groups
+SheetGroupRegisteredGroups: Registered groups
+SheetGroupNoGroups: No group submission
+SheetGroupMaxGroupsize: Maximum group size
+
+SheetFiles: Exercise sheet files
+SheetFileTypeHeader: Belongs to
+
+SheetArchiveName tid ssh csh shn: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-#{foldedCase shn}
+SheetTypeArchiveName tid ssh csh shn renderedSft: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-#{foldedCase shn}-#{foldCase renderedSft}
+
+NotificationTriggerSubmissionRatedGraded: My submission for an exercise sheet was marked (not purely informational)
+NotificationTriggerSubmissionRated: My submission for an exercise sheet was marked
+NotificationTriggerSheetActive: I can now download a new exercise sheet
+NotificationTriggerSheetSoonInactive: I will soon no longer be able to submit for an exercise sheet
+NotificationTriggerSheetInactive: The submission period for one of my exercise sheets is over
+NotificationTriggerCorrectionsAssigned: I was assigned corrections
+NotificationTriggerCorrectionsNotDistributed: Not all submissions for one of my exercise sheets could be assigned a corrector
+NotificationTriggerUserRightsUpdate: My permissions changed
+NotificationTriggerUserAuthModeUpdate: My login mode changed
+NotificationTriggerExamRegistrationActive: I can now register for an exam
+NotificationTriggerExamRegistrationSoonInactive: I will soon no longer be able to register for an exam
+NotificationTriggerExamDeregistrationSoonInactive: I will soon no longer be able to deregister from an exam
+NotificationTriggerExamResult: An exam result is available
+NotificationTriggerAllocationStaffRegister: I can now register a course for central allocation
+NotificationTriggerAllocationAllocation: I can now grade applications to a central alloction for one of my courses
+NotificationTriggerAllocationRegister: I can now apply to a new central allocation
+NotificationTriggerAllocationOutdatedRatings: Applications to a central allocation for one of my courses have changed since they were graded
+NotificationTriggerAllocationUnratedApplications: Grades are pending for applications to a central allocation for one of my courses
+NotificationTriggerAllocationResults: Participants have been placed by one of my central allocations
+NotificationTriggerExamOfficeExamResults: New exam results are available
+NotificationTriggerExamOfficeExamResultsChanged: Exam results have changed
+NotificationTriggerCourseRegistered: A course administrator has enrolled me in a course
+
+NotificationTriggerKindAll: For all users
+NotificationTriggerKindCourseParticipant: For course participants
+NotificationTriggerKindExamParticipant: For exam participants
+NotificationTriggerKindCorrector: For correctors
+NotificationTriggerKindLecturer: For lecturers
+NotificationTriggerKindCourseLecturer: For course administrators
+NotificationTriggerKindAdmin: For administrators
+NotificationTriggerKindExamOffice: For the exam office
+NotificationTriggerKindEvaluation: For course evaluations
+NotificationTriggerKindAllocationStaff: For central allocations (lecturers)
+NotificationTriggerKindAllocationParticipant: For central allocations
+
+CorrCreate: Create submissions
+UnknownPseudonymWord pseudonymWord: Invalid pseudonym-word “#{pseudonymWord}”
+InvalidPseudonym pseudonym: Invalid pseudonym “#{pseudonym}”
+InvalidPseudonymSubmissionIgnored oPseudonyms iPseudonym: The submission with pseudonyms “#{oPseudonyms}” has been ignored since “#{iPseudonym}” could not be automatically corrected to be a valid pseudonym.
+PseudonymAutocorrections: Suggestions:
+UnknownPseudonym pseudonym: Unknown pseudonym “#{pseudonym}”
+CorrectionPseudonyms: Pseudonyms
+CorrectionPseudonymsTip: One submission per line. For group submissions include multiple pseudonyms (comma-separated) per line. Typos may be automatically corrected.
+PseudonymSheet: Exercise sheet
+CorrectionPseudonymSheet termDesc csh shn: #{termDesc} » #{csh} » #{shn}
+SheetGroupTooLarge sheetGroupDesc: Submission group to large: #{sheetGroupDesc}
+SheetNoRegisteredGroup sheetGroupDesc: “#{sheetGroupDesc}” are not registered as a submission group
+SheetAmbiguousRegisteredGroup sheetGroupDesc: “#{sheetGroupDesc}” contains members of multiple submission groups
+SheetNoGroupSubmission sheetGroupDesc: Group submission is not allowed for this exercise sheet (#{sheetGroupDesc})
+SheetDuplicatePseudonym: The following pseudonyms occurred multiple times. All occurrances except the first have been ignored:
+SheetCreateExisting: The following pseudonyms have already submitted:
+
+CorrGrade: Mark submissions
+
+UserAccountDeleted name: User account for #{name} was deleted!
+UserSubmissionsDeleted n: #{tshow n} #{pluralEN n "submission was" "submissions were"} permanently deleted.
+UserGroupSubmissionsKept n: #{tshow n} #{pluralEN n "group submission was" "group submissions were"} kept. They are no longer associated with the deleted user. Group submissions can thus become as if made by a single user. Such submissions are deleted together with their last user.
+UserSubmissionGroupsDeleted count: #{tshow count} #{pluralEN count "submission group was" "submission groups were"} deleted since #{pluralEN count "it" "they"} would have become empty.
+UserAccountDeleteWarning: Caution, this permanently deletes users and all of their associated data. Exam results must be stored long term!
+
+HelpTitle: Support
+HelpAnswer: Send answers to
+HelpUser: My user account
+HelpAnonymous: Send no answers (anonymous)
+HelpEmail: Email
+HelpSubject: Subject
+HelpRequest: Support request / Suggestion
+HelpProblemPage: Problematic page
+HelpIntroduction: If you have trouble using this website or if you find something that could be improved, please contact us even if you were already able to solve your problem by yourself! We are continually making changes and try to keep the site as intuitive as possible even for new users.
+HelpSent: Your support request has been sent.
+
+InfoLecturerTitle: Information for lecturers
+
+SystemMessageFrom: Visible from
+SystemMessageTo: Visible to
+SystemMessageAuthenticatedOnly: Only logged in users
+SystemMessageSeverity: Severity
+SystemMessageId: Id
+SystemMessageSummaryContent: Summary / Content
+SystemMessageSummary: Summary
+SystemMessageContent: Content
+SystemMessageLanguage: Language
+
+SystemMessageDelete: Delete
+SystemMessageActivate: Set to be visible
+SystemMessageDeactivate: Set to be invisible
+SystemMessageTimestamp: Timestamp
+
+SystemMessagesDeleted: System messages deleted:
+SystemMessagesActivated: System messages set to become visible at:
+SystemMessagesDeactivated: System messages set to become invisable at:
+SystemMessageEmptySelection: No system messages selected
+SystemMessageAdded sysMsgId: System message added: #{toPathPiece sysMsgId}
+SystemMessageEdit: Edit system message
+SystemMessageEditTranslations: Edit translations
+SystemMessageAddTranslation: Add translation
+
+SystemMessageEditSuccess: Successfully edited system message.
+SystemMessageAddTranslationSuccess: Successfully added translation.
+SystemMessageEditTranslationSuccess: Successfully edited translation.
+SystemMessageDeleteTranslationSuccess: Successfully deleted translation.
+
+MessageError: Error
+MessageWarning: Warning
+MessageInfo: Information
+MessageSuccess: Success
+
+InvalidLangFormat: Invalid language code (RFC1766)
+
+ErrorResponseTitleNotFound: Resource not found
+ErrorResponseTitleInternalError internalError@Text: An internal error occurred
+ErrorResponseTitleInvalidArgs invalidArgs@Texts: Request contained invalid arguments
+ErrorResponseTitleNotAuthenticated: Request requires authentication
+ErrorResponseTitlePermissionDenied permissionDenied@Text: Permission denied
+ErrorResponseTitleBadMethod requestMethod@Method: HTTP-method not supported
+
+UnknownErrorResponse: An error has occurred that could not be further classified:
+ErrorResponseNotFound: No page could be found under the url requested by your browser.
+ErrorResponseNotAuthenticated: To be granted access to most parts of Uni2work you need to login first.
+ErrorResponseBadMethod requestMethodText@Text: Your browser can interact in multiple ways with the resources offered by Uni2work. The requested method (#{requestMethodText}) is not supported here.
+
+ErrorResponseEncrypted: In order not to reveal sensitive information further details have been encrypted. If you send a support request, please include the encrypted data listed below.
+ErrMsgCiphertext: Encrypted error message
+EncodedSecretBoxCiphertextTooShort: Encrypted data are too short to be valid
+EncodedSecretBoxInvalidBase64 base64Err@String: Encrypted data ar not correctly base64url-encoded: #{base64Err}
+EncodedSecretBoxInvalidPadding: Encrypted data are not padded correctly
+EncodedSecretBoxCouldNotDecodeNonce: Could not decode secretbox-nonce
+EncodedSecretBoxCouldNotOpenSecretBox: Could not open libsodium-secretbox (Encrypted data are not authentic)
+EncodedSecretBoxCouldNotDecodePlaintext aesonErr@String: Could not decode json cleartext: #{aesonErr}
+ErrMsgHeading: Decrypt error message
+
+InvalidRoute: Could not interpret url
+
+MenuOpenCourses: Courses with open registration
+MenuOpenAllocations: Active central allocations
+MenuHome: Home
+MenuInformation: Information
+MenuImpressum: Imprint
+MenuDataProt: Data protection
+MenuVersion: Version history
+MenuInstance: Instance identification
+MenuHealth: Instance health
+MenuHelp: Support
+MenuProfile: Settings
+MenuLogin: Login
+MenuLogout: Logout
+MenuAllocationList: Central allocations
+MenuCourseList: Courses
+MenuCourseMembers: Participants
+MenuCourseAddMembers: Add participants
+MenuCourseCommunication: Course message (email)
+MenuCourseApplications: Applications
+MenuCourseExamOffice: Exam offices
+MenuTermShow: Semesters
+MenuSubmissionDelete: Delete submission
+MenuUsers: User
+MenuUserAdd: Add user
+MenuUserNotifications: Notification settings
+MenuUserPassword: Password
+MenuAdminTest: Admin-demo
+MenuMessageList: System messages
+MenuAdminErrMsg: Decrypt error message
+MenuProfileData: Personal information
+MenuTermCreate: Create new semester 
+MenuCourseNew: Create new course
+MenuTermEdit: Edit semester
+MenuTermCurrent: Current semester
+MenuCorrection: Marking
+MenuCorrections: Corrections
+MenuCorrectionsOwn: My corrections
+MenuSubmissions: Submissions
+MenuSheetList: Exercise sheets
+MenuMaterialList: Material
+MenuMaterialNew: Publish new material
+MenuMaterialEdit: Edit material
+MenuMaterialDelete: Delete material
+MenuTutorialList: Tutorials
+MenuTutorialNew: Create new tutorial
+MenuSheetNew: Create new exercise sheet
+MenuSheetCurrent: Current exercise sheet
+MenuSheetOldUnassigned: Submissions without corrector
+MenuCourseEdit: Edit course
+MenuCourseClone: Clone course
+MenuCourseDelete: Delete course
+MenuSubmissionNew: Create submission
+MenuSubmissionOwn: Submission
+MenuCorrectors: Correctors
+MenuCorrectorsChange: Adjust correctors
+MenuSheetEdit: Edit exercise sheet
+MenuSheetDelete: Delete exercise sheet
+MenuSheetClone: Clone exercise sheet
+MenuCorrectionsUpload: Upload corrections
+MenuCorrectionsDownload: Download corrections
+MenuCorrectionsCreate: Register submissions
+MenuCorrectionsGrade: Mark submissions online
+MenuCorrectionsAssign: Assign corrections
+MenuCorrectionsAssignSheet name@Text: Assign corrections for #{name}
+MenuAuthPreds: Authorisation settings
+MenuTutorialDelete: Delete tutorial
+MenuTutorialEdit: Edit tutorial
+MenuTutorialComm: Send course message
+MenuExamList: Exams
+MenuExamNew: Create new exam
+MenuExamEdit: Edit
+MenuExamUsers: Participants
+MenuExamGrades: Exam results
+MenuExamAddMembers: Add exam participants
+MenuExamOfficeExams: Exams
+MenuExamOfficeFields: Fields of study
+MenuExamOfficeUsers: Users
+MenuLecturerInvite: Add functionaries
+MenuAllocationInfo: Information regarding central allocations
+MenuCourseApplicationsFiles: Files of all applications
+MenuSchoolList: Departments
+MenuSchoolNew: Create new department
+MenuCourseNewsNew: Add course news
+MenuCourseNewsEdit: Edit course news
+MenuCourseEventNew: New course occurrence
+MenuCourseEventEdit: Edit course occurrence
+
+BreadcrumbSubmissionFile: File
+BreadcrumbSubmissionUserInvite: Invitation to participate in a submission
+BreadcrumbCryptoIDDispatch: CryptoID-redirect
+BreadcrumbCourseAppsFiles: Application files
+BreadcrumbCourseNotes: Course notes
+BreadcrumbHiWis: Correctors
+BreadcrumbMaterial: Material
+BreadcrumbSheet: Exercise sheet
+BreadcrumbTutorial: Tutorial
+BreadcrumbExam: Exam
+BreadcrumbApplicant: Applicant
+BreadcrumbCourseRegister: Register
+BreadcrumbCourseRegisterTemplate: Application template
+BreadcrumbCourseFavourite: Favourite
+BreadcrumbCourse: Course
+BreadcrumbAllocationRegister: Register participation
+BreadcrumbAllocation: Central allocation
+BreadcrumbTerm: Semester
+BreadcrumbSchool: Department
+BreadcrumbUser: User
+BreadcrumbStatic: Static resource
+BreadcrumbFavicon: Favicon
+BreadcrumbRobots: robots.txt
+BreadcrumbLecturerInvite: Invitation to be a course administrator
+BreadcrumbExamOfficeUserInvite: Invitation regarding exam achievements
+BreadcrumbFunctionaryInvite: Invitation to be a department functionary
+BreadcrumbUserDelete: Delete user account
+BreadcrumbUserHijack: Hijack user session
+BreadcrumbSystemMessage: System message
+BreadcrumbSubmission: Submission
+BreadcrumbCourseNews: Course news
+BreadcrumbCourseNewsDelete: Delete course news
+BreadcrumbCourseEventDelete: Delete course occurrence
+BreadcrumbProfile: Settings
+BreadcrumbAllocationInfo: On central allocations
+BreadcrumbCourseParticipantInvitation: Invitation to be a course participant
+BreadcrumbMaterialArchive: Archive
+BreadcrumbMaterialFile: File
+BreadcrumbSheetArchive: Files
+BreadcrumbSheetIsCorrector: Corrector-check
+BreadcrumbSheetPseudonym: Pseudonym
+BreadcrumbSheetCorrectorInvite: Invitation to be a corrector
+BreadcrumbSheetFile: File
+BreadcrumbTutorialRegister: Register
+BreadcrumbTutorInvite: Invitation to be a tutor
+BreadcrumbExamCorrectorInvite: Invitation to be an exam corrector
+BreadcrumbExamParticipantInvite: Invitation to be an exam participant
+BreadcrumbExamRegister: Register
+BreadcrumbApplicationFiles: Application files
+BreadcrumbCourseNewsArchive: Archive
+BreadcrumbCourseNewsFile: File
+
+AuthPredsInfo: To view their own courses like a participant would, administrators and correctors can deactivate the checking of their credentials temporarily. Disabled authorisation predicates always fail. This means that deactivated predicates are not checked to grant access where it would otherwise not be permitted. These settings are only temporary, until your session expires i.e. your browser-cookie does. By deactivating predicates you can lock yourself out temporarily, at most.
+AuthPredsActive: Active authorisation predicates
+AuthPredsActiveChanged: Authorisation settings saved for the current session
+AuthTagFree: Page is freely accessable
+AuthTagAdmin: User is administrator
+AuthTagExamOffice: User is part of an exam office
+AuthTagToken: User is presenting an authorisation-token
+AuthTagNoEscalation: User permissions are not being expanded to other departments
+AuthTagDeprecated: Page is not deprecated
+AuthTagDevelopment: Page is not in development
+AuthTagLecturer: User is lecturer
+AuthTagCorrector: User is corrector
+AuthTagTutor: User is tutor
+AuthTagTutorControl: Tutors have control over their tutorial
+AuthTagTime: Time restrictions are fulfilled
+AuthTagStaffTime: Time restrictions wrt. staff are fulfilled
+AuthTagAllocationTime: Time restrictions due to a central allocation are fulfilled
+AuthTagCourseRegistered: User is enrolled in course
+AuthTagAllocationRegistered: User participates in central allocation
+AuthTagTutorialRegistered: User is tutorial participant
+AuthTagExamRegistered: User is exam participant
+AuthTagExamResult: User has an exam result
+AuthTagParticipant: User participates in course
+AuthTagApplicant: User is applicant for course
+AuthTagRegisterGroup: User is not participant in any tutorial of the same registration group
+AuthTagCapacity: Capacity is sufficient
+AuthTagEmpty: Course is empty
+AuthTagMaterials: Course material is publicly accessable
+AuthTagOwner: User is owner
+AuthTagRated: Submission is marked
+AuthTagUserSubmissions: Submissions are made by course participants
+AuthTagCorrectorSubmissions: Submissions are registered by correctors
+AuthTagSelf: User is only accessing their only data
+AuthTagIsLDAP: User logs in using their campus account
+AuthTagIsPWHash: User logs in using their Uni2work-internal account
+AuthTagAuthentication: User is authenticated
+AuthTagRead: Access is read only
+AuthTagWrite: Access might write
+
+DeleteCopyStringIfSure n: If you are sure that you want to permanently delete the #{pluralEN n "object" "objects"} listed below, please copy the shown text.
+DeletePressButtonIfSure n: If you are sure that you want to permanently delete the #{pluralEN n "object" "objects"} listed below, please confirm the action by pressing the button.
+DeleteConfirmation: Confirmation text
+DeleteConfirmationWrong: Confirmation text must match the shown text exactly.
+
+DBTIRowsMissing n: #{pluralDE n "A line" "A number of lines"} vanished from the database since the form you submitted was generated for you
+
+MassInputAddDimension: +
+MassInputDeleteCell: -
+
+NavigationFavourites: Favourites
+
+CommSubject: Subject
+CommBody: Message
+CommBodyTip: This input field currently accepts only Html. Line breaks are thus ignored and must be designated manually by inserting <br> in the appropriate places.
+CommRecipients: Recipients
+CommRecipientsTip: You always receive a copy of the message
+CommRecipientsList: For archival purposes the copy of the message sent to you will contain a complete list of all recipients. The list of recipients will be attached to the email in CSV-format. Other recipients do not receive the list. Thus, please remove the attachment before you forward the email or otherwise share it with third parties.
+CommDuplicateRecipients n: #{n} duplicate #{pluralEN n "recipient" "recipients"} ignored
+CommSuccess n: Message was sent to #{n} #{pluralEN n "recipient" "recipients"}
+CommUndisclosedRecipients: Undisclosed recipients
+CommAllRecipients: all-recipients
+
+CommCourseHeading: Course message
+CommTutorialHeading: Tutorial message
+
+RecipientCustom: Custom recipients
+RecipientToggleAll: All/None
+
+DBCsvImportActionToggleAll: All/None
+
+RGCourseParticipants: Course participants
+RGCourseLecturers: Course administrators
+RGCourseCorrectors: Course correctors
+RGCourseTutors: Course tutors
+RGTutorialParticipants: Tutorial participants
+
+MultiSelectFieldTip: Multiple selections are possible (Shift or Ctrl)
+MultiEmailFieldTip: Multiple emails addresses may be specified (comma-separated)
+EmailInvitationWarning: No user with that email address was found (may be subject to some restrictions). An invitation will be sent via email.
+
+LecturerInvitationAccepted lType csh: You were registered as #{lType} for #{csh}
+LecturerInvitationDeclined csh: You have declined the invitation to become course administrator for #{csh}
+CourseLecInviteHeading courseName: Invitation to be a course administrator for #{courseName}
+CourseLecInviteExplanation: You were invited to be a course administrator.
+
+CourseParticipantInviteHeading courseName: Invitation to enrol for #{courseName}
+CourseParticipantInviteExplanation: You were invited to be a participant of a course.
+CourseParticipantEnlistDirectly: Enrol known users directly
+CourseParticipantInviteField: Email addresses to invite
+
+CourseParticipantInvitationAccepted courseName: You were enrolled in #{courseName}
+
+CorrectorInvitationAccepted shn: You are now a corrector for #{shn}
+CorrectorInvitationDeclined shn: You have declined the invitation to be a corrector for #{shn}
+SheetCorrInviteHeading shn: Invitation to be a corrector for #{shn}
+SheetCorrInviteExplanation: You were invited to be a sheet corrector.
+
+TutorInvitationAccepted tutn: You are now tutor for #{tutn}
+TutorInvitationDeclined tutn: You have declined the invitation to be a tutor for #{tutn}
+TutorInviteHeading tutn: Invitation to be tutor for #{tutn}
+TutorInviteExplanation: You were invited to be a tutor.
+
+ExamCorrectorInvitationAccepted examn: You are now corrector for #{examn}
+ExamCorrectorInvitationDeclined examn: You have declined the invitation to be a corrector for #{examn}
+ExamCorrectorInviteHeading examn: Invitation to be a corrector for #{examn}
+ExamCorrectorInviteExplanation: You were invited to be a corrector.
+
+ExamRegistrationInvitationAccepted examn: You are now registered for #{examn}
+ExamRegistrationInvitationDeclined examn: You have declined the invitation to participate in #{examn}
+ExamRegistrationInviteHeading examn: Invitation to participate in #{examn}
+ExamRegistrationInviteExplanation: You were invited to register for an exam.
+
+SubmissionUserInvitationAccepted shn: You now participate in a submission for #{shn}
+SubmissionUserInvitationDeclined shn: You have declined the invitation to participate in a submission for #{shn}
+SubmissionUserInviteHeading shn: Invitation to participate in a submission for #{shn}
+SubmissionUserInviteExplanation: You were invited to participate in a submission for an exercise sheet.
+
+ExamOfficeUserInviteHeading displayName: Access of your exam achievements by #{displayName}
+ExamOfficeUserInviteExplanation: To properly consider your exam achievements (e.g. in the final transcript of records for Erasmus-students) you are invited to grant access to the appropriate parties.
+ExamOfficeUserInvitationAccepted: Access to exam achievements granted
+
+InvitationAction: Action
+InvitationActionTip: Declined invitations cannot be accepted later
+InvitationMissingRestrictions: Your authorisation-token is missing required data
+InvitationCollision: Invitation could not be accepted since an entry of this type already exists
+InvitationDeclined: Invitation declined
+BtnInviteAccept: Accept invitation
+BtnInviteDecline: Decline invitation
+
+LecturerType: Role
+ScheduleKindWeekly: Weekly
+
+ScheduleRegular: Regular occurrence
+ScheduleRegularKind: Schedule
+WeekDay: Day of the week
+Day: Day
+OccurrenceStart: Start
+OccurrenceEnd: End
+OccurrenceNever: Never
+ScheduleExists: This schedule already exists
+
+ScheduleExceptions: Exceptions
+ScheduleExceptionsTip: “Does not occur” overrides the regular schedule. “Does occur” overides “does not occur”.
+ExceptionKind: Event ...
+ExceptionKindOccur: Does occur
+ExceptionKindNoOccur: Does not occur
+ExceptionExists: This exception already exists
+ExceptionNoOccurAt: Event
+
+TutorialType: Type
+TutorialTypePlaceholder: Tutorial, Exercise discussion, ...
+TutorialTypeTip: Only for informational purposes
+TutorialName: Name
+TutorialParticipants: Participants
+TutorialCapacity: Capacity
+TutorialFreeCapacity: Free capacity
+TutorialRoom: Regular room
+TutorialTime: Time
+TutorialRegistered: Registered
+TutorialRegGroup: Registration group
+TutorialRegisterFrom: Register from
+TutorialRegisterTo: Register to
+TutorialDeregisterUntil: Deregister until
+TutorialsHeading: Tutorials
+TutorialEdit: Edit
+TutorialDelete: Delete
+TutorialTutorControlled: Tutors may edit tutorial
+TutorialTutorControlledTip: Should tutors be allowed to edit arbitrary aspects of this tutorial (name, registration group, room, time, other tutors, ...) at will?
+
+CourseExams: Exams
+CourseTutorials: Tutorials
+
+ParticipantsN n: #{n} #{pluralEN n "participant" "participants"}
+TutorialDeleteQuestion: Do you really want to delete the tutorial listed below?
+TutorialDeleted: Tutorial deleted
+
+TutorialRegisteredSuccess tutn: Successfully registered for the tutorial #{tutn}
+TutorialDeregisteredSuccess tutn: Successfully de-registered for the tutorial #{tutn}
+
+TutorialNameTip: Needs to be unique within the course
+TutorialCapacityNonPositive: Capacity may not be negative
+TutorialCapacityTip: Limits how many course participants may register for this tutorial
+TutorialRegGroupTip: Course participants may only register for a maximum of one tutorial per registration group. Tutorials that do not have a registration group are treated as being in different registration groups
+TutorialRoomPlaceholder: Room
+TutorialTutors: Tutors
+TutorialTutorAlreadyAdded: An user with this email address is already registered as tutor
+
+OccurrenceNoneScheduled: No regular occurrences (yet)
+OccurrenceNoneExceptions: No exceptions (yet)
+
+TutorialNew: New tutorial
+
+TutorialNameTaken tutn: A tutorial named #{tutn} already exists
+TutorialCreated tutn: Successfully created tutorial #{tutn}
+TutorialEdited tutn: Successfully edited tutorial #{tutn}
+
+TutorialEditHeading tutn: Edit #{tutn}
+
+MassInputTip: You may specify multiple values. Values must be added to the list by clicking + and can be removed again by clicking -. All changes must be confirmed by clicking the form submit button.
+
+HealthReport: Health report
+InstanceIdentification: Instance identification
+
+InstanceId: Instance id
+ClusterId: Cluster id
+
+HealthMatchingClusterConfig: Cluster config matches
+HealthHTTPReachable: Cluster can be reached under the expected URL via HTTP
+HealthLDAPAdmins: Proportion of administrators that were found in the LDAP directory
+HealthSMTPConnect: SMTP server is reachable
+HealthWidgetMemcached: Memcached server is serving widgets correctly
+HealthActiveJobExecutors: Proportion of job workers accepting new jobs
+
+CourseParticipantsHeading: Course participants
+CourseParticipantsCount n: #{n}
+CourseParticipantsCountOf n m: #{n} of #{m}
+CourseParticipants n: Currently #{n} course #{pluralEN n "participant" "participants"}
+CourseParticipantsInvited n: #{n} #{pluralEN n "invitation" "invitations"} sent via email
+CourseParticipantsAlreadyRegistered n: #{n} #{pluralEN n "participant is" "participants are"} already enrolled
+CourseParticipantsRegisteredWithoutField n: #{n} #{pluralEN n "participant was" "participants were"} registered without #{pluralEN n "an associated field of study" "associated fields of study"}, because #{pluralEN n "it" "they"} could not be determined uniquely.
+CourseParticipantsRegistered n: Successfully registered #{n} #{pluralEN n "participant" "participants"}
+CourseParticipantsRegisterHeading: Add course participants
+
+ExamRegistrationAndCourseParticipantsRegistered n: Registered #{n} #{pluralEN n "participant" "participants"} for the exam as well as for the course
+ExamRegistrationNotRegisteredWithoutCourse n: #{n} #{pluralEN n "user" "users"} were not registered for the exam since they are not enrolled in the course
+ExamRegistrationRegisteredWithoutField n: Registered #{n} #{pluralEN n "participant" "participants"} for the exam as well as for the course. The #{pluralEN n "participant was" "participants were"} enrolled without #{pluralEN n "an associated field of study" "associated fields of study"} since #{pluralEN n "it" "they"} could not be determined uniquely.
+ExamRegistrationParticipantsRegistered n: #{n} #{pluralEN n "participant was" "participants were"} registered for the exam
+ExamRegistrationInviteDeadline: Invitation valid until
+ExamRegistrationEnlistDirectly: Register known users directly
+ExamRegistrationEnlistDirectlyTip: Should users whose email addresses are known to the system be registered for the exam directly? Otherwise invitations will be sent to alle users, which they will have to accept first in order to be registered. Unknown users always receive an invitation.
+ExamRegistrationRegisterCourse: Also enroll users in course
+ExamRegistrationRegisterCourseTip: Users that aren't enrolled already won't be registered for the exam otherwise.
+ExamRegistrationInviteField: Email addresses
+ExamParticipantsRegisterHeading: Add exam participants
+ExamParticipantsInvited n: #{n} #{pluralEN n "invitation" "invitations"} sent via email
+
+ExamName: Name
+ExamTime: Time
+ExamsHeading: Exams
+ExamNameTip: Needs to be unique within the course
+ExamStart: Start
+ExamEnd: End
+ExamDescription: Description
+ExamVisibleFrom: Visible from
+ExamVisibleFromTip: If left empty the exam is never visible and course participants may not register.
+ExamRegisterFrom: Register from
+ExamRegisterFromTip: Start of the period in which course participants may register themselves for the exam. If left empty participants are never allowed to register.
+ExamRegisterTo: Register to
+ExamDeregisterUntil: Deregister until
+ExamPublishOccurrenceAssignments: Publish occurrence/room-assignments
+ExamPublishOccurrenceAssignmentsTip: At this time participants are informed to which occurrence/room they are assigned
+ExamPublishOccurrenceAssignmentsParticipant: Occurrence/room-assignments published
+ExamFinished: Marking finished
+ExamFinishedOffice: Exam achievements published
+ExamFinishedParticipant: Marking expected to be finished
+ExamFinishedTip: At this participants are informed of their exam achievements
+ExamClosed: Exam achievements registered
+ExamClosedTip: At this time exam offices, which pull exam achievements from Uni2work, are informed. Changes to exam achievements trigger further notifications
+ExamShowGrades: Exam is graded
+ExamShowGradesTip: Should participants and relevant exam offices be show exact grades or only whether the exam was passed or failed?
+ExamPublicStatistics: Publish statistics
+ExamPublicStatisticsTip: Should automatically computed statistics also be shown to participants as soon as they are informed of their achievements?
+ExamAutomaticGrading: Automatically compute grades
+ExamAutomaticGradingTip: Should the exam achievement be automatically computed from the results of the exam parts? Bonus points are considered if configured. Manually overriding the computed exam achievements remains possible.
+ExamGradingRule: Grade computation
+ExamGradingManual': No automatic computation
+ExamGradingKey': By grading scale
+ExamGradingKey: Grading scale
+ExamGradingKeyTip: Values in the grading scale refer to the effective maximum number of points. Bonus points from exercises are added and results for exam parts are multiplied with the part's weight.
+Points: Points
+PointsMustBeNonNegative: Point boundaries may not be negative
+PointsMustBeMonotonic: Point boundaries must increase monotonically
+GradingFrom: From
+ExamNew: New Exam
+ExamBonus: Bonus point system
+ExamBonusRule: Bonus points from exercises
+ExamNoBonus': No automatic exam bonus
+ExamBonusPoints': Compute from exercise achievements
+ExamBonusManual': Manual computation
+
+ExamBonusAchieved: Bonus points
+
+ExamEditHeading examn: Edit #{examn}
+
+ExamBonusMaxPoints: Maximum exam bonus points
+ExamBonusMaxPointsTip: Bonus points are linearly interpolated from the number of exercise points achieved (or exercise sheets passed as applicable) between zero and the given bound.
+ExamBonusMaxPointsNonPositive: Maximum exam bonus points must be positive and greater than zero
+ExamBonusOnlyPassed: Apply bonus only if already passed
+ExamBonusRound: Round bonus to
+ExamBonusRoundNonPositive: Rounding multiple must be positive and greater than zero
+ExamBonusRoundTip: Bonus points are rounded commercially to a multiple of the given number
+
+ExamAutomaticOccurrenceAssignment: Automatically assign occurrence/room
+ExamAutomaticOccurrenceAssignmentTip: Should exam participants be distributed automatically among the configured occurrences/rooms? Manipulation of the distribution and manually assigning participants remains possible.
+ExamOccurrenceRule: Procedure
+ExamOccurrenceRuleParticipant: Occurrence/room assignment procedure
+ExamRoomManual': No automatic assignment
+ExamRoomSurname': By surname
+ExamRoomMatriculation': By matriculation
+ExamRoomRandom': Randomly
+
+ExamOccurrence: Occurrence/room
+ExamNoOccurrence: No occurrence/room
+ExamOccurrences: Exams
+ExamRooms: Rooms
+ExamRoomAlreadyExists: Occurrence already configured
+ExamRoomName: Internal name
+ExamRoom: Room
+ExamRoomCapacity: Capacity
+ExamRoomCapacityNegative: Capacity may not be negative
+ExamRoomTime: Time
+ExamRoomStart: Start
+ExamRoomEnd: End
+ExamRoomDescription: Description
+ExamTimeTip: Only for informational purposes. The actual times are set for each occurrence/room
+ExamRoomRegistered: Assigned
+
+ExamOccurrenceStart: Exam starts
+
+ExamFormTimes: Times
+ExamFormOccurrences: Occurrences/rooms
+ExamFormAutomaticFunctions: Automatic functions
+ExamFormCorrection: Correction
+ExamFormParts: Exam parts
+
+ExamCorrectors: Correctors
+ExamCorrectorAlreadyAdded: A corrector with this email address already exists
+
+ExamParts: Exam parts/questions
+ExamPartWeightNegative: Weight of all exam parts must be greater than or equal to zero
+ExamPartAlreadyExists: An exam part of this name already exists
+ExamPartNumber: Number
+ExamPartNumbered examPartNumber: Part #{view _ExamPartNumber examPartNumber}
+ExamPartNumberTip: Will be used as an internal name e.g. during CSV-export
+ExamPartName: Title
+ExamPartNameTip: Will be shown to participants
+ExamPartMaxPoints: Maximum points
+ExamPartWeight: Weight
+ExamPartWeightTip: Will be multiplied with the achieved number of points before they are shown to the participant or used in automatic grade computation. Thus this also affects existing exam results (changed exam achievements have to be accepted manually again)
+ExamPartResultPoints: Achieved points
+
+ExamNameTaken exam: There already is an exam named #{exam}
+ExamCreated exam: Successfully created #{exam}
+ExamEdited exam: Successfully edited #{exam}
+
+ExamNoShow: Not present
+ExamVoided: Voided
+
+ExamBonusManualParticipants: Manually computed by course administrators
+ExamBonusPoints possible: Up to #{showFixed True possible} exam points
+ExamBonusPointsPassed possible: Up to #{showFixed True possible} exam points applied only if the exam would also be passed without
+
+ExamPassed: Passed
+ExamNotPassed: Failed
+ExamResult: Exam result
+
+ExamRegisteredSuccess exam: Successfully registered for the exam #{exam}
+ExamDeregisteredSuccess exam: Successufly deregistered from the exam #{exam}
+ExamRegistered: Registered for the exam
+ExamNotRegistered: Not registered for the exam
+ExamRegistration: Exam registration
+
+ExamRegisterToMustBeAfterRegisterFrom: "Register to" must be after "register from"
+ExamDeregisterUntilMustBeAfterRegisterFrom: "Deregister until" must be after "register from"
+ExamStartMustBeAfterPublishOccurrenceAssignments: "Start" must be after "publish occurrence/room-assignments"
+ExamEndMustBeAfterStart: "End" must be after "start"
+ExamFinishedMustBeAfterEnd: "Marking finished" must be after "end"
+ExamFinishedMustBeAfterStart: "Marking finished" must be after "start"
+ExamClosedMustBeAfterFinished: "Exam achievements registered" must be after "marking finished"
+ExamClosedMustBeAfterStart: "Exam achievements registered" must be after "start"
+ExamClosedMustBeAfterEnd: "Exam achievements registered" must be after "end"
+
+ExamOccurrenceEndMustBeAfterStart eoName: End of the occurrence #{eoName} must be after it's start
+ExamOccurrenceStartMustBeAfterExamStart eoName: Start of the occurrence #{eoName} must be after the exam start
+ExamOccurrenceEndMustBeBeforeExamEnd eoName: End of the occurrence #{eoName} must be before the exam end
+ExamOccurrenceDuplicate eoRoom eoRange: Combination of room #{eoRoom} and occurrence #{eoRange} occurs multiple times
+ExamOccurrenceDuplicateName eoName: Internal name #{eoName} occurs multiple times
+
+VersionHistory: Version history
+KnownBugs: Known bugs
+ImplementationDetails: Implementation
+
+ExamSynchronised: Synchronised
+
+ExamUsersHeading: Exam participants
+ExamUserDeregister: Deregister participants
+ExamUserAssignOccurrence: Assign occurrence/room
+ExamUserAcceptComputedResult: Accept computed result
+ExamUserResetToComputedResult: Reset result
+ExamUserResetBonus: Also reset exam bonus
+ExamUsersDeregistered count: Successfully deregistered #{show count} #{pluralEN count "participant" "participants"}
+ExamUsersOccurrenceUpdated count: Successfully assigned occurrence/room for #{show count} #{pluralEN count "participant" "participants"}
+ExamUsersResultsAccepted count: Successfully accepted computed result for #{show count} #{pluralEN count "participant" "participants"}
+ExamUsersResultsReset count: Successfully reset result for #{show count} #{pluralEN count "participant" "participants"}
+
+ExamUserSynchronised: Synchronised
+ExamUserSyncOfficeName: Name
+ExamUserSyncTime: Timestamp
+ExamUserSyncSchools: Department
+ExamUserSyncLastChange: Last changed
+ExamUserMarkSynchronised: Mark exam achievements as synchronised
+
+ExamUserMarkSynchronisedCsv: Mark exam achievements as synchronised while exporting
+ExamUserMarkedSynchronised n: Successfully marked #{n} #{pluralEN n "exam achievement" "exam achievements"} as synchronised
+
+ExamOfficeExamUsersHeading: Exam achievements
+
+CsvFile: CSV file
+CsvModifyExisting: Modify existing entries
+CsvAddNew: Add new entries
+CsvDeleteMissing: Delete missing entries
+BtnCsvExport: Export CSV file
+BtnCsvImport: Import CSV file
+BtnCsvImportConfirm: Finalise CSV import
+
+CsvImportNotConfigured: CSV import not configured
+CsvImportConfirmationHeading: CSV import preview (no changes have been made yet)
+CsvImportConfirmationTip: No changes have been made yet! Importing this CSV file corresponds to performing the edits listed below. Please choose the edits that should be performed before finalising the import.
+CsvImportUnnecessary: Importing the given CSV file does not correspond to performing any edits
+CsvImportSuccessful n: Successfully imported CSV file. #{n} #{pluralEN n "edit" "edits"} have been performed.
+CsvImportAborted: CSV import aborted
+CsvImportExplanationLabel: Informating regarding CSV import
+
+Proportion c of prop: #{c}/#{of} (#{rationalToFixed2 (100 * prop)}%)
+
+CourseUserCsvName tid ssh csh: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-participants
+ExamUserCsvName tid ssh csh examn: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-#{foldedCase examn}-participants
+CourseApplicationsTableCsvName tid ssh csh: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-applications
+
+CsvColumnsExplanationsLabel: Column & cell format
+CsvColumnsExplanationsTip: Meaning and format of the columns contained in imported and exported CSV files
+CsvColumnExamUserSurname: Participant's surname
+CsvColumnExamUserFirstName: Participant's given name
+CsvColumnExamUserName: Participant's full name (usually includes surname and given name)
+CsvColumnExamUserMatriculation: Participant's matriculation
+CsvColumnExamUserField: Field of study the participant specified when enrolling for the course
+CsvColumnExamUserDegree: Degree the participant pursues in their associated field of study
+CsvColumnExamUserSemester: Semester the participant is in wrt. to their associated field of study
+CsvColumnExamUserOccurrence: Occurrence/room the participant has been assigned
+CsvColumnExamUserExercisePoints: Number of points the participant has achieved in the excercise
+CsvColumnExamUserExercisePointsMax: Maximum number of points the participant could have achieved up to their assigned exam occurrence
+CsvColumnExamUserExercisePasses: Number of exercise sheets the participant has passed
+CsvColumnExamUserExercisePassesMax: Maximum number of exercise sheets the participant could have passed up to their assigned exam occurrence
+CsvColumnExamUserBonus: Exam bonus points
+CsvColumnExamUserParts: Number of points the participant achieved per exam part. One column per exam part if applicable.
+CsvColumnExamUserResult: Exam achievement; "passed", "failed", "no-show", "voided", or any number grade ("1.0", "1.3", "1.7", ..., "4.0", "5.0")
+CsvColumnExamUserCourseNote: Course notes for the participant
+
+CsvColumnUserName: Participant's full name
+CsvColumnUserMatriculation: Participant's matriculation
+CsvColumnUserSex: Participant's sex
+CsvColumnUserEmail: Participant's email address
+CsvColumnUserStudyFeatures: All active fields of study for the participant, separated by semicolon (;)
+CsvColumnUserField: Field of study the participant specified when enrolling for the course
+CsvColumnUserDegree: Degree the participant pursues in their associated field of study
+CsvColumnUserSemester: Semester the participant is in wrt. to their associated field of study
+CsvColumnUserRegistration: Time of participant's enrollment (ISO 8601)
+CsvColumnUserNote: Course notes for the participant
+CsvColumnUserTutorial: Tutorials which the user is registered for, separated by semicolon (;). For each registration group among the tutorials there is a separate column. The registration group columns contain at most one tutorial per participant. If every tutorial has a registration group there is no column "tutorial".
+
+CsvColumnExamOfficeExamUserOccurrenceStart: Exam occurrence (ISO 8601)
+
+CsvColumnApplicationsAllocation: Central allocation for which this application was made
+CsvColumnApplicationsApplication: Globally unique number of application (for matching with the ZIP archive of all application files)
+CsvColumnApplicationsName: Participant's full name
+CsvColumnApplicationsMatriculation: Participant's matriculation
+CsvColumnApplicationsField: Field of study the participant specified when applying
+CsvColumnApplicationsDegree: Degree the participant pursues in their associated field of study
+CsvColumnApplicationsSemester: Semester the participant is in wrt. to their associated field of study
+CsvColumnApplicationsText: Application text
+CsvColumnApplicationsHasFiles: Did the applicant provide any additional files with their application (see ZIP archive of all application files)?
+CsvColumnApplicationsVeto: Vetoed applicants are never assigned to the course; "veto" or empty
+CsvColumnApplicationsRating: Application grading; Any number grade ("1.0", "1.3", "1.7", ..., "4.0", "5.0"); Empty cells will be treated as if they contained a grade between 2.3 and 2.7
+CsvColumnApplicationsComment: Application comment; depending on course settings this might purely be a note for course administrators or be feedback for the applicant
+
+Action: Action
+ActionNoUsersSelected: No users selected
+
+DBCsvDuplicateKey: Two rows in the CSV file reference the same database entry and are thus invalid
+DBCsvDuplicateKeyTip: Please remove one of the lines listed below and try again.
+DBCsvKeyException: For a row in the CSV file it could not be determined whether it references any database entry.
+DBCsvException: An error occurred hile computing the set of edits this CSV import corresponds to.
+
+ExamUserCsvCourseRegister: Register users for the exam and enroll them in the course
+ExamUserCsvRegister: Register users for the exam
+ExamUserCsvAssignOccurrence: Assign occurrences/rooms to participants
+ExamUserCsvDeregister: Deregister participants from the exam
+ExamUserCsvSetCourseField: Modify field of study associated with the course
+ExamUserCsvOverrideBonus: Override bonus points in contradiction of computed value
+ExamUserCsvOverrideResult: Override exam result in contradiction of computed value
+ExamUserCsvSetBonus: Set bonus points
+ExamUserCsvSetResult: Set exam result
+ExamUserCsvSetPartResult: Set result for exam part
+ExamUserCsvSetCourseNote: Modify course participant notes
+ExamBonusNone: No bonus points
+
+ExamUserCsvCourseNoteDeleted: Course note will be deleted
+
+ExamUserCsvExceptionNoMatchingUser: Course participant could not be identified uniquely
+ExamUserCsvExceptionNoMatchingStudyFeatures: The specified field did not match with any of the participant's fields of study
+ExamUserCsvExceptionNoMatchingOccurrence: Occurrence/room could not be identified uniquely
+
+CourseApplicationsTableCsvSetField: Modify field of study associated with the applicatio
+CourseApplicationsTableCsvSetVeto: Set/remove veto
+CourseApplicationsTableCsvSetRating: Set grading
+CourseApplicationsTableCsvSetComment: Set comment
+
+CourseApplicationsTableCsvExceptionNoMatchingUser: Applicant could not be identified uniquely
+CourseApplicationsTableCsvExceptionNoMatchingAllocation: Central allocation could not be identified uniquely
+CourseApplicationsTableCsvExceptionNoMatchingStudyFeatures: The specified field did not match with any of the participant's fields of study
+
+TableHeadingFilter: Filter
+TableHeadingCsvImport: CSV import
+TableHeadingCsvExport: CSV export
+
+ExamResultAttended: Attended
+ExamResultNoShow: Not present
+ExamResultVoided: Voided
+ExamResultNone: No exam result
+
+BtnAuthLDAP: Change to campus account
+BtnAuthPWHash: Change to Uni2work accont
+BtnPasswordReset: Reset password
+
+AuthLDAPLookupFailed: User could not be looked up due to a LDAP error
+AuthLDAPInvalidLookup: Existing user could not be uniquely matched with a LDAP entry
+AuthLDAPAlreadyConfigured: User already logs in using their campus account
+AuthLDAPConfigured: User now logs in using their campus account
+
+AuthPWHashAlreadyConfigured: User already logs in using their Uni2work account
+AuthPWHashConfigured: User now logs in using their Uni2work account
+
+PasswordResetQueued: Sent link to reset password
+ResetPassword: Reselt Uni2work password
+
+AuthMode: Authentication
+AuthLDAP: Campus
+AuthPWHash pwHash: Uni2work
+CurrentPassword: Current password
+NewPassword: New password
+NewPasswordRepeat: New password (again)
+CurrentPasswordInvalid: Current password is incorrect
+PasswordRepeatInvalid: New passwords do not match
+UserPasswordHeadingFor: Change password for
+PasswordChangedSuccess: Successfully changed password
+
+FunctionaryInviteFunction: Function
+FunctionaryInviteSchool: Department
+FunctionaryInviteField: Email addresses to invite
+FunctionaryInviteHeading: Add department functionaries
+
+FunctionariesInvited n: Invited #{n} #{pluralEN n "functionary" "functionaries"} via email
+FunctionariesAdded n: Added #{n} #{pluralEN n "functionary" "functionaries"}
+
+MailSubjectSchoolFunctionInvitation school renderedFunction: Invitation to be #{renderedFunction} for “#{school}”
+MailSchoolFunctionInviteHeading school renderedFunction: Invitation to be #{renderedFunction} for “#{school}”
+SchoolFunctionInviteExplanation renderedFunction: You were invited to act as #{renderedFunction} for a department. By accepting the invitation you are granted elevated rights within the department.
+SchoolFunctionInvitationAccepted school renderedFunction: Successfully accepted invitation to be #{renderedFunction} for “#{school}”
+
+AllocationActive: Active
+AllocationName: Name
+AllocationAvailableCourses: Courses
+AllocationAppliedCourses: Applications
+AllocationNumCoursesAvailableApplied available applied: You have applied for #{applied}/#{available} #{pluralEN applied "course" "courses"}
+AllocationTitle termText ssh' allocation: #{termText} - #{ssh'}: #{allocation}
+AllocationShortTitle termText ssh' ash: #{termText} - #{ssh'} - #{ash}
+AllocationSchool: Department
+AllocationSemester: Semester
+AllocationDescription: Description
+AllocationStaffDescription: Staff description
+AllocationStaffRegisterFrom: Registration of courses starts
+AllocationStaffRegister: Registration of courses
+AllocationRegisterFrom: Application period start
+AllocationRegister: Application period
+AllocationRegisterClosed: This central allocation is currntely closed.
+AllocationRegisterOpensIn difftime: This central allocation is expected to open in #{difftime}
+AllocationStaffAllocationFrom: Grading of applications starts
+AllocationStaffAllocation: Grading of applications
+AllocationRegisterByStaff: Enrollment by course administrators
+AllocationRegisterByStaffFrom: Enrollment by course administrators starts
+AllocationRegisterByStaffTip: In this periods course administrators may enroll participants in their courses.
+AllocationRegisterByStaffFromTip: Starting at this time course administrators may enroll participants in their courses.
+AllocationRegisterByCourseFrom: Direct enrollment starts
+AllocationRegisterByCourseFromTip: Starting at this time course administrators participating in this central allocation may open their courses for participants to manage their participation themselves.
+AllocationOverrideDeregister: Leaving courses only until
+AllocationProcess: Allocation process
+AllocationNoApplication: No application
+AllocationPriority: Priority
+AllocationPriorityTip: Courses which you assign a higher priority are preferred during the allocation process.
+AllocationPriorityRelative: The absolute priority values are meaningless. The only consideration is whether one course has a higher priority than another.
+AllocationTotalCoursesNegative: Requested number of placements must be greater than zero
+AllocationTotalCourses: Requested number of placements
+AllocationTotalCoursesTip: During the allocation process you will be placed in at most as many courses as specified
+AllocationRegistered: Successfully registered participation in this central allocation
+AllocationRegistrationEdited: Successfully edited registration for this central allocation
+BtnAllocationRegister: Register participation
+BtnAllocationRegistrationEdit: Edit registration
+AllocationParticipation: Your participation in this central allocation
+AllocationParticipationLoginFirst: To participate in this central allocation, please log in first
+AllocationCourses: Centrally allocated courses
+AllocationData: Organisation
+AllocationCoursePriority i: #{ordinalEN i}
+AllocationCourseNoApplication: No application
+BtnAllocationApply: Apply
+BtnAllocationApplicationEdit: Edit application
+BtnAllocationApplicationRetract: Retract application
+BtnAllocationApplicationRate: Grade application
+ApplicationPriority: Priority
+ApplicationVeto: Veto
+ApplicationVetoTip: Vetoed applicants will not be assigned to the course
+ApplicationRatingPoints: Grading
+ApplicationRatingPointsTip: Applicants graded 5.0 will not be assigned to the course
+ApplicationRatingComment: Comment
+ApplicationRatingCommentVisibleTip: Feedback for the applicant
+ApplicationRatingCommentInvisibleTip: Currently only a note for course administrators
+ApplicationRatingSection: Grading
+ApplicationRatingSectionSelfTip: You are authorised to edit the application as well as it's grading.
+
+AllocationSchoolShort: Department
+Allocation: Central alloction
+AllocationRegisterTo: Registration until
+
+AllocationListTitle: Central allocations
+
+CourseApplicationsListTitle: Applications
+CourseApplicationId: Application number
+CourseApplicationRatingPoints: Grading
+CourseApplicationVeto: Veto
+CourseApplicationNoVeto: No veto
+CourseApplicationNoRatingPoints: No grading
+CourseApplicationNoRatingComment: No comment
+
+UserDisplayName: Display name
+UserDisplayNameInvalid: Display name does not comply with specification
+UserDisplayNameRules: Specification for display names
+UserDisplayNameRulesBelow: Specifications of what can be a display name can be found below
+UserMatriculation: Matriculation
+
+UserDisplayEmail: Display email
+UserDisplayEmailTip: This email address may be displayed publicly alongside your display name. Notifications and other communication from Uni2work or users with elevated permissions are always sent to your primary email address as specified under "personal information".
+UserDisplayEmailChangeSent displayEmail: Instructions to change your display email have been sent to “#{displayEmail}”.
+
+SchoolShort: Shorthand
+SchoolName: Name
+SchoolLdapOrganisations: Associated LDAP fragments
+SchoolLdapOrganisationsTip: When logging in users are associated with any departments whose associated LDAP fragments are found in the users LDAP entry
+
+SchoolUpdated ssh: Successfully edited #{ssh}
+SchoolTitle ssh: Department „#{ssh}“
+TitleSchoolNew: Neues Institut anlegen
+SchoolCreated ssh: Successfully created #{ssh}
+SchoolExists ssh: A department named „#{ssh}“ already exists
+
+SchoolAdmin: Admin
+SchoolLecturer: Lecturer
+SchoolEvaluation: Course evaluation
+SchoolExamOffice: Exam office
+
+ApplicationEditTip: During the application period you may edit and retract your applications at will.
+
+UserLdapSync: Synchronise with LDAP
+AllUsersLdapSync: Synchronise all with LDAP
+SynchroniseLdapUserQueued n: Triggered LDAP synchronisation of #{n} #{pluralEN n "user" "users"}.
+SynchroniseLdapAllUsersQueued: Triggered LDAP synchronisation of all users
+UserHijack: Hijack session
+
+MailSubjectAllocationStaffRegister allocation: You may now register courses for the central allocation “#{allocation}”
+MailAllocationStaffRegisterNewCourse: You can create new courses on the page linked below. While doing so you now have to option to specifiy that the course should participate in the central allocation.
+MailAllocationStaffRegisterDeadline deadline: Please consider that alle courses must be registered until #{deadline} in order to participate in the central allocation.
+
+MailSubjectAllocationRegister allocation: You may now apply for the central allocation “#{allocation}”
+MailAllocationRegister: You may now apply for each individual course particpating in the central allocation on the page linked below.
+MailAllocationRegisterDeadline deadline: Please consider that all applications have to be made until #{deadline}.
+
+MailSubjectAllocationAllocation allocation: You may now grade applications made to your courses for the central allocation “#{allocation}”
+MailAllocationAllocation: On the page linked below you may now grade applications made to your corses for the central allocation. The grades you specify will be considered during the allocation process.
+MailAllocationApplicationsMayChange deadline: Please consider that students may continue to apply, retract, and edit their applications until #{deadline}. Applications that change after being graded will need to be graded again.
+MailAllocationAllocationDeadline deadline: Please consider that grading of applications is only possible until #{deadline}.
+
+MailSubjectAllocationUnratedApplications allocation: Some applications made to your courses for the central allocation “#{allocation}” are not yet graded
+MailAllocationUnratedApplications: Applications have been made to the courses listed below for the central allocation, which have not yet been graded.
+
+MailSubjectAllocationOutdatedRatings allocation: Applications made to your courses for the central allocation “#{allocation}” have changed since being graded
+MailAllocationOutdatedRatings: Applications have been made to the courses list below for the central allocation, which have changed since they were last graded.
+MailAllocationOutdatedRatingsWarning: Applications whose grading is deprecated (i.e. that have been changed since they were graded) are considered not to have been graded during the allocation process.
+
+ExamOfficeSubscribedUsers: Users
+ExamOfficeSubscribedUsersTip: You may specify multiple matriculations; comma-separated
+
+ExamOfficeSubscribedUsersExplanation: You will be able to view all exam achievements (with no regard for the students fields of study) for all users specified here.
+ExamOfficeSubscribedFieldsExplanation: You will be able to view all exam achievements for any user that has at least one of the specified fields of study. You may additionally configure whether users should be allowed to opt out on a course by course basis.
+
+UserMatriculationNotFound matriculation@Text: Es existiert kein Uni2work-Benutzer mit Matrikelnummer „#{matriculation}“
+UserMatriculationAmbiguous matriculation@Text: Matrikelnummer „#{matriculation}“ ist nicht eindeutig
+
+TransactionExamOfficeUsersUpdated nDeleted@Int nAdded@Int: #{nAdded} Benutzer hinzugefügt, #{nDeleted} Benutzer gelöscht
+
+TransactionExamOfficeFieldsUpdated nUpdates@Int: #{nUpdates} #{pluralDE nUpdates "Studienfach" "Studienfächer"} angepasst
+ExamOfficeFieldNotSubscribed: —
+ExamOfficeFieldSubscribed: Einsicht
+ExamOfficeFieldForced: Forcierte Einsicht
+InvalidExamOfficeFieldMode parseErr@Text: Konnte „#{parseErr}“ nicht interpretieren
+
+LdapIdentification: Campus account
+LdapIdentificationOrEmail: Campus account/email address
+AdminUserTitle: Title
+AdminUserFirstName: Given name
+AdminUserSurname: Surname
+AdminUserDisplayName: Display name
+AdminUserEmail: Email address
+AdminUserDisplayEmail: Display email
+AdminUserIdent: Identification
+AdminUserAuth: Authentication
+AdminUserMatriculation: Matriculation
+AdminUserSex: Sex
+AuthKindLDAP: Campus account
+AuthKindPWHash: Uni2work account
+UserAdded: Successfully added user
+UserCollision: Could not create user due to uniqueness constraint
+
+CourseAllocationsBounds n: Expected number of alloctions due to #{pluralEN n "central allocation" "central allocations"}
+CourseAllocationsBoundCoincide numFirstChoice: Est. #{numFirstChoice} #{pluralEN numFirstChoice "participant" "participants"}
+CourseAllocationsBound numApps numFirstChoice: Est. between #{numFirstChoice} and #{numApps} #{pluralEN numApps "participant" "participants"}
+CourseAllocationsBoundCapped: The numbers listed above were modified based on the currently configured course capacity.
+CourseAllocationsBoundWarningOpen: The information listed above represents only the current state of applications and is subject to change.
+
+BtnSetDisplayEmail: Set email address
+UserDisplayEmailChanged: Successfully set display email
+TitleChangeUserDisplayEmail: Set display email
+
+MailSubjectChangeUserDisplayEmail: Publishing this email address in Uni2work
+MailIntroChangeUserDisplayEmail displayEmail: The user mentioned above wants to publish “#{displayEmail}” as their own email address. If you have not caused this email to be sent, please ignore it!
+MailTitleChangeUserDisplayEmail displayName: #{displayName} wants to publish this email address as their own in Uni2work
+
+ExamOfficeOptOutsChanged: Successfully adjusted relevant exam offices
+
+BtnCloseExam: Close exam
+ExamCloseTip: When an exam is closed all relevant exam offices, which pull exam achievements from Uni2work, are informed and kept up to date with changes.
+ExamCloseReminder: Please close the exam as soon as possible, when exam achievements are no longer expected to change e.g. after inspection of the exam has concluced.
+ExamDidClose: Successfully closed exam
+
+ExamClosedSince time: Exam closed since #{time}
+
+LecturerInfoTooltipNew: New feature
+LecturerInfoTooltipProblem: Feature with known issues
+LecturerInfoTooltipPlanned: Planned feature
+LecturerInfoTooltipNewU2W: Unlike UniWorX
+
+BtnAcceptApplications: Accept applications
+BtnAcceptApplicationsTip: By clicking the button below you may fill the course with applicants (only up to the maximum capacity if configured). Grading of applications will be considered (no grading is treated as if graded between 2.3 and 2.7). Vetoed applicants and applications graded 5.0 will not be enrolled.
+AcceptApplicationsMode: Accept applications
+AcceptApplicationsModeTip: Should accepted applications be enrolled in the course directly or should invitations be sent via email?
+AcceptApplicationsDirect: Enroll directly
+AcceptApplicationsInvite: Send invitations
+AcceptApplicationsSecondary: Breaking ties
+AcceptApplicationsSecondaryTip: If a tie occurs during the acceptance process, how should it be broken?
+AcceptApplicationsSecondaryRandom: Randomly
+AcceptApplicationsSecondaryTime: By time of application
+
+CsvOptions: CSV options
+CsvOptionsTip: These settings primarily affect CSV export. During import most settings can be determined automatically. CSV import expects the same character encoding as used for export.
+CsvFormatOptions: File format
+CsvTimestamp: Timestamp
+CsvTimestampTip: Should the name of every exported csv file contain a timestamp?
+CsvPresetRFC: Standards-compliant (RFC 4180)
+CsvPresetExcel: Excel compatible
+CsvCustom: User defined
+CsvDelimiter: Separator character
+CsvUseCrLf: Linebreaks
+CsvQuoting: Quoting
+CsvQuotingTip: When should quotation characters (") be placed around fields so characters contained within will not be interpreted as field separators?
+CsvEncoding: Encoding
+CsvEncodingTip: CSV files can be exported in a different character encoding than the UTF-8 used by default. Please consider that non-UTF-8 character encodings might lead to encoding problems with special characters.
+CsvUTF8: UTF-8 (Unicode)
+CsvCP1252: Windows CP-1252 ("ANSI")
+CsvDelimiterNull: Null byte
+CsvDelimiterTab: Tab
+CsvDelimiterComma: Comma
+CsvDelimiterColon: Colon
+CsvDelimiterSemicolon: Semicolon
+CsvDelimiterBar: Vertical bar
+CsvDelimiterSpace: Space
+CsvDelimiterUnitSep: Unit separator character
+CsvCrLf: DOS (CRLF)
+CsvLf: Unix (LF)
+CsvQuoteNone: Never
+CsvQuoteMinimal: Only when necessary
+CsvQuoteAll: Always
+CsvOptionsUpdated: Successfully changed CSV options
+CsvChangeOptionsLabel: Export options
+
+CourseNews: News
+CourseNewsArchiveName tid ssh csh newsTitle: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-#{foldCase newsTitle}
+CourseNewsFiles: Files
+CourseNewsLastEdited time: Last changed: #{time}
+CourseNewsActionEdit: Edit
+CourseNewsActionDelete: Delete
+CourseNewsActionCreate: Create new item
+CourseMaterial: Material
+CourseMaterialFree: Course material is publicly accessable
+CourseMaterialNotFree: Only course participants may access course material
+
+CourseNewsVisibleFromEditWarning: This item of course news has already been published and should no longer be changed sind this might confuse participants.
+CourseNewsVisibleFromTip: If left empty this item is never visible. Leave empty for unfinished items
+CourseNewsTitle: Title
+CourseNewsSummary: Summary
+CourseNewsSummaryTip: If specified this only the summary will be shown on the course page, saving space. The content will be shown in a popup
+CourseNewsContent: Content
+CourseNewsParticipantsOnly: Only for course participants
+CourseNewsVisibleFrom: Visible from
+CourseNewsCreated: Successfully created item of course news
+CourseNewsEdited: Successfully edited item of course news
+CourseNewsDeleteQuestion: Are you sure you want to delete the item of course news listed below?
+CourseNewsDeleted: Successfully deleted item of course news
+
+CourseDeregistrationAllocationLog: Your enrollment in this course is due to a central allocation. If you leave the course, this will be permanently recorded and might affect you negatively in future central allocations. If you have good reasons why you should not be held accountable for leaving the course, please contact a course administrator. Course administrators can deregister you without incurring a permanent record.
+CourseDeregistrationAllocationReason: Reason
+CourseDeregistrationAllocationReasonTip: The specified reason will be permanently stored and might be the only information available during conflict resolution
+CourseDeregistrationAllocationShouldLog: Self imposed
+CourseDeregistrationAllocationShouldLogTip: If the participant was enrolled in this course due to a central allocation, it is intended that a permanent record be made that might affect the student negatively in future central allocations. As a course administrator you have the right to prevent this if the participant can present good reasons why them leaving the course is not self imposed.
+
+MailSubjectAllocationResults allocation: Placements have been made for the central allocation “#{allocation}”
+AllocationResultsLecturer: In the course of the central allocations placements have been made as follows:
+AllocationResultLecturer csh count count2: #{count} #{pluralEN count "participant" "participants"} (of #{count2}) for #{csh}
+AllocationResultLecturerAll csh count: #{count} #{pluralEN count "participant" "participants"} for #{csh}
+AllocationResultLecturerNone csh: No participants for #{csh}
+AllocationResultsStudent: You have been placed in:
+AllocationNoResultsStudent: Unfortunately you were not placed in any courses.
+AllocationResultStudent csh: You were placed in #{csh}.
+AllocationResultsTip: The following information reflect the current state of the allocation and are subject to change (e.g. when handling succession). You will be informed separately if any future changes concern you.
+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.
+
+FavouriteVisited: Visited
+FavouriteParticipant: Your courses
+FavouriteManual: Favourites
+FavouriteCurrent: Current course
+
+CourseEvents: Occurrences
+CourseEventType: Type
+CourseEventTypePlaceholder: Lecture, Exercise discussion, ...
+CourseEventTime: Time
+CourseEventRoom: Regular room
+CourseEventActions: Actions
+CourseEventsActionEdit: Edit
+CourseEventsActionDelete: Delete
+CourseEventsActionCreate: New occurrence
+CourseEventCreated: Successfully created course occurrence
+CourseEventEdited: Successfully edited course occurrence
+CourseEventDeleteQuestion: Are you sure you want to delete the course occurrence mentioned below?
+CourseEventDeleted: Successfully deleted course occurrence
+
+UserSimplifiedFeaturesOfStudyCsv: Simplified features of study
+UserSimplifiedFeaturesOfStudyCsvTip: Should field of study, degree, and semester be exported in separate columns for ease of processing? If so only the field of study associated by the user with their course registration will be exported.
+
+Sex: Sex
+SexNotKnown: Unknown
+SexMale: Male
+SexFemale: Female
+SexNotApplicable: Not applicable
+
+ShortSexNotKnown: unk.
+ShortSexMale: m
+ShortSexFemale: f
+ShortSexNotApplicable: N/A
+
+ShowSex: Show sex of other users
+ShowSexTip: Should users' sex be displayed in (among others) lists of course participants?
+
 
 MenuLanguage: Language
 LanguageChanged: Language changed successfully
+
+ProfileCorrector: Corrector
+ProfileCourses: Own courses
+ProfileCourseParticipations: Course registrations
+ProfileCourseExamResults: Exam achievements
+ProfileTutorials: Own tutorials
+ProfileTutorialParticipations: Tutorials
+ProfileSubmissionGroups: Submission groups
+ProfileSubmissions: Submissions
+ProfileRemark: Remarks
+ProfileGroupSubmissionDates: No date is shown for group submissions if you have never uploaded the submission yourself.
+ProfileCorrectorRemark: The table above only shows registration as a corrector in principle. Even without registration corrections can be assigned individually and are not listed.
+ProfileCorrections: List of all assigned corrections
+
+GroupSizeNotNatural: “Maximum group size” needs to be a natural number
+AmbiguousEmail: Email address is ambiguous
+CourseDescriptionPlaceholder: Please include the module description
+CourseHomepageExternalPlaceholder: Optional external URL
+PointsPlaceholder: Points
+RFC1766: RFC1766 language code
+
+TermShort: Shorthand
+TermCourseCount: Courses
+TermStart: Semester start
+TermEnd: Semester end
+TermStartMustMatchName: Shorthand number does not match semester start.
+TermEndMustBeAfterStart: Semester end may not be before semester start.
+TermLectureEndMustBeAfterStart: Lecture start may not be after lecture end.
+TermStartMustBeBeforeLectureStart: Semester start must be before lecture start.
+TermEndMustBeAfterLectureEnd: Lecture end must be before semester end.
+AdminPageEmpty: This page shall provide an overview for administrators in the future. For now there are only links to important administrator-functions.
+HaveCorrectorAccess sheetName: You have corrector access to #{original sheetName}.
+FavouritesPlaceholder: Number of favourites
+FavouritesNotNatural: Number of favourites must be a natural number!
+FavouritesSemestersPlaceholder: Number of semesters
+FavouritesSemestersNotNatural: Maximum number of semesters in favourites bar must be a natural number!
+
+ProfileTitle: Settings
+
+GlossaryTitle: Glossary
+MenuGlossary: Glossary
+
+Applicant: Applicant
+CourseParticipant: Course participant
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 7d75f5a98..34b7d6013 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -272,6 +272,17 @@ noneMoreEN num noneText someText
   | num == 0  = noneText
   | otherwise = someText
 
+ordinalEN :: ToMessage a
+          => a
+          -> Text
+ordinalEN (toMessage -> numStr) = case lastChar of
+  Just '1' -> [st|#{numStr}st|]
+  Just '2' -> [st|#{numStr}nd|]
+  Just '3' -> [st|#{numStr}rd|]
+  _other   -> [st|#{numStr}th|]
+  where
+    lastChar = last <$> fromNullable numStr 
+
 
 -- Convenience Type for Messages, since Yesod messages cannot deal with compound type identifiers
 type IntMaybe  = Maybe Int
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index 73c8e076e..b9f0138dd 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -1235,13 +1235,14 @@ csvFormatOptionsForm fs mPrev = hoistAForm liftHandler . multiActionA csvActs fs
       MsgRenderer mr <- getMsgRenderer
       let
         opts = 
-          [ (MsgCsvDelimiterNull,    '\0')
-          , (MsgCsvDelimiterTab,     '\t')
-          , (MsgCsvDelimiterComma,   ',')
-          , (MsgCsvDelimiterColon,   chr 58)
-          , (MsgCsvDelimiterBar,     '|')
-          , (MsgCsvDelimiterSpace,   ' ')
-          , (MsgCsvDelimiterUnitSep, chr 31)
+          [ (MsgCsvDelimiterNull,      '\0')
+          , (MsgCsvDelimiterTab,       '\t')
+          , (MsgCsvDelimiterComma,     ',')
+          , (MsgCsvDelimiterColon,     chr 58)
+          , (MsgCsvDelimiterSemicolon, chr 59)
+          , (MsgCsvDelimiterBar,       '|')
+          , (MsgCsvDelimiterSpace,     ' ')
+          , (MsgCsvDelimiterUnitSep,   chr 31)
           ]
         olReadExternal t = do
           i <- readMay t
diff --git a/templates/i18n/admin-test/en-eu.hamlet b/templates/i18n/admin-test/en-eu.hamlet
new file mode 100644
index 000000000..37710392b
--- /dev/null
+++ b/templates/i18n/admin-test/en-eu.hamlet
@@ -0,0 +1,65 @@
+<section>
+
+
+  <p>
+    This page is intended only to test certain functionality and to demonstrate
+    various helper functions and modules.
+
+    This handler should contain up to date examples of all functions so it can
+    be the first point of contact.
+
+ <p>
+   ^{iconTooltip testTooltipMsg Nothing False}
+   ^{messageTooltip msgInfoTooltip}
+   ^{messageTooltip msgSuccessTooltip}
+   ^{messageTooltip msgWarningTooltip}
+   ^{messageTooltip msgErrorTooltip}
+   ^{messageTooltip msgNonDefaultIconTooltip}
+
+ <p>
+  <span .tooltip>
+    <span .tooltip__content>Buy Tooltip-White for brighter tooltips!
+    The tooltip handle should always be set so tooltips are usable on mobile devices and without javascript.
+
+<section>
+  <h2>Manually created table
+   <table .table .table--striped>
+    <tr .table__row .table__row--head>
+      <th .table__th colspan=2> Header A
+      <th .table__th rowspan=2> Header
+    <tr .table__row .table__row--head>
+      <th .table__th> B
+      <th .table__th> C
+    <tr .table__row title="Example of line tooltip">
+        <td .table__td>1
+        <td .table__td>2
+        <td .table__td>3
+    <tr .table__row>
+        <td .table__td>
+          <span .tooltip>
+            <span .tooltip__content>Buy Tooltip-White for brighter tooltips! (DOES NOT WORK)
+          4
+        <td .table__td>5
+          <span .tooltip>
+            <span .tooltip__content>Buy Tooltip-White for brighter tooltips! (DOES NOT WORK)
+            <td .table__td>6
+    <tr .table__row>
+        <td .table__td>7
+        <td .table__td>8
+        <td .table__td>9
+
+<section>
+  <h2>Functions for testing
+
+  <ul>
+    <li>
+      Button test:
+        ^{btnForm}
+    <li>
+      Modals:
+      <ul>
+        <li>^{modal "Click me for ajax test" (Left $ SomeRoute UsersR)}
+        <li>^{modal "Click me for content test" (Right "Test Inhalt für Modal")}
+        <li>^{modal "Email-Test" (Right emailWidget')}
+    <li>
+      Some icons: ^{isVisible False} ^{hasComment True}
diff --git a/templates/i18n/allocation-info/en-eu.hamlet b/templates/i18n/allocation-info/en-eu.hamlet
new file mode 100644
index 000000000..ecf082e92
--- /dev/null
+++ b/templates/i18n/allocation-info/en-eu.hamlet
@@ -0,0 +1,88 @@
+$newline text
+<section>
+  <p>
+    Every central allocations progresses through the following stages in order:
+  <dl .deflist>
+    <dt .deflist__dt>
+      _{MsgAllocationStaffRegister}
+    <dd .deflist__dd>
+      <p>
+        Course administrators may register their courses for participation in
+        the central allocation and deregister them again at will.
+      <p>
+        Whether students are expected to provide text or files with their
+        applications is configured on a course-by-course basis.
+        Course administrators may specify instructions for application e.g. what
+        content the application files should have.
+      <p>
+        Courses registered for participation in the central allocation can not
+        gain participants through the entire course of the allocation.
+        Not even through manual enrollment by course administrators.
+
+    <dt .deflist__dt>
+      _{MsgAllocationRegister}
+    <dd .deflist__dd>
+      <p>
+        Only during this phase may students apply to the various courses which
+        participate in the central allocation.
+      <p>
+        Applicants may assign priorities ("this course would be my first choice"
+        down to "I will only participate in this course if nothing else is
+        available to me") to courses they apply to.
+        Multiple courses may have the same priority.
+      <p>
+        Applications and priorities may be freely edited and retracted during
+        the application period.
+      <p>
+        Students may request more than one placement from a central allocation.
+
+        Additional placements are made if sufficient capacity is available
+        and/or placements are sufficiently urgent.
+      <p>
+        Application texts and/or files need to be specified for each course
+        individually, as requested by the course administrators.
+
+    <dt .deflist__dt>
+      _{MsgAllocationStaffAllocation}
+    <dd .deflist__dd>
+      <p>
+        Only during this phase may course administrators inspect and grade
+        applications.
+      $# <p>
+      $#   Nur in manchen Zentralanmeldungen dürfen Veranstalter
+      $#   Bewerber jetzt direkt ablehnen und/oder übernehmen.
+      $# <p>
+      $#   Veranstalter haben noch eine letzte Möglichkeit,
+      $#   die Kurskapazität anzupassen.
+
+    <dt .deflist__dt>
+      _{MsgAllocationProcess}
+    <dd .deflist__dd>
+      <p>
+        Placements in courses are made with regard to the current study
+        progress, urgency, and the grading of the application as determined by a
+        course administrator.
+      <p>
+        Applicants are directly enrolled in the selected courses.
+
+        Applicants which leave courses they were assigned in the course of a
+        central allocation may be affected negatively by this in future central
+        allocations.
+      <p>
+        Only after placements have been made, may course administrators enroll
+        and deregister participants of their courses.
+        Course administrators can request to be assigned successors to fill
+        their courses' remaining capacity.
+
+  <p>
+    Central allocation procedure may vary.
+
+    <em>
+      In particular: #
+
+    If, on the central allocation's page, no times are specified for one of the
+    phases mentioned above, the time in question has not been determined yet!
+  <p>
+    Multiple central allocations are handled entirely independently of one
+    another.
+
diff --git a/templates/i18n/changelog/en-eu.hamlet b/templates/i18n/changelog/en-eu.hamlet
new file mode 100644
index 000000000..756fd7fef
--- /dev/null
+++ b/templates/i18n/changelog/en-eu.hamlet
@@ -0,0 +1,253 @@
+$newline never
+<dl .deflist>
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 10 23}
+  <dd .deflist__dd>
+    <ul>
+      <li>Introduced option to timestamp all exported CSV files
+      <li>Introduced CSV export option to set the character encoding used
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 10 14}
+  <dd .deflist__dd>
+    <ul>
+      <li>Control of settings for a tutorial may be delegated to the respective tutors
+      <li>Optionally display sex in (among others) lists of course participants
+  
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 10 10}
+  <dd .deflist__dd>
+    <ul>
+      <li>CSV export of course participants now includes registered tutorials
+      <li>Course participant may be registered for tutorials via the course participant table
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 10 09}
+  <dd .deflist__dd>
+    <ul>
+      <li>Course occurrences
+      <li>CSV export of course participants now optionally includes all features of study
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 10 08}
+  <dd .deflist__dd>
+    <ul>
+      <li>Users are notified if they are enrolled in courses by administrators
+      <li>CSV export of course participants
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 10 01}
+  <dd .deflist__dd>
+    <ul>
+      <li>Course news
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 09 27}
+  <dd .deflist__dd>
+    <ul>
+      <li>Option to automatically accept applications for courses outside of central allocations
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 09 25}
+  <dd .deflist__dd>
+    <ul>
+      <li>Automatic computation of exam boni
+      <li>Automatic computation of exam results
+      <li><i>Bugfix</i>: Times are no longer reset when loading a form
+      <li><i>Bugfix</i>: Participants are no longer duplicated in the exam achievements table
+  
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 09 16}
+  <dd .deflist__dd>
+    <ul>
+      <li>Exam offices (including direct access to relevant exam achievements)
+      <li>Email notifications to relevant exam offices when exams are closed
+      <li>Closure of exams (i.e. notification of relevant exam offices) is now a button instead of a predetermined time
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 09 13}
+  <dd .deflist__dd>
+    <ul>
+      <li>Notifications for exam registration and deregistration
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 09 12}
+  <dd .deflist__dd>
+    <ul>
+      <li>Estimation of course capacity required to satisfy central allocations
+      <li>Configurable display names
+      <li>Configulable display emails
+      
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 09 05}
+  <dd .deflist__dd>
+    <ul>
+      <li>Notifications for central allocations
+      
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 08 27}
+  <dd .deflist__dd>
+    <ul>
+      <li>Grading of course applications via CSV
+  
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 08 19}
+  <dd .deflist__dd>
+    <ul>
+      <li>Applications for central allocations
+  
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 08 12}
+  <dd .deflist__dd>
+    <ul>
+      <li>Registration of courses for central allocation
+  
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 07 23}
+  <dd .deflist__dd>
+    <ul>
+      <li>CSV import & export of exam participants
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 06 26}
+  <dd .deflist__dd> 
+    <ul>
+      <li>Rudimentary support for exams
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 06 07}
+  <dd .deflist__dd> 
+    <ul>
+      <li>Exercise sheets can enforce certain file names and extensions
+      <li>Download of all files for exercise sheets (by classification) as ZIP archives
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 05 20}
+  <dd .deflist__dd> 
+    <ul>
+      <li>Completely reworked automatic distribution of corrections
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 05 13}
+  <dd .deflist__dd> 
+    <ul>
+      <li>Course administrators may enroll participants
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 05 10}
+  <dd .deflist__dd> 
+    <ul>
+      <li>Improved interface for configuring submittors
+      <li>Download of all files for course material/exercise sheets
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 05 04}
+  <dd .deflist__dd> 
+    <ul>
+      <li>Course material
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 04 29}
+  <dd .deflist__dd> 
+    <ul>
+      <li>Tutorials
+      <li>Display of correctors on course overview pages
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 04 20}
+  <dd .deflist__dd> 
+    <ul>
+      <li>Sending of course messages to participants
+      <li>Configuration of course correctors and administrators without existing accounts
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 03 27}
+  <dd .deflist__dd> 
+    <ul>
+      <li>Course administrators can now configure course administrators and assistants themselves
+      <li>Features of study
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 03 20}
+  <dd .deflist__dd> 
+    <ul>
+      <li>Course enrollment requires association of a field of study (for students with multiple fields)
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 01 30}
+  <dd .deflist__dd> 
+    <ul>
+      <li>Design changes
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 01 16}
+  <dd .deflist__dd> 
+    <ul>
+      <li>Convenience links (i.e. current exercise sheet)
+      <li>Filters for list of assigned corrections
+      <li><i>Bugfix</i>: Proper error message for if entries vanish between generation of table form and submission
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2018 11 30}
+  <dd .deflist__dd> 
+    <ul>
+      <li><i>Bugfix</i>: Exercise sheets in "passing by points"-mode now saved correctly again
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2018 11 29}
+  <dd .deflist__dd> 
+    <ul>
+      <li><i>Bugfix</i>: Table forms now work after JavaScript page changes and changes in sorting
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2018 11 09}
+  <dd .deflist__dd> 
+    <ul>
+      <li><i>Bugfix</i>: Multiple buttons/forms no work again when JavaScript is enabled
+      <li>Multiple improvements for correctors
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2018 10 19}
+  <dd .deflist__dd> 
+    <ul>
+      <li>During testing users may completely delete their accounts
+      <li>Support widget
+      <li>Email notifications for some events
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2018 09 18}
+  <dd .deflist__dd> 
+    <ul>
+      <li>Tooltips now work without JavaScript
+      <li>Course shorthands now only need to be unique within a department
+      <li>Personal information now shows all currently saved data
+      <li>Support for table summaries e.g. sums of exercise points
+      <li>Smart distribution of corrections among correctors (e.g. when some are sick)
+      <li>Exercise sheets may prohibit submission of files and determine whether ZIP archives should be unpacked automatically
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2018 08 06}
+  <dd .deflist__dd> 
+    <ul>
+      <li>Option whether files should be downloaded automatically
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2018 08 01}
+  <dd .deflist__dd> 
+    <ul>
+      <li>Improved campus login<br />
+          (Replacement of a C-library with undocumented runtime dependencies with a new haskell-library now supports special characters)
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2018 07 31}
+  <dd .deflist__dd> 
+    <ul>
+      <li>Numerous improvements for display of corrections
+      <li>Overall course list for all semesters (see "Courses"), will have filters and search functions in the future
+
+  <dt .deflist__dt>
+    ^{formatGregorianW 2018 07 10}
+  <dd .deflist__dd> 
+    <ul>
+      <li>Bugfixes
+      <li>Configurable date and time formats
diff --git a/templates/i18n/corrections-upload-instructions/en-eu.hamlet b/templates/i18n/corrections-upload-instructions/en-eu.hamlet
new file mode 100644
index 000000000..6a7105ac3
--- /dev/null
+++ b/templates/i18n/corrections-upload-instructions/en-eu.hamlet
@@ -0,0 +1,27 @@
+<section>
+  <p>
+    Uploading a correction automatically marks it finished (i.e. visible to the
+    students) iff you were assigned that correction.
+  <p>
+    If an administrator that was not assigned the correction uploads it, it will
+    not be marked finished.
+  <p>
+    It is expected that rating files will, in the future, contain a field to
+    mark the correction as finished or not.
+  <p>
+    Contrary to UniWorX downloaded submissions always reflect the current state
+    of the correction.
+    This extends to files changed during previous corrections.
+
+<section>
+  <p>
+    While marking a correction files may be changed, added, and deleted.
+    These changes will be visible to the submittors as soon as the correction is
+    marked finished.
+  <p>
+    Temporary files left by previous corrections should thus be deleted by the
+    last corrector if they should not be accessable to submittors.
+
+  $maybe maxUpload <- maxUploadMB
+    <p>
+      Uploads are currently limited to #{textBytes maxUpload}
diff --git a/templates/i18n/course-exam-office-explanation/en-eu.hamlet b/templates/i18n/course-exam-office-explanation/en-eu.hamlet
new file mode 100644
index 000000000..5da92b135
--- /dev/null
+++ b/templates/i18n/course-exam-office-explanation/en-eu.hamlet
@@ -0,0 +1,25 @@
+$newline never
+<p>
+  Here you can opt out of your exam achievements being shared with certain exam #
+  offices within Uni2work.
+<p>
+  Please keep in mind that sharing your exam achievements with the relevant exam #
+  offices directly in Uni2work drastically reduces the workload (and thus time) #
+  required to properly consider all your exam achievements.
+<p>
+  Some exam offices might have access to your exam achievements regardless of #
+  your settings.<br />
+  This is only the for well founded individual cases (e.g. students in the #
+  ERASMUS-programme).
+<p>
+  Users that have access to your exam achievements regardless of your settings #
+  (e.g. course administrators) are, of course, free to forward your exam #
+  achievements to exam offices that do not pull from Uni2work (in that case they #
+  might not be listed here).
+$if hasForced
+  <p>
+    If you are unable to opt out of sharing your exam achievements with certain #
+    exam offices, that exam office has specified that access to your grades is #
+    required either because of one of your fields of study (e.g. because study #
+    regulations) or for you specifically.
+ 
diff --git a/templates/i18n/data-delete/en-eu.hamlet b/templates/i18n/data-delete/en-eu.hamlet
new file mode 100644
index 000000000..b38608692
--- /dev/null
+++ b/templates/i18n/data-delete/en-eu.hamlet
@@ -0,0 +1,25 @@
+<h2>
+  Are you sure that you want to permanently delete ^{nameEmailWidget userEmail userDisplayName userSurname}?
+<p>
+  During the testing phase users are deleted wholly from the live database via
+  <code>DELETE CASCADE uid
+  .
+  Nontheless exam achievements must be stored for 5 years after exmatriculation!
+<p>
+  Users can log in again using their campus account at any time, which will
+  result in their user account starting empty again.
+<p>
+  Uploaded submission files are deleted if they were associated with the deleted
+  user only.
+  Files of group submissions are only deleted when their last group member is
+  deleted.
+<p>
+  <em>Caution:
+  Exercise submissions are deleted as well!
+  If a lecturer has not backed up the information regarding submissions
+  elsewhere this is expected to result in a loss of exercise bonus.
+  Grades synchronised externally should not be impacted by this but may not be
+  able to be reconstructed without the information of Uni2work-managed
+  submissions.
+
+^{deleteForm}
diff --git a/templates/i18n/exam-users/computed-values-tip/en-eu.hamlet b/templates/i18n/exam-users/computed-values-tip/en-eu.hamlet
new file mode 100644
index 000000000..4d3f28283
--- /dev/null
+++ b/templates/i18n/exam-users/computed-values-tip/en-eu.hamlet
@@ -0,0 +1,23 @@
+$newline never
+<div .notification .notification-warning .fa-exclamation-triangle .notification--broad>
+  <div .notification__content>
+    <p>
+      This table contains values that were computed automatically.
+    <p>
+      Values computed automatically (bonus and result) are shown to neither the #
+      participant nor relevant exam offices until they are manually accepted.<br />
+      To do this you may use the action “Accept computed result”.
+    <p>
+      You are also able to override the automatically computed values manually #
+      (via CSV import).<br />
+
+      If values thus overriden do not match the automatically computed values #
+      they are considered <i>inconsistent</i>.
+    <p>
+      Automatically computed values are marked as follows:
+
+    <table style="font-weight: normal">
+      <tr>
+        <td style="padding: 0 7px 0 0" .table__td .table__td--automatic>Automatically computed
+        <td style="padding: 0 7px" .table__td>Normal value
+        <td style="padding: 0 0 0 7px" .table__td .table__td--overriden>Inconsistent
diff --git a/templates/i18n/featureList/de-de-formal.hamlet b/templates/i18n/featureList/de-de-formal.hamlet
index c5da64b5c..76b0e8fda 100644
--- a/templates/i18n/featureList/de-de-formal.hamlet
+++ b/templates/i18n/featureList/de-de-formal.hamlet
@@ -5,5 +5,4 @@ $newline never
   <ul>
     <li> Stundenplan/Kalender mit allen Veranstaltungen und Klausuren
     <li> Vollständige Vorlesungshomepages
-    <li> Vollständige Internationalisierung deutsch/englisch/...
 
diff --git a/templates/i18n/featureList/en-eu.hamlet b/templates/i18n/featureList/en-eu.hamlet
new file mode 100644
index 000000000..4f8e260eb
--- /dev/null
+++ b/templates/i18n/featureList/en-eu.hamlet
@@ -0,0 +1,7 @@
+$newline never
+<p>
+  <h3>
+    Planned functionally, currently only partially implemented
+  <ul>
+    <li> Timetable/calendar with all courses and exams
+    <li> Complete course homepages
diff --git a/templates/i18n/html-input/de-de-formal.hamlet b/templates/i18n/html-input/de-de-formal.hamlet
index 71e8396e2..d54ab9790 100644
--- a/templates/i18n/html-input/de-de-formal.hamlet
+++ b/templates/i18n/html-input/de-de-formal.hamlet
@@ -1,7 +1,8 @@
+$newline never
 <h3>Hinweis: Leerzeilen werden entfernt!
 <p>
-  Das Eingabefeld für Mitteilungstext/Beschreibung akzeptiert derzeit nur Html.
-  Zeilumbrüche spielen dementsprechend keine Rolle, können aber mit
+  Das Eingabefeld akzeptiert derzeit nur Html.<br />
+  Zeilumbrüche spielen dementsprechend keine Rolle, können aber mit #
   <code>&lt;br&gt;
   eingefügt werden.
 <p>
diff --git a/templates/i18n/html-input/en-eu.hamlet b/templates/i18n/html-input/en-eu.hamlet
new file mode 100644
index 000000000..d7630147a
--- /dev/null
+++ b/templates/i18n/html-input/en-eu.hamlet
@@ -0,0 +1,10 @@
+$newline never
+<h3>Attention: line breaks will be removed!
+<p>
+  The textarea currently accepts only Htmlp.<br />
+  
+  Thus any linebreaks will be ignored but can be added using #
+  <code>&lt;br&gt;
+  .
+<p>
+  We plan to support Markdown in the future.
diff --git a/templates/i18n/implementation/de-de-formal.hamlet b/templates/i18n/implementation/de-de-formal.hamlet
index e0027e3b8..23876d482 100644
--- a/templates/i18n/implementation/de-de-formal.hamlet
+++ b/templates/i18n/implementation/de-de-formal.hamlet
@@ -1,6 +1,6 @@
 $newline never
 <p>
-    Uni2Work wird mit Hilfe des #
+    Uni2work wird mit Hilfe des #
     <a href="https://www.yesodweb.com/">
       Yesod-Frameworks
     \ in #
@@ -23,7 +23,7 @@ $newline never
 
 <p>
   <h4>
-    An der Entwicklung von Uni2Work beteiligte Personen
+    An der Entwicklung von Uni2work beteiligte Personen
   <ul .list--iconless .list--inline .list--comma-separated>
     <li>Felix Hamann (Frontend)
     <li>Steffen Jost
diff --git a/templates/i18n/implementation/en-eu.hamlet b/templates/i18n/implementation/en-eu.hamlet
new file mode 100644
index 000000000..ead3e0dbd
--- /dev/null
+++ b/templates/i18n/implementation/en-eu.hamlet
@@ -0,0 +1,30 @@
+$newline never
+<p>
+    Uni2work is implemented using #
+    <a href="https://www.yesodweb.com/">
+      the Yesod framework
+    \ in #
+    <a href="https://www.haskell.org/">
+      Haskell
+    \ /
+    <a href="https://www.haskell.org/ghc/">
+      GHC
+    .<br />
+
+    The implementation conforms to 
+    <a href="https://en.wikipedia.org/wiki/Representational_State_Transfer">
+      REST principles
+    \ and thus exhibits good horizontal scalability.<br />
+
+    <a href="https://www.postgresql.org/">
+     PostgreSQL
+    \ is being used as a database server.
+
+<p>
+  <h4>
+    Involved in the development of Uni2work
+  <ul .list--iconless .list--inline .list--comma-separated>
+    <li>Felix Hamann (Frontend)
+    <li>Steffen Jost
+    <li>Gregor Kleen
+    <li>Sarah Vaupel
diff --git a/templates/i18n/knownBugs/en-eu.hamlet b/templates/i18n/knownBugs/en-eu.hamlet
new file mode 100644
index 000000000..da6ed994d
--- /dev/null
+++ b/templates/i18n/knownBugs/en-eu.hamlet
@@ -0,0 +1,6 @@
+$newline never
+<p>
+  Last updated: October 2019
+<ul>
+  <li>
+    Format of rating files is provisional
diff --git a/templates/i18n/profile-remarks/de-de-formal.hamlet b/templates/i18n/profile-remarks/de-de-formal.hamlet
index ef726e64c..831b828c9 100644
--- a/templates/i18n/profile-remarks/de-de-formal.hamlet
+++ b/templates/i18n/profile-remarks/de-de-formal.hamlet
@@ -8,18 +8,15 @@ $newline text
     <li>
       Nicht aufgeführt sind Zeitstempel mit Benutzerinformationen, z.B. bei der Editierung und Korrektur von Übungen, Übungsgruppenleiterschaft, Raumbuchungen, etc.
     <li>
-      Sie können die
-      <a href=@{HelpR}>
-        Löschung Ihre Daten über eine Supportanfrage beantragen
-      . Ihre Daten werden dann nach Ablauf einer Frist gelöscht.
-      Daten, welche keiner gesetzlichen Aufbewahrungsfrist unterliegen
-      (z.B. Klausurnoten) verbleiben im System bis zur Ablauf der Aufbewahrungsfrist.
       <p>
-      Benutzerdaten bleiben prinzipiell so lange gespeichert,
-      bis ein Institutsadministrator über die Exmatrikulation informiert wurde.
-      Dann wird der Account mit einer angemessenen zeitverzögerung gelöscht.
-      Anonymisierte Prüfungsnoten verbleiben aus statistischen Gründen dauerhaft im System.
-
-    <li>
-      Bei gemeinsamen Gruppenabgaben wird nur die Zuordnung zu diesem Benutzer gelöscht.
-      Die Abgabe selbst wird erst gelöscht, wenn alle Benutzer einer Abgabe deren Löschung veranlasst haben.
+        Sie können die
+        <a href=@{HelpR}>
+          Löschung Ihre Daten über eine Supportanfrage beantragen
+        . Ihre Daten werden dann nach Ablauf einer Frist gelöscht.
+        Daten, welche keiner gesetzlichen Aufbewahrungsfrist unterliegen
+        (z.B. Klausurnoten) verbleiben im System bis zur Ablauf der Aufbewahrungsfrist.
+      <p>
+        Benutzerdaten bleiben prinzipiell so lange gespeichert,
+        bis ein Institutsadministrator über die Exmatrikulation informiert wurde.
+        Dann wird der Account mit einer angemessenen zeitverzögerung gelöscht.
+        Anonymisierte Prüfungsnoten verbleiben aus statistischen Gründen dauerhaft im System.
diff --git a/templates/i18n/profile-remarks/en-eu.hamlet b/templates/i18n/profile-remarks/en-eu.hamlet
new file mode 100644
index 000000000..e7772d0eb
--- /dev/null
+++ b/templates/i18n/profile-remarks/en-eu.hamlet
@@ -0,0 +1,24 @@
+$newline text
+<section>
+  <h2>Remarks
+  <ul>
+    <li>
+      Back up your data! Uni2work's database is backed up daily but we can
+      nontheless not guarantee that there will be no problems.
+    <li>
+      Timestamps with user information (e.g. editing of corrections, submission groups, rooms, ...) are not shown here.
+    <li>
+      <p>
+        You can request your data be deleted by opening
+        <a href=@{HelpR}>
+          a support request
+        .
+        Your data will then be deleted after a suitable time period has passed.
+        Data that falls under legal retention periods (e.g. exam results) remian
+        in the system until their retention period has passed.
+      <p>
+        User data remains in the system (in principle) until a department
+        administrator has been informed of exmatriculation.
+        After a suitable time period has passed the account is deleted.
+        Anonymised exam results remain in the system indefinitely for
+        statistical purposes.
diff --git a/templates/i18n/profile/displayNameRules/en-eu.hamlet b/templates/i18n/profile/displayNameRules/en-eu.hamlet
new file mode 100644
index 000000000..49da8bd7e
--- /dev/null
+++ b/templates/i18n/profile/displayNameRules/en-eu.hamlet
@@ -0,0 +1,9 @@
+$newline never
+<ul>
+  <li>The display name needs to contain the surname (“#{userSurname}”) entirely.
+  $maybe title <- userTitle
+    <li>The display name needs to consist entirely of fragments of the title (“#{title}”), the given name (“#{userFirstName}”), and the surname (“#{userSurname}”).
+  $nothing
+    <li>The display name needs to consist entirely of fragments of the given name (“#{userFirstName}”), and the surname (“#{userSurname}”).
+  <li>The display name may not contain clusters of multiple whitespace characters.
+  <li>The display name may not contain any special characters that do not occur in any part of the name.
diff --git a/templates/i18n/profile/tokenExplanation/de-de-formal.hamlet b/templates/i18n/profile/tokenExplanation/de-de-formal.hamlet
index 2237bddee..396b0b3d2 100644
--- a/templates/i18n/profile/tokenExplanation/de-de-formal.hamlet
+++ b/templates/i18n/profile/tokenExplanation/de-de-formal.hamlet
@@ -1,13 +1,11 @@
+$newline never
 <p>
-  Das System stellt gelegentlich Benutzer-bezogene <i>Authorisierungs-Tokens</i> aus.
+  Das System stellt gelegentlich Benutzer-bezogene <i>Authorisierungs-Tokens</i> aus.<br />
   Diese Tokens erlauben es jedem, der in Besitz dieses Tokens ist, bestimmte Ihrer Benutzer-Rechte anzunehmen.
-
 <p>
   Dies ist insbesondere notwendig um verschickten Emails einen Link beifügen zu können, der das Deabonnieren von Benachrichtigungen erlaubt.
-
 <p>
-  Mit dem untigen Knopf können Sie alle Authorisierungs-Tokens, die bisher für Sie ausgestellt wurden, als ungültig markieren.
+  Mit dem untigen Knopf können Sie alle Authorisierungs-Tokens, die bisher für Sie ausgestellt wurden, als ungültig markieren.<br />
   Dies ist zum Beispiel dann notwendig, wenn Sie Grund haben zu vermuten, dass Dritte Zugriff auf eines Ihrer Tokens gehabt haben könnten.
-
 <p>
   Für die sichere Verwahrung Ihnen ausgehändigter Tokens sind immer Sie selbst verantwortlich.
diff --git a/templates/i18n/profile/tokenExplanation/en-eu.hamlet b/templates/i18n/profile/tokenExplanation/en-eu.hamlet
new file mode 100644
index 000000000..fc04e4d4f
--- /dev/null
+++ b/templates/i18n/profile/tokenExplanation/en-eu.hamlet
@@ -0,0 +1,17 @@
+$newline never
+<p>
+  Uni2work occasionally generates user-specific <i>authorisation tokens</i>.<br />
+
+  These tokens allow anyone in possesion of the token to utilise certain of your #
+  permissions.
+<p>
+  This is (among other purposes) necessary to include a link to edit your #
+  notification settings in every notification you receive.
+<p>
+  By clicking the button below you can mark all tokens that have been generated #
+  for you until now as invalid.<br />
+
+  Doing so is necessary if you have reason to suspect that third parties might #
+  have had access to any of your tokens.
+<p>
+  You are responsible for safely storing all authorisation tokens sent to you.
diff --git a/templates/i18n/set-display-email/de-de-formal.hamlet b/templates/i18n/set-display-email/de-de-formal.hamlet
index 72ce89746..99be5e041 100644
--- a/templates/i18n/set-display-email/de-de-formal.hamlet
+++ b/templates/i18n/set-display-email/de-de-formal.hamlet
@@ -1,4 +1,5 @@
 $newline never
 <p>
-  Möchten Sie die, öffentlich im Zusammenhang mit Ihrem Namen angezeigte, E-Mail Adresse wirklich auf „#{displayEmail}“ setzen?
+  Möchten Sie die, öffentlich im Zusammenhang mit Ihrem Namen angezeigte, E-Mail #
+  Adresse wirklich auf „#{displayEmail}“ setzen?
 ^{btnView'}
diff --git a/templates/i18n/set-display-email/en-eu.hamlet b/templates/i18n/set-display-email/en-eu.hamlet
new file mode 100644
index 000000000..726d6ce4b
--- /dev/null
+++ b/templates/i18n/set-display-email/en-eu.hamlet
@@ -0,0 +1,5 @@
+$newline never
+<p>
+  Are you sure that you want your display email, which will be made publicly #
+  available in conjunction with your name, to be “#{displayEmail}”?
+^{btnView'}
diff --git a/templates/i18n/sheet-edit/de-de-formal.hamlet b/templates/i18n/sheet-edit/de-de-formal.hamlet
index 08e231090..6b206ce70 100644
--- a/templates/i18n/sheet-edit/de-de-formal.hamlet
+++ b/templates/i18n/sheet-edit/de-de-formal.hamlet
@@ -1,3 +1,4 @@
+$newline never
 <section>
   ^{sheetEditForm}
 
@@ -8,15 +9,15 @@
       <p>
         Reine Tutoren haben keinen Vorab Zugriff auf Musterlösungen.
       <p>
-        Wenn reine Tutoren vorab Zugriff auf Musterlösungen erhalten sollen,
+        Wenn reine Tutoren vorab Zugriff auf Musterlösungen erhalten sollen, #
         dann sind diese momentan als Korrektoren mit Anteil 0 einzutragen.
     <li>
       <p>
         Korrektoren haben nur Zugriff auf das jeweilige Übungsblatt.
       <p>
-        Auf andere Übungsblätter, bei denen jemand nicht als Korrektor
+        Auf andere Übungsblätter, bei denen jemand nicht als Korrektor #
         eingetragen ist, gibt es keinen Zugriff auf Lösungen.
     <li>
       <p>
-        Alle für diesen Kurs eingetragenen Dozenten und Assistenten
-        haben vollen Zugriff auf alle Dateien der Übungsblatter dieses Kurses.
\ No newline at end of file
+        Alle für diesen Kurs eingetragenen Dozenten und Assistenten #
+        haben vollen Zugriff auf alle Dateien der Übungsblatter dieses Kurses.
diff --git a/templates/i18n/sheet-edit/en-eu.hamlet b/templates/i18n/sheet-edit/en-eu.hamlet
new file mode 100644
index 000000000..36fd04630
--- /dev/null
+++ b/templates/i18n/sheet-edit/en-eu.hamlet
@@ -0,0 +1,24 @@
+$newline never
+<section>
+  ^{sheetEditForm}
+
+<section>
+  <h2>Remarks
+  <ul>
+    <li>
+      <p>
+        Users who are purely tutors have no access to sheet solutions in #
+        advance.
+      <p>
+        If users who are purely tutors should have access to sheet solutions in #
+        advance, they are to registered as correctors with 0 proportion.
+    <li>
+      <p>
+        Correctors only have access to sheets for which they are assigned.
+      <p>
+        Correctors do not have access to other exercise sheets' solutions if #
+        they aren't also a corrector for the other sheet.
+    <li>
+      <p>
+        All course administrators have full access to all files of all exercise #
+        sheets for this course.
diff --git a/templates/i18n/table/csv-import-explanation/en-eu.hamlet b/templates/i18n/table/csv-import-explanation/en-eu.hamlet
new file mode 100644
index 000000000..a22231c5a
--- /dev/null
+++ b/templates/i18n/table/csv-import-explanation/en-eu.hamlet
@@ -0,0 +1,54 @@
+$newline never
+<h3>Remarks regarding CSV import
+<dl .deflist>
+    <dt .deflist__dt>Data formatting
+    <dd .deflist__dd>
+      When importing the format expected (per column) is the same as it would be #
+      produced when exporting (see <i>Column & cell format</i> under #
+      <i>CSV export</i>).<br />
+      Columns may be permuted arbitrarily or left out completely (in that case #
+      the column will be treated as if every cell contained within it was #
+      empty).<br />
+      Columns are identified based on their heading. #
+      Thus column headings may not be modified or removed.
+    <dt .deflist__dt>Edits
+    <dd .deflist__dd>
+      Some cells can be changed when importing.<br />
+      Cells that cannot be changed are ignored, if they were changed.
+    <dt .deflist__dt>Preview
+    <dd .deflist__dd>
+      Before any edits are applied a preview is shown of what would be done.<br />
+      In the preview an arbitrary subset of edits may be selected for #
+      application.
+    <dt .deflist__dt>Empty cells
+    <dd .deflist__dd>
+      Cells which may be deleted are deleted or set to uniquely determined #
+      values if the corresponding cell is empty during import.
+    <dt .deflist__dt>Consistency
+    <dd .deflist__dd>
+      <p>
+        Only consistent edits are ever made!
+      <p>
+        Thus it can be useful to leave certain cells empty. #
+        For example when changing the associated field of study for a course #
+        participant one would have to change the degree and semester to match if #
+        they are not left empty.<br />
+        If they are left empty they are automatically filled in if their values #
+        can be uniquely determined (which is usually the case).
+    <dt .deflist__dt>Identification of rows
+    <dd .deflist__dd>
+      Multiple columns may be used to identify each row.<br />
+      Thus not every cell used to identify a row needs to be filled, as long as #
+      the row can still be uniquely identified.<br />
+      If multiple columns used for identification are not empty their values #
+      need to be consistent.
+    <dt .deflist__dt>Adding rows
+    <dd .deflist__dd>
+      Additional rows may be added as long as sufficient information is #
+      provided. #
+      For example course participants may be added this way.
+     <dt .deflist__dt>Deleting rows
+    <dd .deflist__dd>
+      Rows that are missing in the imported file are offered up for deletion #
+      during the edit preview.
+ 
diff --git a/templates/i18n/unauth-home/de-de-formal.hamlet b/templates/i18n/unauth-home/de-de-formal.hamlet
index 66f7fe4c5..55aaa0cc1 100644
--- a/templates/i18n/unauth-home/de-de-formal.hamlet
+++ b/templates/i18n/unauth-home/de-de-formal.hamlet
@@ -1,5 +1,6 @@
+$newline never
 <p>
-  Wilkommen zu Uni2work!
+  Willkommen zu Uni2work!
 <p>
-  Nach dem Login erscheinen hier Ihre aktuellen Termine, wie z.B. bevorstehende
+  Nach dem Login erscheinen hier Ihre aktuellen Termine, wie z.B. bevorstehende #
   Klausuren und aktive Übungsblätter.
diff --git a/templates/i18n/unauth-home/en-eu.hamlet b/templates/i18n/unauth-home/en-eu.hamlet
new file mode 100644
index 000000000..e489e916d
--- /dev/null
+++ b/templates/i18n/unauth-home/en-eu.hamlet
@@ -0,0 +1,6 @@
+$newline never
+<p>
+  Welcome to Uni2work!
+<p>
+  After you login your current and upcoming events, such as exams and active #
+  exercise sheets, will be listed here.

From 498d6168a0f47b0f93bab75d65b87c34670535f1 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 29 Oct 2019 15:54:11 +0100
Subject: [PATCH 022/126] feat(i18n): populate frontend datetime locale from
 backend settings

---
 frontend/src/services/i18n/i18n.js    | 33 +++++++++++++++++++++++----
 frontend/src/utils/form/datepicker.js |  8 +++----
 src/Foundation.hs                     |  1 +
 src/Utils/Frontend/I18n.hs            |  8 +++++++
 src/Utils/Lang.hs                     |  4 +---
 templates/i18n.julius                 |  2 +-
 6 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/frontend/src/services/i18n/i18n.js b/frontend/src/services/i18n/i18n.js
index 7061f6ba6..fd383b1b6 100644
--- a/frontend/src/services/i18n/i18n.js
+++ b/frontend/src/services/i18n/i18n.js
@@ -1,3 +1,5 @@
+import moment from 'moment';
+
   /**
    * I18n
    *
@@ -13,10 +15,15 @@
 
 export class I18n {
 
-  translations = {};
+  _translations = {};
+  _datetimeLocale = undefined;
 
   add(id, translation) {
-    this.translations[id] = translation;
+    if (!this._translations[id]) {
+      this._translations[id] = translation;
+    } else {
+      throw new Error('I18N Error: Attempting to set translation multiple times for »' + id + '«!');
+    }
   }
 
   addMany(manyTranslations) {
@@ -24,9 +31,27 @@ export class I18n {
   }
 
   get(id) {
-    if (!this.translations[id]) {
+    if (!this._translations[id]) {
       throw new Error('I18N Error: Translation missing for »' + id + '«!');
     }
-    return this.translations[id];
+    return this._translations[id];
+  }
+
+
+  setDatetimeLocale(locale) {
+    if (!this._datetimeLocale) {
+      moment.locale(locale);
+      this._datetimeLocale = locale;
+    } else {
+      throw new Error('I18N Error: Attempting to set datetime locale multiple times!');
+    }
+  }
+
+  getDatetimeLocale() {
+    if (!this._datetimeLocale) {
+      throw new Error('I18N Error: Attempting to access datetime locale when it has not been set!');
+    }
+    
+    return this._datetimeLocale;
   }
 }
diff --git a/frontend/src/utils/form/datepicker.js b/frontend/src/utils/form/datepicker.js
index 2cc4972c8..b8ba0869f 100644
--- a/frontend/src/utils/form/datepicker.js
+++ b/frontend/src/utils/form/datepicker.js
@@ -48,9 +48,6 @@ const DATEPICKER_CONFIG = {
     timeMinutes: 0,
     timeSeconds: 0,
 
-    // german settings
-    // TODO: hardcoded, get from current language / settings
-    locale: 'de',
     weekStart: 1,
     dateFormat: FORM_DATE_FORMAT_DATE_DT,
     timeFormat: FORM_DATE_FORMAT_TIME_DT,
@@ -86,6 +83,7 @@ export class Datepicker {
   datepickerInstance;
   _element;
   elementType;
+  _locale;
 
   constructor(element) {
     if (!element) {
@@ -96,6 +94,8 @@ export class Datepicker {
       return false;
     }
 
+    this._locale = window.App.i18n.getDatetimeLocale();
+
     // initialize datepickerCollections singleton if not already done
     if (!Datepicker.datepickerCollections) {
       Datepicker.datepickerCollections = new Map();
@@ -134,7 +134,7 @@ export class Datepicker {
     }
 
     // initialize tail.datetime (datepicker) instance and let it do weird stuff with the element value
-    this.datepickerInstance = datetime(this._element, { ...datepickerGlobalConfig, ...datepickerConfig });
+    this.datepickerInstance = datetime(this._element, { ...datepickerGlobalConfig, ...datepickerConfig, locale: this._locale });
 
     // reset date to something sane
     if (parsedMomentDate)
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 34b7d6013..50d2b538d 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1930,6 +1930,7 @@ siteLayout' headingOverride widget = do
   let
     -- See Utils.Frontend.I18n and files in messages/frontend for message definitions
     frontendI18n = toJSON (mr :: FrontendMessage -> Text)
+  frontendDatetimeLocale <- toJSON <$> selectLanguage frontendDatetimeLocales
 
   pc <- widgetToPageContent $ do
       -- fonts
diff --git a/src/Utils/Frontend/I18n.hs b/src/Utils/Frontend/I18n.hs
index 9c8533496..1d1c24652 100644
--- a/src/Utils/Frontend/I18n.hs
+++ b/src/Utils/Frontend/I18n.hs
@@ -1,5 +1,6 @@
 module Utils.Frontend.I18n
   ( FrontendMessage(..)
+  , frontendDatetimeLocales
   ) where
 
 import ClassyPrelude
@@ -14,6 +15,9 @@ import Data.Aeson.Types (toJSONKeyText)
 import Data.Aeson.TH
 import qualified Data.Char as Char
 
+import Data.List.NonEmpty (NonEmpty(..))
+import Text.Shakespeare.I18N (Lang)
+
 
 -- | I18n-Messages used in JavaScript-Frontend
 --
@@ -39,3 +43,7 @@ instance ToJSONKey FrontendMessage where
   toJSONKey = toJSONKeyText toPathPiece
 instance FromJSONKey FrontendMessage where
   fromJSONKey = FromJSONKeyTextParser $ parseJSON . String
+
+
+frontendDatetimeLocales :: NonEmpty Lang
+frontendDatetimeLocales = "de" :| ["en"]
diff --git a/src/Utils/Lang.hs b/src/Utils/Lang.hs
index fe41e110f..3280c62fc 100644
--- a/src/Utils/Lang.hs
+++ b/src/Utils/Lang.hs
@@ -11,8 +11,6 @@ import qualified Data.List as List
 
 import qualified Data.CaseInsensitive as CI
 
-import Control.Lens (none)
-
 import Yesod.Core.Types (HandlerData(handlerRequest), YesodRequest(reqLangs))
 import qualified Network.Wai.Parse as NWP
 
@@ -41,7 +39,7 @@ selectLanguages avL (l:ls)
             , l'' <- matchesFor l'
             , langMatches lParts' l''
             ]
-  = let now = nonEmpty . filter (\l' -> none (((==) `on` CI.mk) l') ls) $ sortOn (Down . length) found
+  = let now = nonEmpty $ sortOn (Down . length) found
         others = selectLanguages avL ls
      in maybe id (\now' others' -> NonEmpty.fromList $ toList now' ++ filter (`notElem` toList now') (toList others')) now others
   | otherwise = selectLanguages avL ls
diff --git a/templates/i18n.julius b/templates/i18n.julius
index 97c088a81..690f8da89 100644
--- a/templates/i18n.julius
+++ b/templates/i18n.julius
@@ -1,6 +1,6 @@
 if (window.App) {
   window.App.i18n.addMany(#{frontendI18n});
-  // window.App.i18n.setLang(lang);  TODO: set language string for datepicker config
+  window.App.i18n.setDatetimeLocale(#{frontendDatetimeLocale});
 } else {
   throw new Error('I18n JavaScript service is missing!');
 }

From aec4b21757c4d38622db30d96faa95b4fcaa72c3 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Tue, 29 Oct 2019 15:56:38 +0100
Subject: [PATCH 023/126] feat(i18n): missing message translations; small fixes

---
 messages/button/en.msg                 |  3 +++
 messages/campus/en.msg                 |  6 ++++++
 messages/dummy/en.msg                  |  3 +++
 messages/frontend/en.msg               |  4 ++++
 messages/pw-hash/en.msg                |  4 ++++
 messages/uniworx/de-de-formal.msg      |  4 ++++
 messages/uniworx/en-eu.msg             | 10 +++++++---
 src/Handler/Profile.hs                 |  6 +++---
 templates/i18n/html-input/en-eu.hamlet |  2 +-
 9 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 messages/button/en.msg
 create mode 100644 messages/campus/en.msg
 create mode 100644 messages/dummy/en.msg
 create mode 100644 messages/frontend/en.msg
 create mode 100644 messages/pw-hash/en.msg

diff --git a/messages/button/en.msg b/messages/button/en.msg
new file mode 100644
index 000000000..b468d80ff
--- /dev/null
+++ b/messages/button/en.msg
@@ -0,0 +1,3 @@
+AmbiguousButtons: Multiple active submit buttons
+WrongButtonValue: Submit button has wrong value
+MultipleButtonValues: Submit button has multiple values
diff --git a/messages/campus/en.msg b/messages/campus/en.msg
new file mode 100644
index 000000000..6264db29e
--- /dev/null
+++ b/messages/campus/en.msg
@@ -0,0 +1,6 @@
+CampusIdentPlaceholder: First.Last@campus.lmu.de
+CampusIdent: Campus account
+CampusPassword: Password
+CampusPasswordPlaceholder: Password
+CampusSubmit: Send
+CampusInvalidCredentials: Invalid login
diff --git a/messages/dummy/en.msg b/messages/dummy/en.msg
new file mode 100644
index 000000000..da7b50f0f
--- /dev/null
+++ b/messages/dummy/en.msg
@@ -0,0 +1,3 @@
+DummyIdent: Identification
+DummyIdentPlaceholder: Identification
+DummyNoFormData: No form data received
diff --git a/messages/frontend/en.msg b/messages/frontend/en.msg
new file mode 100644
index 000000000..743eb91be
--- /dev/null
+++ b/messages/frontend/en.msg
@@ -0,0 +1,4 @@
+FilesSelected: Files selected
+SelectFile: Select file
+SelectFiles: Select file(s)
+AsyncFormFailure: Something went wrong, we are sorry. If this error occurs again, please let us know by clicking the Support button in the upper right corner. Thank you very much!
diff --git a/messages/pw-hash/en.msg b/messages/pw-hash/en.msg
new file mode 100644
index 000000000..52fb04bdf
--- /dev/null
+++ b/messages/pw-hash/en.msg
@@ -0,0 +1,4 @@
+PWHashIdent: Identification
+PWHashIdentPlaceholder: Identification
+PWHashPassword: Password
+PWHashPasswordPlaceholder: Password
diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index e665c10f7..bf651eca0 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -664,6 +664,10 @@ FormCosmetics: Oberfläche
 FormPersonalAppearance: Öffentliche Daten
 FormFieldRequiredTip: Gekennzeichnete Pflichtfelder sind immer auszufüllen
 
+PersonalInfoExamAchievementsWip: Die Anzeige von Prüfungsergebnissen wird momentan an dieser Stelle leider noch nicht unterstützt.
+PersonalInfoOwnTutorialsWip: Die Anzeige von Tutorien, zu denen Sie als Tutor eingetragen sind wird momentan an dieser Stelle leider noch nicht unterstützt.
+PersonalInfoTutorialsWip: Die Anzeige von Tutorien, zu denen Sie angemeldet sind wird momentan an dieser Stelle leider noch nicht unterstützt.
+
 ActiveAuthTags: Aktivierte Authorisierungsprädikate
 
 InvalidDateTimeFormat: Ungültiges Datums- und Zeitformat, JJJJ-MM-TTTHH:MM[:SS] Format erwartet
diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index bfa5628c2..f3a46e755 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -175,7 +175,7 @@ CourseApplicationTemplateTip: Students can download this template if they decide
 CourseApplicationsText: Text application
 CourseApplicationsTextTip: Should students submit a plaintext application (in addition to submitted files if applicable)?
 CourseApplicationRatingsVisible: Feedback to applications
-CourseApplicationRatingsVisibleTip: Should students be allowed to view rating and commentaries on their application after the rating period?
+CourseApplicationRatingsVisibleTip: Should students be allowed to view rating and comments on their application after the rating period?
 CourseApplicationRequired: Applications required
 CourseApplicationRequiredTip: Should registrations for this course be provisional at first (without capacity constraint), until they are approved by a course administrator?
 CourseApplicationInstructionsApplication: Instructions for application
@@ -661,6 +661,10 @@ FormCosmetics: Interface
 FormPersonalAppearance: Public data
 FormFieldRequiredTip: Marked fields need to be filled
 
+PersonalInfoExamAchievementsWip: The feature to display your exam achievements has not yet been implemented.
+PersonalInfoOwnTutorialsWip: The feature to display tutorials you have been assigned to as tutor has not yet been implemented.
+PersonalInfoTutorialsWip: The feature to display tutorials you have registered for has not yet been implemented.
+
 ActiveAuthTags: Active authorisation predicates
 
 InvalidDateTimeFormat: Invalid date and time format. YYYY-MM-DDTHH:MM[:SS] expected
@@ -1753,7 +1757,7 @@ AllocationStaffRegisterFrom: Registration of courses starts
 AllocationStaffRegister: Registration of courses
 AllocationRegisterFrom: Application period start
 AllocationRegister: Application period
-AllocationRegisterClosed: This central allocation is currntely closed.
+AllocationRegisterClosed: This central allocation is currently closed.
 AllocationRegisterOpensIn difftime: This central allocation is expected to open in #{difftime}
 AllocationStaffAllocationFrom: Grading of applications starts
 AllocationStaffAllocation: Grading of applications
@@ -1767,7 +1771,7 @@ AllocationOverrideDeregister: Leaving courses only until
 AllocationProcess: Allocation process
 AllocationNoApplication: No application
 AllocationPriority: Priority
-AllocationPriorityTip: Courses which you assign a higher priority are preferred during the allocation process.
+AllocationPriorityTip: Courses to which you assign a higher priority are preferred during the allocation process.
 AllocationPriorityRelative: The absolute priority values are meaningless. The only consideration is whether one course has a higher priority than another.
 AllocationTotalCoursesNegative: Requested number of placements must be greater than zero
 AllocationTotalCourses: Requested number of placements
diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index 19c59a07c..d6de8d24e 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -370,9 +370,9 @@ makeProfileData (Entity uid User{..}) = do
   submissionTable      <- mkSubmissionTable           uid -- Tabelle mit allen Abgaben und Abgabe-Gruppen
   submissionGroupTable <- mkSubmissionGroupTable      uid -- Tabelle mit allen Abgabegruppen
   correctionsTable     <- mkCorrectionsTable          uid -- Tabelle mit allen Korrektor-Aufgaben
-  let examTable        = [whamlet|Prüfungen werden hier momentan leider noch nicht unterstützt.|]
-  let ownTutorialTable = [whamlet|Übungsgruppen werden momentan leider noch nicht unterstützt.|]
-  let tutorialTable    = [whamlet|Übungsgruppen werden momentan leider noch nicht unterstützt.|]
+  let examTable        = [whamlet|_{MsgPersonalInfoExamAchievementsWip}|]
+  let ownTutorialTable = [whamlet|_{MsgPersonalInfoOwnTutorialsWip}|]
+  let tutorialTable    = [whamlet|_{MsgPersonalInfoTutorialsWip}|]
   lastLogin <- traverse (formatTime SelFormatDateTime) userLastAuthentication
   let profileRemarks = $(i18nWidgetFile "profile-remarks")
   return $(widgetFile "profileData")
diff --git a/templates/i18n/html-input/en-eu.hamlet b/templates/i18n/html-input/en-eu.hamlet
index d7630147a..6c45f2c59 100644
--- a/templates/i18n/html-input/en-eu.hamlet
+++ b/templates/i18n/html-input/en-eu.hamlet
@@ -1,7 +1,7 @@
 $newline never
 <h3>Attention: line breaks will be removed!
 <p>
-  The textarea currently accepts only Htmlp.<br />
+  The text area currently accepts only Html.<br />
   
   Thus any linebreaks will be ignored but can be added using #
   <code>&lt;br&gt;

From 5448804f01742e55b4ff8e755385bb748c3d44d2 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 29 Oct 2019 16:27:52 +0100
Subject: [PATCH 024/126] refactor(glossary): use more template haskell

---
 src/Handler/Info.hs       |  6 ++----
 src/Handler/Info/TH.hs    | 23 +++++++++++++++++++++++
 src/Handler/Utils/I18n.hs | 18 +++++++++++++++---
 3 files changed, 40 insertions(+), 7 deletions(-)
 create mode 100644 src/Handler/Info/TH.hs

diff --git a/src/Handler/Info.hs b/src/Handler/Info.hs
index c4a5fe7dc..69aa8437b 100644
--- a/src/Handler/Info.hs
+++ b/src/Handler/Info.hs
@@ -2,6 +2,7 @@ module Handler.Info where
 
 import Import
 import Handler.Utils
+import Handler.Info.TH
 
 import qualified Data.Map as Map
 import qualified Data.CaseInsensitive as CI
@@ -84,7 +85,4 @@ getGlossaryR =
     $(widgetFile "glossary")
   where
     entries = $(i18nWidgetFiles "glossary")
-    msgMap = Map.fromList
-      [ ("applicant"         , MsgApplicant        )
-      , ("course-participant", MsgCourseParticipant)
-      ]
+    msgMap = $(glossaryTerms "glossary")
diff --git a/src/Handler/Info/TH.hs b/src/Handler/Info/TH.hs
new file mode 100644
index 000000000..25c55bdb6
--- /dev/null
+++ b/src/Handler/Info/TH.hs
@@ -0,0 +1,23 @@
+module Handler.Info.TH
+  ( glossaryTerms
+  ) where
+
+import Import
+import Handler.Utils.I18n
+
+import Language.Haskell.TH
+
+import qualified Data.Char as Char
+
+import qualified Data.Map.Strict as Map
+import qualified Data.Text as Text
+
+
+glossaryTerms :: FilePath -> Q Exp
+glossaryTerms basename = do
+  translationsAvailable <- i18nWidgetFilesAvailable' basename
+  let terms = Map.mapWithKey (\k _ -> "Msg" <> unPathPiece k) translationsAvailable
+  [e|Map.fromList $(listE . map (\(int, msg) -> tupE [litE . stringL $ repack int, conE $ mkName msg]) $ Map.toList terms)|]
+  where
+    unPathPiece :: Text -> String
+    unPathPiece = repack . mconcat . map (over _head Char.toUpper) . Text.splitOn "-"
diff --git a/src/Handler/Utils/I18n.hs b/src/Handler/Utils/I18n.hs
index f3b2e157a..a98067a49 100644
--- a/src/Handler/Utils/I18n.hs
+++ b/src/Handler/Utils/I18n.hs
@@ -1,10 +1,13 @@
 module Handler.Utils.I18n
-  where
+  ( i18nWidgetFile
+  , i18nWidgetFilesAvailable, i18nWidgetFilesAvailable', i18nWidgetFiles
+  ) where
 
 import Import
 
 import Language.Haskell.TH
 import Language.Haskell.TH.Syntax (qRunIO)
+import qualified Language.Haskell.TH.Syntax as TH
 
 import qualified Data.List as List
 import qualified Data.List.NonEmpty as NonEmpty
@@ -47,8 +50,8 @@ i18nWidgetFile basename = do
                 ] ++ [ clause [wildP] (normalB [e| error "selectLanguage returned an invalid translation" |]) [] ] -- Fallback mostly there so compiler does not complain about non-exhaustive pattern match
     ] [e|selectLanguage availableTranslations' >>= $(varE ws)|]
 
-i18nWidgetFiles :: FilePath -> Q Exp
-i18nWidgetFiles basename = do
+i18nWidgetFilesAvailable' :: FilePath -> Q (Map Text (NonEmpty Text))
+i18nWidgetFilesAvailable' basename = do
   let i18nDirectory = "templates" </> "i18n" </> basename
   availableFiles <- qRunIO $ listDirectory i18nDirectory
   let fileKinds' = fmap (pack . dropExtension . takeBaseName &&& toTranslation . pack . takeBaseName) availableFiles
@@ -58,6 +61,15 @@ i18nWidgetFiles basename = do
 
   availableTranslations' <- iforM fileKinds $ \kind -> maybe (fail $ "‘" <> i18nDirectory <> "’ has no translations for ‘" <> unpack kind <> "’") return . NonEmpty.nonEmpty
 
+  return availableTranslations'
+
+i18nWidgetFilesAvailable :: FilePath -> Q Exp
+i18nWidgetFilesAvailable = TH.lift <=< i18nWidgetFilesAvailable'
+  
+i18nWidgetFiles :: FilePath -> Q Exp
+i18nWidgetFiles basename = do
+  availableTranslations' <- i18nWidgetFilesAvailable' basename
+
   -- Dispatch to correct language (depending on user settings via `selectLanguage`) at run time
   ws <- newName "ws" -- Name for dispatch function
   letE

From 7b3ed79ddd4c1d7d29c4830f7f5929662e9011aa Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Tue, 29 Oct 2019 16:33:52 +0100
Subject: [PATCH 025/126] feat(i18n): english imprint

---
 templates/i18n/imprint/en.msg | 86 +++++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 templates/i18n/imprint/en.msg

diff --git a/templates/i18n/imprint/en.msg b/templates/i18n/imprint/en.msg
new file mode 100644
index 000000000..43c712b20
--- /dev/null
+++ b/templates/i18n/imprint/en.msg
@@ -0,0 +1,86 @@
+$newline never
+<section>
+  <h2>Contact
+
+  <h3>Contents
+  <ul style="list-style-type: none">
+    <li>Gregor Kleen
+    <li>Oettingenstraße 67
+    <li>D-80538 München (Germany)
+    <li>E-Mail: ^{mailtoHtml "gregor.kleen@tcs.ifi.lmu.de"}
+    <li>Tel.: +49 (0) 89 / 2180 - 9139
+
+
+  <h3>Youth Protection
+  <ul style="list-style-type: none">
+    <li>Robert Hofer
+    <li>Leader IT Operations Team (RBG)
+    <li>Oettingenstraße 67
+    <li>D-80538 München (Germany)
+    <li>E-Mail: ^{mailtoHtml "rbg@ifi.lmu.de"}
+    <li>Web: #
+      <a href="https://www.rz.ifi.lmu.de/rbg/index_en.html">
+        https://www.rz.ifi.lmu.de/rbg/
+    <li>Tel.: +49 (0) 89 / 2180 - 9198
+
+
+<section>
+  <h2>Address
+
+  <h3>Rechnerbetriebsgruppe des Department "Institut für Informatik" der Ludwig-Maximilians-Universität München
+  <ul style="list-style-type: none">
+    <li>Oettingenstraße 67
+    <li>D-80538 München
+    <li>E-Mail: ^{mailtoHtml "rbg@ifi.lmu.de"}
+    <li>Web: #
+      <a href="https://www.rz.ifi.lmu.de/rbg/index_en.html">
+        https://www.rz.ifi.lmu.de/rbg/
+    <li>Tel.: +49 (0) 89 / 2180 - 9198
+  <p>
+    The IT Operations Team (RBG) is an organization of the department "Institut für Informatik", #
+    which is part of the LMU Munich.<br />
+    The IT Operations Team is represented by its leader and is subject to supervision # 
+    by the IT commissary of the directorate of the department.
+
+
+  <h3>Department "Institut für Informatik" of the LMU Munich
+  <ul style="list-style-type: none">
+    <li>Oettingenstraße 67
+    <li>D-80538 München
+    <li>Tel.: +49 (0) 89 / 2180 - 9141
+    <li>E-Mail: ^{mailtoHtml "geschaeftsstelle@ifi.lmu.de"}
+    <li>Web: #
+      <a href="https://www.ifi.lmu.de/front-page-en">
+        https://www.ifi.lmu.de/
+  <p>
+    The department "Institut für Informatik" is a part of the LMU Munich.<br />
+    The department is represented by the director of the department.
+
+
+  <h3>LMU - Ludwig-Maximilians-Universität München
+  <ul style="list-style-type: none">
+    <li>Geschwister-Scholl-Platz 1
+    <li>D-80539 München
+    <li>Tel.: +49 (0) 89 / 2180 - 0
+    <li>E-Mail: ^{mailtoHtml "praesidium@lmu.de"}
+    <li>Web: #
+      <a href="https://www.en.uni-muenchen.de/">
+        https://www.lmu.de/
+  <p>
+    The LMU Munich is a corporate body of the public law.<br />
+    It is legally represented by the president of the LMU Munich.
+
+
+<section>
+  <h2>VAT ID of the LMU
+  <p>
+    VAT ID as per § 27 a Umsatzsteuergesetz: DE 811205325
+
+
+<section>
+  <h2>Responsible Supervisory Body
+  <p>
+    Bayerisches Staatsministerium für #
+    Bildung und Kultus, Wissenschaft und Kunst
+    <br>
+    80327 München

From ba7c60ec1ce697e65a9a507073f03c540bb20d41 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 29 Oct 2019 17:58:16 +0100
Subject: [PATCH 026/126] feat(glossary): most glossary entries in de-de-formal

---
 messages/uniworx/de-de-formal.msg                  |  6 ++++++
 messages/uniworx/en-eu.msg                         |  8 +++++++-
 templates/glossary.cassius                         |  2 +-
 .../glossary/administrator.de-de-formal.hamlet     |  7 +++++++
 .../i18n/glossary/allocation.de-de-formal.hamlet   |  7 +++++++
 .../i18n/glossary/corrector.de-de-formal.hamlet    |  4 ++++
 ...course-application-required.de-de-formal.hamlet | 14 ++++++++++++++
 ...course-application-template.de-de-formal.hamlet |  8 ++++++++
 .../i18n/glossary/course-exams.de-de-formal.hamlet |  4 ++++
 .../glossary/course-lecturers.de-de-formal.hamlet  |  5 +++++
 .../glossary/course-material.de-de-formal.hamlet   |  5 +++++
 .../i18n/glossary/csv-format.de-de-formal.hamlet   | 12 ++++++++++++
 .../definition-course-events.de-de-formal.hamlet   |  5 +++++
 .../definition-course-news.de-de-formal.hamlet     |  4 ++++
 .../i18n/glossary/exam-result.de-de-formal.hamlet  |  8 ++++++++
 .../glossary/exercise-sheet.de-de-formal.hamlet    |  8 ++++++++
 .../i18n/glossary/invitations.de-de-formal.hamlet  | 13 +++++++++++++
 .../navigation-favourites.de-de-formal.hamlet      |  6 ++++++
 .../glossary/school-evaluation.de-de-formal.hamlet |  6 ++++++
 .../school-exam-office.de-de-formal.hamlet         | 11 +++++++++++
 .../glossary/school-lecturer.de-de-formal.hamlet   |  4 ++++
 templates/i18n/glossary/school.de-de-formal.hamlet |  5 +++++
 .../glossary/sheet-pseudonym.de-de-formal.hamlet   | 10 ++++++++++
 23 files changed, 160 insertions(+), 2 deletions(-)
 create mode 100644 templates/i18n/glossary/administrator.de-de-formal.hamlet
 create mode 100644 templates/i18n/glossary/allocation.de-de-formal.hamlet
 create mode 100644 templates/i18n/glossary/corrector.de-de-formal.hamlet
 create mode 100644 templates/i18n/glossary/course-application-required.de-de-formal.hamlet
 create mode 100644 templates/i18n/glossary/course-application-template.de-de-formal.hamlet
 create mode 100644 templates/i18n/glossary/course-exams.de-de-formal.hamlet
 create mode 100644 templates/i18n/glossary/course-lecturers.de-de-formal.hamlet
 create mode 100644 templates/i18n/glossary/course-material.de-de-formal.hamlet
 create mode 100644 templates/i18n/glossary/csv-format.de-de-formal.hamlet
 create mode 100644 templates/i18n/glossary/definition-course-events.de-de-formal.hamlet
 create mode 100644 templates/i18n/glossary/definition-course-news.de-de-formal.hamlet
 create mode 100644 templates/i18n/glossary/exam-result.de-de-formal.hamlet
 create mode 100644 templates/i18n/glossary/exercise-sheet.de-de-formal.hamlet
 create mode 100644 templates/i18n/glossary/invitations.de-de-formal.hamlet
 create mode 100644 templates/i18n/glossary/navigation-favourites.de-de-formal.hamlet
 create mode 100644 templates/i18n/glossary/school-evaluation.de-de-formal.hamlet
 create mode 100644 templates/i18n/glossary/school-exam-office.de-de-formal.hamlet
 create mode 100644 templates/i18n/glossary/school-lecturer.de-de-formal.hamlet
 create mode 100644 templates/i18n/glossary/school.de-de-formal.hamlet
 create mode 100644 templates/i18n/glossary/sheet-pseudonym.de-de-formal.hamlet

diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index bf651eca0..364fcb8b4 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -2104,3 +2104,9 @@ MenuGlossary: Begriffsverzeichnis
 
 Applicant: Bewerber
 CourseParticipant: Kursteilnehmer
+Administrator: Administrator
+CsvFormat: CSV-Format
+ExerciseSheet: Übungsblatt
+DefinitionCourseEvents: Kurstermine
+DefinitionCourseNews: Kurs-Aktuelles
+Invitations: Einladungen
\ No newline at end of file
diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index f3a46e755..ce14e2845 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -1802,7 +1802,7 @@ ApplicationRatingSection: Grading
 ApplicationRatingSectionSelfTip: You are authorised to edit the application as well as it's grading.
 
 AllocationSchoolShort: Department
-Allocation: Central alloction
+Allocation: Central allocation
 AllocationRegisterTo: Registration until
 
 AllocationListTitle: Central allocations
@@ -2100,3 +2100,9 @@ MenuGlossary: Glossary
 
 Applicant: Applicant
 CourseParticipant: Course participant
+Administrator: Administrator
+CsvFormat: CSV format
+ExerciseSheet: Exercise sheet
+DefinitionCourseEvents: Course occurrences
+DefinitionCourseNews: Course news
+Invitations: Invitations
\ No newline at end of file
diff --git a/templates/glossary.cassius b/templates/glossary.cassius
index 226288fc5..8a6bc42cf 100644
--- a/templates/glossary.cassius
+++ b/templates/glossary.cassius
@@ -11,4 +11,4 @@
     margin-left: 12px
 
   dd + dt, .dd + dt, dd + .dt, .dd + .dt
-    margin-top: 17px
\ No newline at end of file
+    margin-top: 17px
diff --git a/templates/i18n/glossary/administrator.de-de-formal.hamlet b/templates/i18n/glossary/administrator.de-de-formal.hamlet
new file mode 100644
index 000000000..b811f11f0
--- /dev/null
+++ b/templates/i18n/glossary/administrator.de-de-formal.hamlet
@@ -0,0 +1,7 @@
+$newline never
+<dd>
+  Nutzer, die, um die Funktionstüchtigkeit des Systems zu erhalten, über #
+  erweiterte Rechte innerhalb eines oder mehrerer Institute verfügen.<br />
+  Haben vollen Zugriff auf alle Kurse und Funktionen innerhalb ihrer Institute #
+  und auf einige systemweite Funktionalitäten wie z.B. das Ausstellen von #
+  Uni2work-internen Kennungen.
diff --git a/templates/i18n/glossary/allocation.de-de-formal.hamlet b/templates/i18n/glossary/allocation.de-de-formal.hamlet
new file mode 100644
index 000000000..7f74f9d15
--- /dev/null
+++ b/templates/i18n/glossary/allocation.de-de-formal.hamlet
@@ -0,0 +1,7 @@
+$newline never
+<dd>
+  Da verfügbare Kapazitäten in einigen Sorten von Veranstaltung (speziell #
+  Praktika und Seminare) i.A. nicht hinreichend sind für alle Studierenden die #
+  in einem bestimmten Semester an einer deartigen Veranstaltung teilnehmen #
+  wollen oder müssen, werden die verfügbaren Plätze zentral auf die #
+  Interessenten verteilt.
diff --git a/templates/i18n/glossary/corrector.de-de-formal.hamlet b/templates/i18n/glossary/corrector.de-de-formal.hamlet
new file mode 100644
index 000000000..6fc4ef37e
--- /dev/null
+++ b/templates/i18n/glossary/corrector.de-de-formal.hamlet
@@ -0,0 +1,4 @@
+$newline never
+<dd>
+  Nutzer, die von einem Kursverwalter beauftragt wurden bei der Korrektur von #
+  Übungsblättern und/oder Prüfungen mitzuwirken.
diff --git a/templates/i18n/glossary/course-application-required.de-de-formal.hamlet b/templates/i18n/glossary/course-application-required.de-de-formal.hamlet
new file mode 100644
index 000000000..a59191f5d
--- /dev/null
+++ b/templates/i18n/glossary/course-application-required.de-de-formal.hamlet
@@ -0,0 +1,14 @@
+$newline never
+<dd>
+  <p>
+    Wenn eine Veranstaltung ein Bewerbungsverfahren hat, werden, statt sich als #
+    Student direkt für die Veranstaltung anzumelden, nur Bewerbungen an die #
+    Veranstaltung gestellt.<br />
+    Es ist dann Aufgabe der Kursverwalter die Bewerbungen zu bewerten und ggf. zu #
+    akzeptieren.
+  <p>
+    Auch Veranstaltungen, die an einer Zentralanmeldung teilnehmen, können ein #
+    Bewerbungsverfahren haben oder nicht.<br />
+    In diesem Fall werden immer Bewerbungen (über die Zentralanmeldung) an den #
+    Kurs gestellt, es werden jedoch die Einstellungen vom kurseigenen #
+    Bewerbungsverfahren übernommen (z.B. ob die Abgabe von Dateien erlaubt ist).
diff --git a/templates/i18n/glossary/course-application-template.de-de-formal.hamlet b/templates/i18n/glossary/course-application-template.de-de-formal.hamlet
new file mode 100644
index 000000000..3f5d05417
--- /dev/null
+++ b/templates/i18n/glossary/course-application-template.de-de-formal.hamlet
@@ -0,0 +1,8 @@
+$newline never
+<dt .sec>
+  Anmeldungsvorlagen
+<dd>
+  Wenn eine Veranstaltung ein Bewerbungsverfahren hat, dass die Abgabe von #
+  Dateien erlaubt, gibt es für Kursverwalter die Möglichkeit einen Satz von #
+  Dateien zu publizieren der potentiellen Bewerbern dabei helfen soll #
+  Bewerbungen anzufertigen, die den Erwartungen der Kursverwalter entsprechen.
diff --git a/templates/i18n/glossary/course-exams.de-de-formal.hamlet b/templates/i18n/glossary/course-exams.de-de-formal.hamlet
new file mode 100644
index 000000000..f6bee2fd3
--- /dev/null
+++ b/templates/i18n/glossary/course-exams.de-de-formal.hamlet
@@ -0,0 +1,4 @@
+$newline never
+<dd>
+  Es lassen sich quasi beliebige Prüfungsformen (Projektabnahmen, mündliche #
+  Prüfungen, Klausuren, ...) in Uni2work modellieren.
diff --git a/templates/i18n/glossary/course-lecturers.de-de-formal.hamlet b/templates/i18n/glossary/course-lecturers.de-de-formal.hamlet
new file mode 100644
index 000000000..056e49c14
--- /dev/null
+++ b/templates/i18n/glossary/course-lecturers.de-de-formal.hamlet
@@ -0,0 +1,5 @@
+$newline never
+<dd>
+  Nutzer die bei der Organisation einer Veranstaltung mitwirken und hierfür vom #
+  Nutzer, der den Kurs im System angelegt hat, volle Kontrolle über alle Aspekte #
+  der Veranstaltung erhalten haben.
diff --git a/templates/i18n/glossary/course-material.de-de-formal.hamlet b/templates/i18n/glossary/course-material.de-de-formal.hamlet
new file mode 100644
index 000000000..671aed67e
--- /dev/null
+++ b/templates/i18n/glossary/course-material.de-de-formal.hamlet
@@ -0,0 +1,5 @@
+$newline never
+<dd>
+  Kursverwalter haben die Möglichkeit direkt in Uni2work zusätzliche #
+  Kursunterlagen (z.B. Foliensätze oder Programmbeispiele) an ihre #
+  Kursteilnehmer zu verteilen.
diff --git a/templates/i18n/glossary/csv-format.de-de-formal.hamlet b/templates/i18n/glossary/csv-format.de-de-formal.hamlet
new file mode 100644
index 000000000..faa47186d
--- /dev/null
+++ b/templates/i18n/glossary/csv-format.de-de-formal.hamlet
@@ -0,0 +1,12 @@
+$newline never
+<dt .sec>
+  CSV-Datei
+<dt .sec>
+  CSV-Import
+<dt .sec>
+  CSV-Export
+<dd>
+  Ein weit verbreitetes Format zum semi-strukturierten Datenaustausch zwischen #
+  unterschiedlichen Systemen.<br />
+  Kann von den meisten gängigen Tabellenkalkulations-Programmen verarbeitet #
+  werden.
diff --git a/templates/i18n/glossary/definition-course-events.de-de-formal.hamlet b/templates/i18n/glossary/definition-course-events.de-de-formal.hamlet
new file mode 100644
index 000000000..37bb04205
--- /dev/null
+++ b/templates/i18n/glossary/definition-course-events.de-de-formal.hamlet
@@ -0,0 +1,5 @@
+$newline never
+<dd>
+  Kursverwalter haben die Möglichkeit Termine im Bezug auf ihre Veranstaltung #
+  (Vorlesungen, Zentralübung, Klausureinsicht, ...) direkt auf der Kursseite zu #
+  publizieren.
diff --git a/templates/i18n/glossary/definition-course-news.de-de-formal.hamlet b/templates/i18n/glossary/definition-course-news.de-de-formal.hamlet
new file mode 100644
index 000000000..6d65c57b0
--- /dev/null
+++ b/templates/i18n/glossary/definition-course-news.de-de-formal.hamlet
@@ -0,0 +1,4 @@
+$newline never
+<dd>
+  Kursverwalter haben die Möglichkeit Neuigkeiten und Ankündigungen im Bezug auf #
+  ihre Veranstaltung direkt auf der Kursseite zu publizieren.
diff --git a/templates/i18n/glossary/exam-result.de-de-formal.hamlet b/templates/i18n/glossary/exam-result.de-de-formal.hamlet
new file mode 100644
index 000000000..062047f3a
--- /dev/null
+++ b/templates/i18n/glossary/exam-result.de-de-formal.hamlet
@@ -0,0 +1,8 @@
+$newline never
+<dd>
+  Kursverwalter (und von ihnen beauftragte Korrektoren) können die Ergebnisse #
+  einer Prüfung direkt in Uni2work hinterlegen.<br />
+  Dies dient sowohl der Rückmeldung an den jeweiligen Studierenden als auch #
+  können Prüfungsämter, mit den notwendigen Berechtigungen, die #
+  Prüfungsleistungen direkt aus Uni2work mit ihren eigenen Verwaltungssystemen #
+  synchronisieren.
diff --git a/templates/i18n/glossary/exercise-sheet.de-de-formal.hamlet b/templates/i18n/glossary/exercise-sheet.de-de-formal.hamlet
new file mode 100644
index 000000000..0042e2d65
--- /dev/null
+++ b/templates/i18n/glossary/exercise-sheet.de-de-formal.hamlet
@@ -0,0 +1,8 @@
+$newline never
+<dd>
+  Kursverwalter haben die Möglichkeit Übungsaufgaben zu ihren Veranstaltung #
+  direkt in Uni2work an die Kursteilnehmer zu verteilen.<br />
+  Gewöhnlicherweise haben Kursteilnehmer dann die Möglichkeit ihre erarbeiteten #
+  Lösungen in Uni2work hochzuladen (oder die Abgabe in einem externen System, #
+  z.B. auf Papier zu markieren) sodass Korrektor, Feedback und etwaige #
+  Bonuspunkte ebenfalls direkt in Uni2work verwaltet werden können.
diff --git a/templates/i18n/glossary/invitations.de-de-formal.hamlet b/templates/i18n/glossary/invitations.de-de-formal.hamlet
new file mode 100644
index 000000000..04c71c41c
--- /dev/null
+++ b/templates/i18n/glossary/invitations.de-de-formal.hamlet
@@ -0,0 +1,13 @@
+$newline never
+<dd>
+  Es besteht in Uni2work an vielen Stellen die Möglichkeit andere Benutzer in #
+  einen Prozess mit einzubeziehen (z.B. als Kursverwalter, Korrektor, #
+  Mitabgebender, ...). #
+  In solchen Fällen ist die interne Benutzerkennung des gewünschten Benutzers #
+  (z.B. die Campus Kennung) im Allgemeinen nicht bekannt.<br />
+  Deswegen gibt es gewöhnlicherweise die Möglichkeit eine Einladung an eine #
+  beliebige E-Mail Adresse zu verschicken. #
+  Wird eine derartige Einladung vom Empfänger angenommen (hierbei wird der #
+  korrekte Nutzer dann anhand des Logins des Empfängers identifiziert) wird der #
+  Nutzer ohne weiteres Zutun des Senders in den gewünschten Prozess #
+  miteinbezogen.
diff --git a/templates/i18n/glossary/navigation-favourites.de-de-formal.hamlet b/templates/i18n/glossary/navigation-favourites.de-de-formal.hamlet
new file mode 100644
index 000000000..646df5ae9
--- /dev/null
+++ b/templates/i18n/glossary/navigation-favourites.de-de-formal.hamlet
@@ -0,0 +1,6 @@
+$newline never
+<dd>
+  Das System markiert für jeden Nutzer eine gewisse Anzahl von Kursen als von #
+  besonderem Interesse.<br />
+  Die derart markierten Kurse werden für gewöhnlich in einer Leiste am linken #
+  Rand des Browserfensters angezeigt.
diff --git a/templates/i18n/glossary/school-evaluation.de-de-formal.hamlet b/templates/i18n/glossary/school-evaluation.de-de-formal.hamlet
new file mode 100644
index 000000000..19754674e
--- /dev/null
+++ b/templates/i18n/glossary/school-evaluation.de-de-formal.hamlet
@@ -0,0 +1,6 @@
+$newline never
+<dd>
+  Diese Berechtigung wird einzelnen Benutzern von einem Administrator für ein #
+  bestimmtes Institut erteilt.<br />
+  Diese Benutzer können dann die Teilnehmerlisten aller Kurse des relevanten #
+  Instituts einsehen um z.B. Vorlesungsumfragen durchzuführen.
diff --git a/templates/i18n/glossary/school-exam-office.de-de-formal.hamlet b/templates/i18n/glossary/school-exam-office.de-de-formal.hamlet
new file mode 100644
index 000000000..3f0461dab
--- /dev/null
+++ b/templates/i18n/glossary/school-exam-office.de-de-formal.hamlet
@@ -0,0 +1,11 @@
+$newline never
+<dd>
+  <p>
+    Modelliert jene Stellen der Universität, die Zugriff auf Prüfungsleistungen #
+    benötigen um sicherzustellen, dass Studienmodalitäten erfüllt und Leistungen #
+    korrekt anerkannt werden.<br />
+  <p>
+    <i>Teil des Prüfungsamts</i> ist eine Berechtigung die einzelnen Benutzern von #
+    einem Administrator für ein bestimmtes Institut eingeräumt wird.<br />
+    Diese Benutzer haben dann u.A. Zugriff auf alle beim relevanten Institut #
+    erbrachten und in Uni2work hinterlegten Prüfungsleistungen.
diff --git a/templates/i18n/glossary/school-lecturer.de-de-formal.hamlet b/templates/i18n/glossary/school-lecturer.de-de-formal.hamlet
new file mode 100644
index 000000000..90f2c92c7
--- /dev/null
+++ b/templates/i18n/glossary/school-lecturer.de-de-formal.hamlet
@@ -0,0 +1,4 @@
+$newline never
+<dd>
+  Nutzer denen von einem Administrator das Recht eingeräumt wurde innerhalb #
+  eines Instituts neue Veranstaltungen anzulegen.
diff --git a/templates/i18n/glossary/school.de-de-formal.hamlet b/templates/i18n/glossary/school.de-de-formal.hamlet
new file mode 100644
index 000000000..07a479cef
--- /dev/null
+++ b/templates/i18n/glossary/school.de-de-formal.hamlet
@@ -0,0 +1,5 @@
+$newline never
+<dd>
+  Das System ist in den meisten Aspekten in Institute unterteilt.<br />
+  Kurse haben stets eine Institutszugehörigkeit und die meisten #
+  Benutzerberechtigungen werden Institutsweise vergeben.
diff --git a/templates/i18n/glossary/sheet-pseudonym.de-de-formal.hamlet b/templates/i18n/glossary/sheet-pseudonym.de-de-formal.hamlet
new file mode 100644
index 000000000..b98c6c845
--- /dev/null
+++ b/templates/i18n/glossary/sheet-pseudonym.de-de-formal.hamlet
@@ -0,0 +1,10 @@
+$newline never
+<dd>
+  Ist die Abgabe für ein Übungsblatt über ein Uni2work-externes System (z.B. auf #
+  Papier) vorgesehen so können sich Kursteilnehmer auf der Seite des jeweiligen #
+  Übungsblattes Pseudonyme generieren lassen.<br />
+  Wenn die externe Abgabe mit einem derartigen Pseudonym markiert wird haben #
+  Korrektoren später die Möglichkeit Abgaben in Uni2work anzulegen die zu den #
+  externen Abgaben korrespondieren.<br />
+  So kann Feedback und etwaige Bonuspunkte direkt in Uni2work verwaltet werden, #
+  obwohl die tatsächlich Abgabe extern geschehen ist.

From 4ee3ad01bab9b8d57ae266904a259130a5c039d4 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 30 Oct 2019 10:34:25 +0100
Subject: [PATCH 027/126] feat(i18n): english versions of imprint and
 data-protection

---
 .../i18n/data-protection/de-de-formal.hamlet  |   2 +-
 templates/i18n/data-protection/en.hamlet      | 196 ++++++++++++++++++
 templates/i18n/imprint/{en.msg => en.hamlet}  |   0
 3 files changed, 197 insertions(+), 1 deletion(-)
 create mode 100644 templates/i18n/data-protection/en.hamlet
 rename templates/i18n/imprint/{en.msg => en.hamlet} (100%)

diff --git a/templates/i18n/data-protection/de-de-formal.hamlet b/templates/i18n/data-protection/de-de-formal.hamlet
index 13d75531a..c4f7e5bef 100644
--- a/templates/i18n/data-protection/de-de-formal.hamlet
+++ b/templates/i18n/data-protection/de-de-formal.hamlet
@@ -146,7 +146,7 @@ $#      <li>übertragene Datenmenge
 $#      <li>Info, ob der Zugriff/Abruf erfolgreich war
 $#      <li>Art und Version des Webclients
 $#      <li>gegebenenfalls Fehlermeldungen
-$#      <li>gegebenenfalls Text einer Suchanfrage
+$#      <li>gegebenenfalls Text der Such-/Filteranfrage oder der Sortierparameter
 $#    <p>
 $#      Im Falle einer Störung oder eines Sicherheitsvorfalles wird für die Dauer des Vorfalles
 $#      die Anonymisierung der IP-Adresse aufgehoben.
diff --git a/templates/i18n/data-protection/en.hamlet b/templates/i18n/data-protection/en.hamlet
new file mode 100644
index 000000000..9e744ac07
--- /dev/null
+++ b/templates/i18n/data-protection/en.hamlet
@@ -0,0 +1,196 @@
+$newline never
+<section>
+  <h2>Last changed 19.02.2019
+  <p>
+    The LMU as a corporate body of public law is subject to #
+    the BayDSG (bavarian legislation on data-protection), in some points the BDSG (Federal Data Protection Act), #
+    the GDPR (General Data Protection Regulation) and the corresponding articles relevant for data protection of special laws (Telemedia, Telecommunication, Employment Law, etc.).<br />
+    This data privacy statement fulfills the obligations to inform the user by the above-mentioned formalities.
+
+
+<section>
+  <h2>Contact
+  <h3>Data Protection Official of the LMU Munich
+  <ul style="list-style-type: none">
+    <li>Dr. Rolf Gemmeke
+    <li>Geschwister-Scholl-Platz 1, 80539 München
+    <li>Telefon: +49 (0) 89 2180-2414
+    <li>
+      <a href="http://www.uni-muenchen.de/einrichtungen/orga_lmu/beauftragte/dschutz/index.html">
+        Website of the data protection official of the LMU
+
+  <h3>Supervisory body for data protection in the public sector
+  <ul style="list-style-type: none">
+    <li>Bayerischer Landesbeauftragter für den Datenschutz
+    <li>Promenade 27
+    <li>91522 Ansbach
+    <li>Telefon: +49 (0) 981 53 1300
+    <li>
+      <a href="http://www.datenschutz-bayern.de/">
+        Website of the bavarian Data Protection Commissioner
+
+  <h3> Data Protection Coordinator of the department Institut für Informatik of the LMU
+  <ul style="list-style-type: none">
+    <li>Robert Hofer
+    <li>E-Mail: ^{mailtoHtml "dsk@ifi.lmu.de"}
+    <li>Telefon: +49 (0) 89 / 2180 - 9198
+
+  <h3>Legal person responsible for data processing
+  <ul style="list-style-type: none">
+    <li>Ludwig-Maximilians-Universität München
+    <li>Geschwister-Scholl-Platz 1
+    <li>80539 München
+    <li>Telefon: +49 (0) 89 / 2180 - 0
+    <li>E-Mail: ^{mailtoHtml "praesidium@lmu.de"}
+    <li>
+      <p>
+        The LMU Munich is a corporate body of the public law.<br />
+        It is legally represented by its president, Prof. Dr. Bernd Huber.
+
+      <h4>Responsible department
+      <ul style="list-style-type: none">
+        <li> IT Operations Team (RBG) of the department Institut für Informatik of the LMU Munich
+        <li>Oettingenstraße 67
+        <li>D-80538 München
+        <li>E-Mail: ^{mailtoHtml "rbg@ifi.lmu.de"}
+        <li>Tel.: +49 (0) 89 / 2180 - 9198
+
+<section>
+  <h2>Processing of Personal Data
+  <p>
+    The IT service and organization at the department Institut für Informatik follows #
+    the state of the art and best practices regarding security and IT operations.<br />
+    The protection of personal data as well as the sustainable operation of services #
+    in the scope of their possibilities is therefore guaranteed.
+
+  <h3>1. Webserver protocol
+
+  <h4>Data subjects
+
+  Every user of this webserver is affected by the acquisition and processing of the data.
+
+  <h4>Which data is acquired
+
+  The webserver records
+  <ul>
+    <li>Pseudonym corresponding to the IP address of the user's webclient of this service
+    <li> Date and time of the request of an element of the website
+    <li> Address of the requested element
+    <li> Amount of requested data
+    <li> Info whether the request was successful
+    <li> Type and version of the webclient
+    <li> Error messages if applicable
+    <li> Text of any search filter or sorting parameter if applicable
+  <p>
+    In case of a disturbance or a security incident, the anonymisation of the IP address will be #
+    temporarily repealed.
+  <p>
+    ipscrub (<a href="http://www.ipscrub.org">http://www.ipscrub.org</a>) is used to generate pseudonyms for IP addresses.
+
+
+  <h4>Appropriation
+  <p>
+    The collected data is only used for statistical analysis (in anonymised form), for enhancing Uni2work, # 
+    for analysis, elimination and protection against disturbances and in case of security incidents.<br />
+    Only the IT administrators responsible for the operation of the department Institut für Informatik # 
+    have access to the data.
+
+  <h4> Legal or Contractual Basis of Data Processing
+  <ul>
+    <li> Obligation to sustainable and secure operation of IT services according to the state of the art (TMG, TKG, DSG, EUDGV, BayDSG, BDSG)
+    <li> Jurisdiction to the retention period and type of webserver protocols
+    <li> Perception of a task that is of public interest
+
+  <h4> Disclosure
+  <p> The foremost legal contact person is the above-mentioned responsible department.
+
+  <h4> Deletion
+  <p>
+    Entries of the webserver protocol will be automatically deleted after seven days.<br />
+    Data that is processed due to a disturbance or a security incident will be deleted after the incident 
+    has been concluded.
+
+  <h4> Consent, Correction, Revocation, Request for Deletion or Transmission
+  <p>
+    A consent to the processing of the data is not necessary due to the type of the collected data, its designated use, #
+    the automated deletion and the basis of the collection (GDPR, Art. 6 Para. 1 e+f).<br />
+    The right of withdrawal for data processing, the right of petition for deletion, the right of petition #
+    for correction and the right of petition for transmission are not applicable due to the consent to data processing 
+    not being necessary as well as the type and use of the collected data.
+
+  <h4> Right to appeal
+  <p>
+    Users generally have the right to appeal to the supervisory body concerning any processing or transmission #
+    of their personal data.<br />
+    In case of the LMU Munich, the supervisory body is the above-mentioned Bavarian Data Protection Commissioner.<br />
+    Apart from that, any other above-mentioned legal contact person may be contacted concerning appeals and enquiries.
+
+  <h4> Obligation to participate in the processing of the data
+  <p>
+    The user is obligated to provide the data and allow its processing when using this service.<br />
+    We reserve the right to exclude users from the service who do not provide the data.
+
+$# <!-- CONTINUED -->
+$#
+$#    <h3>1. Daten der Webapplikation "Uni2Work"
+$#
+$#    <h4>Betroffene
+$#    Jeder Nutzer dieses Webservers ist von der Erhebung und Verarbeitung der Daten betroffen.
+$#
+$#    <h4>Welche Daten werden erhoben
+$#    Der Webserver protokolliert
+$#    <ul>
+$#      <li>Pseudonymisierte IP-Adresse des Webclients des Nutzers dieses Dienstes
+$#      <li>Datum und Uhrzeit des Abrufs eines Elementes der Webseite
+$#      <li>Adresse des abgerufenen Elementes
+$#      <li>übertragene Datenmenge
+$#      <li>Info, ob der Zugriff/Abruf erfolgreich war
+$#      <li>Art und Version des Webclients
+$#      <li>gegebenenfalls Fehlermeldungen
+$#      <li>gegebenenfalls Text einer Suchanfrage
+$#    <p>
+$#      Im Falle einer Störung oder eines Sicherheitsvorfalles wird für die Dauer des Vorfalles
+$#      die Anonymisierung der IP-Adresse aufgehoben.
+$#
+$#    <h4>Zweckbindung
+$#    <p>
+$#    Die erhobenen Daten werden nur für statistische Zwecke(anonymisiert), zur Verbesserung des Angebots,
+$#    zur Analyse, Beseitigung und Abwehr von Störungen und bei Sicherheitsvorfällen verwendet.
+$#    Nur die für den Betrieb zuständigen IT Administratoren des Instituts für Informatik
+$#    haben Zugriff auf die Daten.
+$#
+$#    <h4>Rechtliche oder vertragliche Grundlagen der Datenverarbeitung
+$#    <ul>
+$#      <li>Verpflichtung zum nachhaltigen und sicheren Betrieb von IT Diensten nach Stand der Technik (TMG, TKG, DSG, EUDGV, BayrDSG, BDSG)
+$#      <li>Rechtsprechung zur Aufbewahrungsdauer und Art von Webserverprotokollen
+$#      <li>Wahrnehmung einer Aufgabe, die im öffentlichen Interesse liegt
+$#
+$#    <h4>Auskunft
+$#    <p>Erster Ansprechspartner ist der oben aufgeführte verantwortliche Fachbereich.
+$#
+$#    <h4>Löschung
+$#    <p>
+$#      Nach sieben Tagen werden Einträge des Webserverprotokolls automatisch gelöscht. Daten die wegen einer
+$#      Störung oder eines Sicherheitsvorfalles verarbeitet werden, werden nach Ende des Vorfalls gelöscht.
+$#
+$#    <h4>Zustimmung, Berichtigung, Wiederruf, Antrag auf Löschung oder Übertragung
+$#    <p>
+$#      Eine Zustimmung zur Datenverarbeitung ist auf Grund der Art der erhobenen Daten, des Verwendungszwecks,
+$#      der automatischen Löschung und der Erhebungsgrundlagen nicht nötig (DSGVO Art.6 Abs.1 e+f).
+$#      Ein Wiederrufsrecht zur Verarbeitung, Antragsrecht auf Löschung, Antragsrecht auf Berichtigung,
+$#      Antragsrecht auf Übertragung ist wegen nicht nötiger Zustimmung zur Verarbeitung bzw. Art und Nutzung der erhobenen Daten nicht gegeben.
+$#
+$#    <h4>Beschwerderecht
+$#    <p>
+$#      Nutzer können sich generell bzgl. jeder Verarbeitung oder Weitergabe von
+$#      persönlichen Daten bei der Aufsichtbehörde beschweren.
+$#      Im Fall der LMU ist dies der oben genannte bayerische Datenschutzbeauftragte.
+$#      Ansonsten können auch alle anderen oben genannten Ansprechpartner
+$#      bzgl. Beschwerden und Nachfragen kontaktiert werden.
+$#
+$#    <h4>Verpflichtung zur Teilnahme an der Verarbeitung
+$#    <p>
+$#      Der Nutzer ist bei Nutzung dieses Dienstes verpflichtet die Daten bereitzustellen und
+$#      verarbeiten zu lassen. Wir behalten uns das Recht vor,
+$#      Nutzer, die die Daten nicht bereitstellen, von der Nutzung des Dienstes auszuschließen.
+$#
diff --git a/templates/i18n/imprint/en.msg b/templates/i18n/imprint/en.hamlet
similarity index 100%
rename from templates/i18n/imprint/en.msg
rename to templates/i18n/imprint/en.hamlet

From 7daa42db983c815dbfc65b50c59a10dbc5054bda Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 30 Oct 2019 10:37:23 +0100
Subject: [PATCH 028/126] feat(glossary): more de-de-formal

---
 messages/uniworx/de-de-formal.msg                  |  7 ++++++-
 messages/uniworx/en-eu.msg                         |  7 ++++++-
 src/Foundation.hs                                  |  8 ++++++++
 src/Handler/Utils/I18n.hs                          |  2 +-
 templates/i18n/glossary/clone.de-de-formal.hamlet  |  6 ++++++
 .../i18n/glossary/comm-course.de-de-formal.hamlet  |  6 ++++++
 .../i18n/glossary/corrector.de-de-formal.hamlet    | 14 +++++++++++++-
 .../i18n/glossary/deficit.de-de-formal.hamlet      |  9 +++++++++
 .../i18n/glossary/sheet-group.de-de-formal.hamlet  | 11 +++++++++++
 9 files changed, 66 insertions(+), 4 deletions(-)
 create mode 100644 templates/i18n/glossary/clone.de-de-formal.hamlet
 create mode 100644 templates/i18n/glossary/comm-course.de-de-formal.hamlet
 create mode 100644 templates/i18n/glossary/deficit.de-de-formal.hamlet
 create mode 100644 templates/i18n/glossary/sheet-group.de-de-formal.hamlet

diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index 364fcb8b4..edb8c8f88 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -2109,4 +2109,9 @@ CsvFormat: CSV-Format
 ExerciseSheet: Übungsblatt
 DefinitionCourseEvents: Kurstermine
 DefinitionCourseNews: Kurs-Aktuelles
-Invitations: Einladungen
\ No newline at end of file
+Invitations: Einladungen
+SheetSubmission: Abgabe
+CommCourse: Kursmitteilung
+CommTutorial: Tutorium-Mitteilung
+Clone: Klonen
+Deficit: Defizit
\ No newline at end of file
diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index ce14e2845..55e78a5d2 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -2105,4 +2105,9 @@ CsvFormat: CSV format
 ExerciseSheet: Exercise sheet
 DefinitionCourseEvents: Course occurrences
 DefinitionCourseNews: Course news
-Invitations: Invitations
\ No newline at end of file
+Invitations: Invitations
+SheetSubmission: Sheet submission
+CommCourse: Course message
+CommTutorial: Tutorial message
+Clone: Cloning
+Deficit: Deficit
\ No newline at end of file
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 50d2b538d..5dc20beb7 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -2278,6 +2278,14 @@ defaultLinks = fmap catMaybes . mapM runMaybeT $ -- Define the menu items of the
       , menuItemModal = False
       , menuItemAccessCallback' = return True
       }
+  , return MenuItem
+      { menuItemType  = Footer
+      , menuItemLabel = MsgMenuGlossary
+      , menuItemIcon  = Nothing
+      , menuItemRoute = SomeRoute GlossaryR
+      , menuItemModal = False
+      , menuItemAccessCallback' = return True
+      }
   , do
       mCurrentRoute <- getCurrentRoute
 
diff --git a/src/Handler/Utils/I18n.hs b/src/Handler/Utils/I18n.hs
index a98067a49..18c27ce84 100644
--- a/src/Handler/Utils/I18n.hs
+++ b/src/Handler/Utils/I18n.hs
@@ -73,7 +73,7 @@ i18nWidgetFiles basename = do
   -- Dispatch to correct language (depending on user settings via `selectLanguage`) at run time
   ws <- newName "ws" -- Name for dispatch function
   letE
-    [ funD ws $ [ clause [litP $ stringL kind, litP $ stringL l] (normalB . widgetFile $ "i18n" </> basename </> kind <.> l) []
+    [ funD ws $ [ clause [litP $ stringL kind, litP $ stringL l] (normalB [e|$(widgetFile $ "i18n" </> basename </> kind <.> l) :: Widget|]) []
                 | (unpack -> kind, ls) <- Map.toList availableTranslations'
                 , l <- unpack <$> NonEmpty.toList ls
                 ] ++ [ clause [wildP, wildP] (normalB [e| error "selectLanguage returned an invalid translation" |]) [] ] -- Fallback mostly there so compiler does not complain about non-exhaustive pattern match
diff --git a/templates/i18n/glossary/clone.de-de-formal.hamlet b/templates/i18n/glossary/clone.de-de-formal.hamlet
new file mode 100644
index 000000000..e6440bff2
--- /dev/null
+++ b/templates/i18n/glossary/clone.de-de-formal.hamlet
@@ -0,0 +1,6 @@
+$newline never
+<dd>
+  Einige Objekte in Uni2work (Kurse, Übungsblätter, ...) lassen sich klonen.<br />
+  D.h. alle sinnvollen Einstellungen werden vom geklonten Objekt übernommen und #
+  das Formular zum Erstellen eines neuen Objekts vom selben Typ mit den Daten #
+  vorausgefüllt.
diff --git a/templates/i18n/glossary/comm-course.de-de-formal.hamlet b/templates/i18n/glossary/comm-course.de-de-formal.hamlet
new file mode 100644
index 000000000..ee17239b7
--- /dev/null
+++ b/templates/i18n/glossary/comm-course.de-de-formal.hamlet
@@ -0,0 +1,6 @@
+$newline never
+<dt .sec>
+  _{MsgCommTutorial}
+<dd>
+  Kursverwalter und Tutoren haben die Möglichkeit über Uni2work E-Mails an ihre #
+  Kurs- bzw. Tutoriumsteilnehmer zu verschicken.
diff --git a/templates/i18n/glossary/corrector.de-de-formal.hamlet b/templates/i18n/glossary/corrector.de-de-formal.hamlet
index 6fc4ef37e..6435cfed6 100644
--- a/templates/i18n/glossary/corrector.de-de-formal.hamlet
+++ b/templates/i18n/glossary/corrector.de-de-formal.hamlet
@@ -1,4 +1,16 @@
 $newline never
+<dt .sec>
+  _{MsgCorProportion}
+<dt .sec>
+  _{MsgCorState}
 <dd>
   Nutzer, die von einem Kursverwalter beauftragt wurden bei der Korrektur von #
-  Übungsblättern und/oder Prüfungen mitzuwirken.
+  einzelnen Übungsblättern oder Prüfungen mitzuwirken.<br />
+  Beim Zuteilen für ein Übungsblatt kann ein Korrekturanteil festgelegt werden. #
+  Bei der automatischen Verteilung von Korrekturen wird dann versucht die #
+  eingestellten Anteile möglichst gut widerzuspiegeln.<br />
+  Bei Übungsblättern gibt es die Möglichkeit Korrektoren zwar prinzipiell #
+  zuzuteilen aber dann als abwesend oder entschuldigt zu markieren.<br />
+  In beiden Fällen werden diesem Korrektor dann keine Abgaben zugeteilt.
+  Ist der Korrektor nur abwesend werden die so nicht zugeteilten Abgaben jedoch #
+  als Defizit vermerkt.
diff --git a/templates/i18n/glossary/deficit.de-de-formal.hamlet b/templates/i18n/glossary/deficit.de-de-formal.hamlet
new file mode 100644
index 000000000..81af624c7
--- /dev/null
+++ b/templates/i18n/glossary/deficit.de-de-formal.hamlet
@@ -0,0 +1,9 @@
+$newline never
+<dd>
+  Wenn die Korrekturen für ein Übungsblatt aufgeteilt werden, kann nicht immer #
+  sichergestellt werden, dass alle Korrektoren eine Anzahl von Abgaben zugeteilt #
+  bekommen, die exakt ihrem Korrekturanteil entspricht.<br />
+  Ist dies der Fall wird die Anzahl von Abgaben, um die die Belastung eines #
+  einzelnen Korrektors vom Ideal abweicht, als Defizit bezeichnet.<br />
+  Bei der nächsten Zuteilung von Korrekturen wird dann versucht etwaige Defizite #
+  auszugleichen.
diff --git a/templates/i18n/glossary/sheet-group.de-de-formal.hamlet b/templates/i18n/glossary/sheet-group.de-de-formal.hamlet
new file mode 100644
index 000000000..76c617afe
--- /dev/null
+++ b/templates/i18n/glossary/sheet-group.de-de-formal.hamlet
@@ -0,0 +1,11 @@
+$newline never
+<dt .sec>
+  _{MsgSheetGroupArbitrary}
+<dt .sec>
+  _{MsgSheetGroupRegisteredGroups}
+<dd>
+  Es besteht die Möglichkeit Studierenden zu erlauben, bei der Abgabe für #
+  einzelne Übungsblätter in Gruppen abzugeben.<br />
+  Diese Gruppen werden entweder für jede Abgabe von den Studierenden selbst #
+  festgelegt (Arbiträre Gruppen) oder von einem Kursverwalter festgelegt #
+  (Registrierte Gruppen).

From b9c284cde268f0865cc32d2c973206b227042700 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 30 Oct 2019 10:52:57 +0100
Subject: [PATCH 029/126] fix: typos

---
 templates/i18n/data-protection/en.hamlet | 32 ++++++++++++------------
 templates/i18n/imprint/en.hamlet         | 12 ++++-----
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/templates/i18n/data-protection/en.hamlet b/templates/i18n/data-protection/en.hamlet
index 9e744ac07..b1e4c7da0 100644
--- a/templates/i18n/data-protection/en.hamlet
+++ b/templates/i18n/data-protection/en.hamlet
@@ -4,8 +4,8 @@ $newline never
   <p>
     The LMU as a corporate body of public law is subject to #
     the BayDSG (bavarian legislation on data-protection), in some points the BDSG (Federal Data Protection Act), #
-    the GDPR (General Data Protection Regulation) and the corresponding articles relevant for data protection of special laws (Telemedia, Telecommunication, Employment Law, etc.).<br />
-    This data privacy statement fulfills the obligations to inform the user by the above-mentioned formalities.
+    the GDPR (General Data Protection Regulation), and the corresponding articles of special laws (Telemedia, Telecommunication, Employment Law, etc.) relevant to data protection.<br />
+    This data privacy statement fulfills the obligations to inform the user as result from the formalities mentioned above.
 
 
 <section>
@@ -73,36 +73,36 @@ $newline never
 
   The webserver records
   <ul>
-    <li>Pseudonym corresponding to the IP address of the user's webclient of this service
+    <li> Pseudonym corresponding to the IP address of the user's webclient
     <li> Date and time of the request of an element of the website
     <li> Address of the requested element
     <li> Amount of requested data
-    <li> Info whether the request was successful
+    <li> Info on whether the request was successful
     <li> Type and version of the webclient
     <li> Error messages if applicable
-    <li> Text of any search filter or sorting parameter if applicable
+    <li> Text of any search, filter, or sorting parameter as applicable
   <p>
-    In case of a disturbance or a security incident, the anonymisation of the IP address will be #
-    temporarily repealed.
+    In case of a disturbance or security incident, the pseudonymisation of the IP address will be #
+    temporarily suspended.
   <p>
     ipscrub (<a href="http://www.ipscrub.org">http://www.ipscrub.org</a>) is used to generate pseudonyms for IP addresses.
 
 
   <h4>Appropriation
   <p>
-    The collected data is only used for statistical analysis (in anonymised form), for enhancing Uni2work, # 
-    for analysis, elimination and protection against disturbances and in case of security incidents.<br />
-    Only the IT administrators responsible for the operation of the department Institut für Informatik # 
+    The collected data is only used for statistical analysis (in anonymised form), for enhancing Uni2work, #
+    for analysis, elimination and protection against disturbances, and in case of security incidents.<br />
+    Only the IT administrators responsible for the operation of the department Institut für Informatik #
     have access to the data.
 
   <h4> Legal or Contractual Basis of Data Processing
   <ul>
     <li> Obligation to sustainable and secure operation of IT services according to the state of the art (TMG, TKG, DSG, EUDGV, BayDSG, BDSG)
-    <li> Jurisdiction to the retention period and type of webserver protocols
-    <li> Perception of a task that is of public interest
+    <li> Legislation pertaining to the retention period and type of webserver protocols
+    <li> Performing of a function that is of public interest
 
   <h4> Disclosure
-  <p> The foremost legal contact person is the above-mentioned responsible department.
+  <p> First point of contact is the above-mentioned responsible department.
 
   <h4> Deletion
   <p>
@@ -112,10 +112,10 @@ $newline never
 
   <h4> Consent, Correction, Revocation, Request for Deletion or Transmission
   <p>
-    A consent to the processing of the data is not necessary due to the type of the collected data, its designated use, #
+    Consent is not required for the processing of the data due to the type of the collected data, its designated use, #
     the automated deletion and the basis of the collection (GDPR, Art. 6 Para. 1 e+f).<br />
     The right of withdrawal for data processing, the right of petition for deletion, the right of petition #
-    for correction and the right of petition for transmission are not applicable due to the consent to data processing 
+    for correction, and the right of petition for transmission are not applicable due to the consent to data processing #
     not being necessary as well as the type and use of the collected data.
 
   <h4> Right to appeal
@@ -123,7 +123,7 @@ $newline never
     Users generally have the right to appeal to the supervisory body concerning any processing or transmission #
     of their personal data.<br />
     In case of the LMU Munich, the supervisory body is the above-mentioned Bavarian Data Protection Commissioner.<br />
-    Apart from that, any other above-mentioned legal contact person may be contacted concerning appeals and enquiries.
+    Apart from that, any other above-mentioned legal contact person may be contacted concerning appeals and inquiries.
 
   <h4> Obligation to participate in the processing of the data
   <p>
diff --git a/templates/i18n/imprint/en.hamlet b/templates/i18n/imprint/en.hamlet
index 43c712b20..8bb5c2779 100644
--- a/templates/i18n/imprint/en.hamlet
+++ b/templates/i18n/imprint/en.hamlet
@@ -37,9 +37,9 @@ $newline never
         https://www.rz.ifi.lmu.de/rbg/
     <li>Tel.: +49 (0) 89 / 2180 - 9198
   <p>
-    The IT Operations Team (RBG) is an organization of the department "Institut für Informatik", #
+    The IT Operations Team (RBG) is an organization of the department Institut für Informatik, #
     which is part of the LMU Munich.<br />
-    The IT Operations Team is represented by its leader and is subject to supervision # 
+    The IT Operations Team is represented by its leader and is subject to supervision #
     by the IT commissary of the directorate of the department.
 
 
@@ -53,8 +53,8 @@ $newline never
       <a href="https://www.ifi.lmu.de/front-page-en">
         https://www.ifi.lmu.de/
   <p>
-    The department "Institut für Informatik" is a part of the LMU Munich.<br />
-    The department is represented by the director of the department.
+    The department Institut für Informatik is a part of the LMU Munich.<br />
+    The department is represented by its director.
 
 
   <h3>LMU - Ludwig-Maximilians-Universität München
@@ -67,8 +67,8 @@ $newline never
       <a href="https://www.en.uni-muenchen.de/">
         https://www.lmu.de/
   <p>
-    The LMU Munich is a corporate body of the public law.<br />
-    It is legally represented by the president of the LMU Munich.
+    The LMU Munich is a corporate body of public law.<br />
+    It is legally represented by its president.
 
 
 <section>

From 237c5868b708e6f5734eef19c63f1764eb3cbdfb Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 30 Oct 2019 15:40:02 +0100
Subject: [PATCH 030/126] feat(glossary): english glossary

---
 messages/uniworx/de-de-formal.msg                 |  7 ++++++-
 messages/uniworx/en-eu.msg                        |  7 ++++++-
 .../i18n/glossary/administrator.en-eu.hamlet      |  7 +++++++
 templates/i18n/glossary/allocation.en-eu.hamlet   |  6 ++++++
 .../i18n/glossary/applicant.de-de-formal.hamlet   |  4 ++--
 templates/i18n/glossary/applicant.en-eu.hamlet    |  9 +++++++++
 templates/i18n/glossary/clone.en-eu.hamlet        |  5 +++++
 templates/i18n/glossary/comm-course.en-eu.hamlet  |  6 ++++++
 templates/i18n/glossary/corrector.en-eu.hamlet    | 15 +++++++++++++++
 .../course-application-required.en-eu.hamlet      | 13 +++++++++++++
 ...ourse-application-template.de-de-formal.hamlet |  2 +-
 .../course-application-template.en-eu.hamlet      |  8 ++++++++
 templates/i18n/glossary/course-exams.en-eu.hamlet |  4 ++++
 .../i18n/glossary/course-lecturers.en-eu.hamlet   |  4 ++++
 .../i18n/glossary/course-material.en-eu.hamlet    |  4 ++++
 .../course-participant.de-de-formal.hamlet        |  4 ++--
 .../i18n/glossary/course-participant.en-eu.hamlet |  8 ++++++++
 .../i18n/glossary/csv-format.de-de-formal.hamlet  |  6 +++---
 templates/i18n/glossary/csv-format.en-eu.hamlet   | 10 ++++++++++
 templates/i18n/glossary/deficit.en-eu.hamlet      |  9 +++++++++
 .../definition-course-events.en-eu.hamlet         |  5 +++++
 .../glossary/definition-course-news.en-eu.hamlet  |  4 ++++
 templates/i18n/glossary/exam-result.en-eu.hamlet  |  7 +++++++
 .../i18n/glossary/exercise-sheet.en-eu.hamlet     |  7 +++++++
 .../i18n/glossary/invitations.de-de-formal.hamlet |  2 +-
 templates/i18n/glossary/invitations.en-eu.hamlet  | 10 ++++++++++
 .../glossary/navigation-favourites.en-eu.hamlet   |  4 ++++
 .../i18n/glossary/school-evaluation.en-eu.hamlet  |  5 +++++
 .../i18n/glossary/school-exam-office.en-eu.hamlet | 10 ++++++++++
 .../i18n/glossary/school-lecturer.en-eu.hamlet    |  4 ++++
 templates/i18n/glossary/school.en-eu.hamlet       |  5 +++++
 .../i18n/glossary/sheet-group.de-de-formal.hamlet |  2 +-
 templates/i18n/glossary/sheet-group.en-eu.hamlet  | 10 ++++++++++
 .../i18n/glossary/sheet-pseudonym.en-eu.hamlet    |  9 +++++++++
 34 files changed, 210 insertions(+), 12 deletions(-)
 create mode 100644 templates/i18n/glossary/administrator.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/allocation.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/applicant.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/clone.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/comm-course.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/corrector.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/course-application-required.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/course-application-template.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/course-exams.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/course-lecturers.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/course-material.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/course-participant.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/csv-format.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/deficit.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/definition-course-events.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/definition-course-news.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/exam-result.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/exercise-sheet.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/invitations.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/navigation-favourites.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/school-evaluation.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/school-exam-office.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/school-lecturer.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/school.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/sheet-group.en-eu.hamlet
 create mode 100644 templates/i18n/glossary/sheet-pseudonym.en-eu.hamlet

diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index edb8c8f88..94164d703 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -100,6 +100,7 @@ CourseRegistration: Kursanmeldung
 CourseRegisterOpen: Anmeldung möglich
 CourseRegisterOk: Erfolgreich zum Kurs angemeldet
 CourseDeregisterOk: Erfolgreich vom Kurs abgemeldet
+CourseApply: Zum Kurs bewerben
 CourseApplyOk: Erfolgreich zum Kurs beworben
 CourseRetractApplyOk: Bewerbung zum Kurs erfolgreich zurückgezogen
 CourseDeregisterLecturerTip: Wenn Sie den Teilnehmer vom Kurs abmelden kann es sein, dass sie Zugriff auf diese Daten verlieren
@@ -153,6 +154,7 @@ CourseUserNote: Notiz
 CourseUserNoteTooltip: Nur für Verwalter dieses Kurses einsehbar
 CourseUserNoteSaved: Notizänderungen gespeichert
 CourseUserNoteDeleted: Teilnehmernotiz gelöscht
+CourseUserRegister: Zum Kurs anmelden
 CourseUserDeregister: Vom Kurs abmelden
 CourseUsersDeregistered count@Int64: #{show count} Teilnehmer vom Kurs abgemeldet
 CourseUserRegisterTutorial: Zu einem Tutorium anmelden
@@ -1596,6 +1598,8 @@ ExamUserMarkedSynchronised n@Int: #{n} #{pluralDE n "Prüfungsleistung" "Prüfun
 ExamOfficeExamUsersHeading: Prüfungsleistungen
 
 CsvFile: CSV-Datei
+CsvImport: CSV-Import
+CsvExport: CSV-Export
 CsvModifyExisting: Existierende Einträge angleichen
 CsvAddNew: Neue Einträge einfügen
 CsvDeleteMissing: Fehlende Einträge entfernen
@@ -1750,6 +1754,7 @@ SchoolFunctionInvitationAccepted school@SchoolName renderedFunction@Text: #{rend
 AllocationActive: Aktiv
 AllocationName: Name
 AllocationAvailableCourses: Kurse
+AllocationApplication: Bewerbung
 AllocationAppliedCourses: Bewerbungen
 AllocationNumCoursesAvailableApplied available@Int applied@Int: Sie haben sich bisher für #{applied}/#{available} #{pluralDE applied "Kurs" "Kursen"} beworben
 AllocationTitle termText@Text ssh'@SchoolShorthand allocation@AllocationName: #{termText} - #{ssh'}: #{allocation}
@@ -2114,4 +2119,4 @@ SheetSubmission: Abgabe
 CommCourse: Kursmitteilung
 CommTutorial: Tutorium-Mitteilung
 Clone: Klonen
-Deficit: Defizit
\ No newline at end of file
+Deficit: Defizit
diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index 55e78a5d2..70e000917 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -100,6 +100,7 @@ CourseRegistration: Enrolment
 CourseRegisterOpen: Enrolment is allowed
 CourseRegisterOk: Successfully enrolled for course
 CourseDeregisterOk: Successfully left course
+CourseApply: Apply for course
 CourseApplyOk: Successfully applied for course
 CourseRetractApplyOk: Successfully retracted application for course
 CourseDeregisterLecturerTip: If you deregister the participant you might loose access to this data
@@ -148,6 +149,7 @@ CourseFilterNone: —
 BoolIrrelevant: —
 CourseDeleteQuestion: Are you sure you want to delete the below-mentioned course?
 CourseDeleted: Course deleted
+CourseUserRegister: Enrol for course
 CourseUserTutorials: Registered tutorials
 CourseUserNote: Note
 CourseUserNoteTooltip: Only visible to administrators of this course
@@ -1591,6 +1593,8 @@ ExamUserMarkedSynchronised n: Successfully marked #{n} #{pluralEN n "exam achiev
 ExamOfficeExamUsersHeading: Exam achievements
 
 CsvFile: CSV file
+CsvImport: CSV import
+CsvExport: CSV export
 CsvModifyExisting: Modify existing entries
 CsvAddNew: Add new entries
 CsvDeleteMissing: Delete missing entries
@@ -1745,6 +1749,7 @@ SchoolFunctionInvitationAccepted school renderedFunction: Successfully accepted
 AllocationActive: Active
 AllocationName: Name
 AllocationAvailableCourses: Courses
+AllocationApplication: Application
 AllocationAppliedCourses: Applications
 AllocationNumCoursesAvailableApplied available applied: You have applied for #{applied}/#{available} #{pluralEN applied "course" "courses"}
 AllocationTitle termText ssh' allocation: #{termText} - #{ssh'}: #{allocation}
@@ -2110,4 +2115,4 @@ SheetSubmission: Sheet submission
 CommCourse: Course message
 CommTutorial: Tutorial message
 Clone: Cloning
-Deficit: Deficit
\ No newline at end of file
+Deficit: Deficit
diff --git a/templates/i18n/glossary/administrator.en-eu.hamlet b/templates/i18n/glossary/administrator.en-eu.hamlet
new file mode 100644
index 000000000..fcfc6d5b2
--- /dev/null
+++ b/templates/i18n/glossary/administrator.en-eu.hamlet
@@ -0,0 +1,7 @@
+$newline never
+<dd>
+  Users that have advanced permissions in one or more departments in order to #
+  sustain the operational reliability of the system.<br />
+  Have full access to all courses and functions inside of their department(s) #
+  and to some system-wide functionalities, such as the creation of Uni2work 
+  accounts.
diff --git a/templates/i18n/glossary/allocation.en-eu.hamlet b/templates/i18n/glossary/allocation.en-eu.hamlet
new file mode 100644
index 000000000..30e10ffc4
--- /dev/null
+++ b/templates/i18n/glossary/allocation.en-eu.hamlet
@@ -0,0 +1,6 @@
+$newline never
+<dd>
+  Since the available capacity in some sorts of courses (especially practicals and seminars) #
+  is limited and generally insufficient for the number of students that want/need to participate #
+  in this sort of course in a specific semester, the capacity is distributed among all participants #
+  of an allocation.
diff --git a/templates/i18n/glossary/applicant.de-de-formal.hamlet b/templates/i18n/glossary/applicant.de-de-formal.hamlet
index 700dac30a..244b44e93 100644
--- a/templates/i18n/glossary/applicant.de-de-formal.hamlet
+++ b/templates/i18n/glossary/applicant.de-de-formal.hamlet
@@ -1,8 +1,8 @@
 $newline never
 <dt .sec>
-  Bewerbung
+  _{MsgAllocationApplication}
 <dt .sec>
-  Zu einem Kurs bewerben
+  _{MsgCourseApply}
 <dd>
   Studierende können eine Bewerbung für einen Kurs hinterlegen.<br />
   Wird die Bewerbung akzeptiert (oder der Studierende dem Kurs zugeteilt) wird der Studierende zusätzlich Kursteilnehmer.
diff --git a/templates/i18n/glossary/applicant.en-eu.hamlet b/templates/i18n/glossary/applicant.en-eu.hamlet
new file mode 100644
index 000000000..b47ecb2ec
--- /dev/null
+++ b/templates/i18n/glossary/applicant.en-eu.hamlet
@@ -0,0 +1,9 @@
+$newline never
+<dt .sec>
+  _{MsgAllocationApplication}
+<dt .sec>
+  _{MsgCourseApply}
+<dd>
+  Students can apply for specific courses.<br />
+  The student will additionally become a course participant should the application be accepted #
+  (or should the student be allocated to the course).
diff --git a/templates/i18n/glossary/clone.en-eu.hamlet b/templates/i18n/glossary/clone.en-eu.hamlet
new file mode 100644
index 000000000..10664fe55
--- /dev/null
+++ b/templates/i18n/glossary/clone.en-eu.hamlet
@@ -0,0 +1,5 @@
+$newline never
+<dd>
+  Some objects in Uni2work (courses, exercise sheets, ...) can be cloned.<br />
+  This means that all reasonable settings will be taken from the cloned object and #
+  the form to create a new objects of this type will be pre-filled with these settings.
diff --git a/templates/i18n/glossary/comm-course.en-eu.hamlet b/templates/i18n/glossary/comm-course.en-eu.hamlet
new file mode 100644
index 000000000..402dfa70e
--- /dev/null
+++ b/templates/i18n/glossary/comm-course.en-eu.hamlet
@@ -0,0 +1,6 @@
+$newline never
+<dt .sec>
+  _{MsgCommTutorial}
+<dd>
+  Course administrators and tutors are able to send e-mails to their course/tutorial #
+  participants via Uni2work.
diff --git a/templates/i18n/glossary/corrector.en-eu.hamlet b/templates/i18n/glossary/corrector.en-eu.hamlet
new file mode 100644
index 000000000..a23c7554a
--- /dev/null
+++ b/templates/i18n/glossary/corrector.en-eu.hamlet
@@ -0,0 +1,15 @@
+$newline never
+<dt .sec>
+  _{MsgCorProportion}
+<dt .sec>
+  _{MsgCorState}
+<dd>
+  Users that are authorised by a course administrator to collaborate in #
+  the correction of single exercise sheets or exams.<br />
+  A correction proportion can be set when assigning a corrector to an exercise sheet. #
+  These proportions will then be acknowledged as good as possible in the next automated #
+  distribution of corrections.<br />
+  For exercise sheets, there is the option to assign correctors in principle, but then mark #
+  them as missing or excused.<br />
+  In both cases, these correctors will not be assigned to any submissions. 
+  In case of a missing corrector, those missed submissions will then be registered as deficit.
diff --git a/templates/i18n/glossary/course-application-required.en-eu.hamlet b/templates/i18n/glossary/course-application-required.en-eu.hamlet
new file mode 100644
index 000000000..f3d03136f
--- /dev/null
+++ b/templates/i18n/glossary/course-application-required.en-eu.hamlet
@@ -0,0 +1,13 @@
+$newline never
+<dd>
+  <p>
+    If a course requires application, only applications of students will be registered #
+    instead of students directly enrolling in the course.<br />
+    It is then up to the course administrators to rate and (if applicable) accept them.
+  <p>
+    Courses that participate in a central allocation also have the option of requiring an #
+    application.<br />
+    In case of a central allocation, every course that participates in it will receive #
+    applications, regardless of whether this option is set or not. However, course settings #
+    regardings the application procedure (e.g. submissions of files, required filenames, ...) #
+    will not be ignored.
diff --git a/templates/i18n/glossary/course-application-template.de-de-formal.hamlet b/templates/i18n/glossary/course-application-template.de-de-formal.hamlet
index 3f5d05417..7ab4315e8 100644
--- a/templates/i18n/glossary/course-application-template.de-de-formal.hamlet
+++ b/templates/i18n/glossary/course-application-template.de-de-formal.hamlet
@@ -1,6 +1,6 @@
 $newline never
 <dt .sec>
-  Anmeldungsvorlagen
+  _{MsgCourseApplicationTemplateRegistration}
 <dd>
   Wenn eine Veranstaltung ein Bewerbungsverfahren hat, dass die Abgabe von #
   Dateien erlaubt, gibt es für Kursverwalter die Möglichkeit einen Satz von #
diff --git a/templates/i18n/glossary/course-application-template.en-eu.hamlet b/templates/i18n/glossary/course-application-template.en-eu.hamlet
new file mode 100644
index 000000000..08756d9c0
--- /dev/null
+++ b/templates/i18n/glossary/course-application-template.en-eu.hamlet
@@ -0,0 +1,8 @@
+$newline never
+<dt .sec>
+  _{MsgCourseApplicationTemplateRegistration}
+<dd>
+  If a course requires applications that allow for the submission of files, #
+  the course administrators are able to publish a set of files that may help #
+  future applicants in composing applications that meet the course administrator's #
+  expectations.
diff --git a/templates/i18n/glossary/course-exams.en-eu.hamlet b/templates/i18n/glossary/course-exams.en-eu.hamlet
new file mode 100644
index 000000000..867c1b42b
--- /dev/null
+++ b/templates/i18n/glossary/course-exams.en-eu.hamlet
@@ -0,0 +1,4 @@
+$newline never
+<dd>
+  Quasi-arbitrary forms of exams (project reviews, oral exams, written exams, ...) #
+  can be modelled in Uni2work.
diff --git a/templates/i18n/glossary/course-lecturers.en-eu.hamlet b/templates/i18n/glossary/course-lecturers.en-eu.hamlet
new file mode 100644
index 000000000..b105dba93
--- /dev/null
+++ b/templates/i18n/glossary/course-lecturers.en-eu.hamlet
@@ -0,0 +1,4 @@
+$newline never
+<dd>
+  Users that help in organising a course and are therefore granted full control #
+  (by the user that created the course) over every aspects of the course.
diff --git a/templates/i18n/glossary/course-material.en-eu.hamlet b/templates/i18n/glossary/course-material.en-eu.hamlet
new file mode 100644
index 000000000..84d541ee7
--- /dev/null
+++ b/templates/i18n/glossary/course-material.en-eu.hamlet
@@ -0,0 +1,4 @@
+$newline never
+<dd>
+  Course administrators are able to distribute additional course material #
+  (e.g. slides or program examples) to the participants directly using Uni2work.
diff --git a/templates/i18n/glossary/course-participant.de-de-formal.hamlet b/templates/i18n/glossary/course-participant.de-de-formal.hamlet
index 5c543e376..482d434b2 100644
--- a/templates/i18n/glossary/course-participant.de-de-formal.hamlet
+++ b/templates/i18n/glossary/course-participant.de-de-formal.hamlet
@@ -1,8 +1,8 @@
 $newline never
 <dt .sec>
-  Zu einem Kurs anmelden
+  _{MsgCourseUserRegister}
 <dt .sec>
-  Von einem Kurs abmelden
+  _{MsgCourseUserDeregister}
 <dd>
   Studierende, die sich explizit mit einem Kurs assoziiert haben (oder ihm zugeteilt wurden).<br />
   Haben Zugriff auf Material und Teile des Kurses (Anmeldungen zu Tutorien, Prüfungen, ...)
diff --git a/templates/i18n/glossary/course-participant.en-eu.hamlet b/templates/i18n/glossary/course-participant.en-eu.hamlet
new file mode 100644
index 000000000..94c076303
--- /dev/null
+++ b/templates/i18n/glossary/course-participant.en-eu.hamlet
@@ -0,0 +1,8 @@
+$newline never
+<dt .sec>
+  _{MsgCourseUserRegister}
+<dt .sec>
+  _{MsgCourseUserDeregister}
+<dd>
+  Students that explicitely associate themselves with a course (or are allocated to it).<br />
+  Have access to material and parts of a course (register for tutorials, exams, ...).
diff --git a/templates/i18n/glossary/csv-format.de-de-formal.hamlet b/templates/i18n/glossary/csv-format.de-de-formal.hamlet
index faa47186d..971953800 100644
--- a/templates/i18n/glossary/csv-format.de-de-formal.hamlet
+++ b/templates/i18n/glossary/csv-format.de-de-formal.hamlet
@@ -1,10 +1,10 @@
 $newline never
 <dt .sec>
-  CSV-Datei
+  _{MsgCsvFile}
 <dt .sec>
-  CSV-Import
+  _{MsgCsvImport}
 <dt .sec>
-  CSV-Export
+  _{MsgCsvExport}
 <dd>
   Ein weit verbreitetes Format zum semi-strukturierten Datenaustausch zwischen #
   unterschiedlichen Systemen.<br />
diff --git a/templates/i18n/glossary/csv-format.en-eu.hamlet b/templates/i18n/glossary/csv-format.en-eu.hamlet
new file mode 100644
index 000000000..25e361a15
--- /dev/null
+++ b/templates/i18n/glossary/csv-format.en-eu.hamlet
@@ -0,0 +1,10 @@
+$newline never
+<dt .sec>
+  _{MsgCsvFile}
+<dt .sec>
+  _{MsgCsvImport}
+<dt .sec>
+  _{MsgCsvExport}
+<dd>
+  Widespread format for semi-structured data exchange between separate systems.<br />
+  Can be processed by most established spreadsheet programs.
diff --git a/templates/i18n/glossary/deficit.en-eu.hamlet b/templates/i18n/glossary/deficit.en-eu.hamlet
new file mode 100644
index 000000000..b848afac2
--- /dev/null
+++ b/templates/i18n/glossary/deficit.en-eu.hamlet
@@ -0,0 +1,9 @@
+$newline never
+<dd>
+  Once the correctors have been assigned to the submissions of an exercise sheet, #
+  there is no guarantee that every corrector is assigned to corrections exactly according #
+  to their proportion.<br />
+  In case of a deviation, the discrepancy between a corrector's number of assigned submissions #
+  and their ideal number of submissions (according to their proportion) is called #
+  the corrector's deficit.<br />
+  It will be attempted to compensate for this deficit in the next assignment of corrections.
diff --git a/templates/i18n/glossary/definition-course-events.en-eu.hamlet b/templates/i18n/glossary/definition-course-events.en-eu.hamlet
new file mode 100644
index 000000000..04f9b425e
--- /dev/null
+++ b/templates/i18n/glossary/definition-course-events.en-eu.hamlet
@@ -0,0 +1,5 @@
+$newline never
+<dd>
+  Course administrators are able to publish events regarding their course #
+  (lectures, exercise discussion, exam review, ...) directly on the course overview #
+  page.
diff --git a/templates/i18n/glossary/definition-course-news.en-eu.hamlet b/templates/i18n/glossary/definition-course-news.en-eu.hamlet
new file mode 100644
index 000000000..56a605b5b
--- /dev/null
+++ b/templates/i18n/glossary/definition-course-news.en-eu.hamlet
@@ -0,0 +1,4 @@
+$newline never
+<dd>
+  Course administrators are able to publish news and announcements regarding their #
+  course directly on the course overview page.
diff --git a/templates/i18n/glossary/exam-result.en-eu.hamlet b/templates/i18n/glossary/exam-result.en-eu.hamlet
new file mode 100644
index 000000000..a50c26ec6
--- /dev/null
+++ b/templates/i18n/glossary/exam-result.en-eu.hamlet
@@ -0,0 +1,7 @@
+$newline never
+<dd>
+  Course administrators (and assigned correctors) are able to save the results #
+  of an exam directly in Uni2work.<br />
+  This serves as the purpose to give feedback to the students as well as the purpose #
+  to let Exam Offices with requisite permissions synchronise exam results in Uni2work #
+  with exam results in their own management systems.
diff --git a/templates/i18n/glossary/exercise-sheet.en-eu.hamlet b/templates/i18n/glossary/exercise-sheet.en-eu.hamlet
new file mode 100644
index 000000000..b062c7009
--- /dev/null
+++ b/templates/i18n/glossary/exercise-sheet.en-eu.hamlet
@@ -0,0 +1,7 @@
+$newline never
+<dd>
+  Course administrators are able to distribute exercise sheets of their courses #
+  to the participants directly using Uni2work.<br />
+  In general, course participants then have permission to upload their solutions to #
+  the exercise sheet in Uni2work (or in an external system, e.g. on paper). Correctors, #
+  feedback and possible bonus points can then be managed using Uni2work.
diff --git a/templates/i18n/glossary/invitations.de-de-formal.hamlet b/templates/i18n/glossary/invitations.de-de-formal.hamlet
index 04c71c41c..5e0596f79 100644
--- a/templates/i18n/glossary/invitations.de-de-formal.hamlet
+++ b/templates/i18n/glossary/invitations.de-de-formal.hamlet
@@ -5,7 +5,7 @@ $newline never
   Mitabgebender, ...). #
   In solchen Fällen ist die interne Benutzerkennung des gewünschten Benutzers #
   (z.B. die Campus Kennung) im Allgemeinen nicht bekannt.<br />
-  Deswegen gibt es gewöhnlicherweise die Möglichkeit eine Einladung an eine #
+  Deswegen gibt es an den meisten dieser Stellen die Möglichkeit eine Einladung an eine #
   beliebige E-Mail Adresse zu verschicken. #
   Wird eine derartige Einladung vom Empfänger angenommen (hierbei wird der #
   korrekte Nutzer dann anhand des Logins des Empfängers identifiziert) wird der #
diff --git a/templates/i18n/glossary/invitations.en-eu.hamlet b/templates/i18n/glossary/invitations.en-eu.hamlet
new file mode 100644
index 000000000..49367c50f
--- /dev/null
+++ b/templates/i18n/glossary/invitations.en-eu.hamlet
@@ -0,0 +1,10 @@
+$newline never
+<dd>
+  On many places in Uni2work, there is the option to include other users in a process #
+  (e.g. assign as course administrator, corrector, co-submittors, ...). #
+  In those cases, the internal ident of a user (e.g. their campus account) is generally #
+  unknown.<br />
+  This is why in some of those places, you can send an invitation to an arbitrary #
+  email address. #
+  If a recipient accepts such an invitation (the correct user ident will be identified #
+  using the recipient's login), the user will be included without further action of the sender.
diff --git a/templates/i18n/glossary/navigation-favourites.en-eu.hamlet b/templates/i18n/glossary/navigation-favourites.en-eu.hamlet
new file mode 100644
index 000000000..e89c46f2e
--- /dev/null
+++ b/templates/i18n/glossary/navigation-favourites.en-eu.hamlet
@@ -0,0 +1,4 @@
+$newline never
+<dd>
+  For every user, the system marks a certain amount of courses as favourites.<br />
+  These marked courses are generally shown on a bar at the left border of the browser window.
diff --git a/templates/i18n/glossary/school-evaluation.en-eu.hamlet b/templates/i18n/glossary/school-evaluation.en-eu.hamlet
new file mode 100644
index 000000000..bca21f47f
--- /dev/null
+++ b/templates/i18n/glossary/school-evaluation.en-eu.hamlet
@@ -0,0 +1,5 @@
+$newline never
+<dd>
+  This permission is granted by an administrator to single users for a specific department.<br />
+  Users with this permission are allowed to view the list of participants of every course of the #
+  department, e.g. to conduct surveys regarding courses.
diff --git a/templates/i18n/glossary/school-exam-office.en-eu.hamlet b/templates/i18n/glossary/school-exam-office.en-eu.hamlet
new file mode 100644
index 000000000..5456d6f6c
--- /dev/null
+++ b/templates/i18n/glossary/school-exam-office.en-eu.hamlet
@@ -0,0 +1,10 @@
+$newline never
+<dd>
+  <p>
+    Models the parts of a university that need access to exam results to ensure that #
+    the modalities of study are satisfied and exam achievements are accredited correctly.<br />
+  <p>
+    <i>Part of an Exam Office</i> is a permission that is granted by an administrator to single #
+    users for a specific department.<br />
+    Users with this permission then have access to all exam achievements (in Uni2work) provided for #
+    the relevant department.
diff --git a/templates/i18n/glossary/school-lecturer.en-eu.hamlet b/templates/i18n/glossary/school-lecturer.en-eu.hamlet
new file mode 100644
index 000000000..749e91240
--- /dev/null
+++ b/templates/i18n/glossary/school-lecturer.en-eu.hamlet
@@ -0,0 +1,4 @@
+$newline never
+<dd>
+  Users that are granted department-wide permission by an administrator to create #
+  and manage new courses.
diff --git a/templates/i18n/glossary/school.en-eu.hamlet b/templates/i18n/glossary/school.en-eu.hamlet
new file mode 100644
index 000000000..2c6e28ab2
--- /dev/null
+++ b/templates/i18n/glossary/school.en-eu.hamlet
@@ -0,0 +1,5 @@
+$newline never
+<dd>
+  The system is divided into departments in most aspects.<br />
+  Every course has an associated department, and most user permissions #
+  are granted department-wise.
diff --git a/templates/i18n/glossary/sheet-group.de-de-formal.hamlet b/templates/i18n/glossary/sheet-group.de-de-formal.hamlet
index 76c617afe..ef33c09df 100644
--- a/templates/i18n/glossary/sheet-group.de-de-formal.hamlet
+++ b/templates/i18n/glossary/sheet-group.de-de-formal.hamlet
@@ -4,7 +4,7 @@ $newline never
 <dt .sec>
   _{MsgSheetGroupRegisteredGroups}
 <dd>
-  Es besteht die Möglichkeit Studierenden zu erlauben, bei der Abgabe für #
+  Es besteht die Möglichkeit Kursteilnehmern zu erlauben, bei der Abgabe für #
   einzelne Übungsblätter in Gruppen abzugeben.<br />
   Diese Gruppen werden entweder für jede Abgabe von den Studierenden selbst #
   festgelegt (Arbiträre Gruppen) oder von einem Kursverwalter festgelegt #
diff --git a/templates/i18n/glossary/sheet-group.en-eu.hamlet b/templates/i18n/glossary/sheet-group.en-eu.hamlet
new file mode 100644
index 000000000..d3f2526bb
--- /dev/null
+++ b/templates/i18n/glossary/sheet-group.en-eu.hamlet
@@ -0,0 +1,10 @@
+$newline never
+<dt .sec>
+  _{MsgSheetGroupArbitrary}
+<dt .sec>
+  _{MsgSheetGroupRegisteredGroups}
+<dd>
+  There is an option to allow course participants to submit solutions for #
+  single exercise sheets in groups.<br />
+  These groups are either selected per submission by the participants #
+  (arbitrary groups), or by a course administrator (registered groups).
diff --git a/templates/i18n/glossary/sheet-pseudonym.en-eu.hamlet b/templates/i18n/glossary/sheet-pseudonym.en-eu.hamlet
new file mode 100644
index 000000000..f08485b58
--- /dev/null
+++ b/templates/i18n/glossary/sheet-pseudonym.en-eu.hamlet
@@ -0,0 +1,9 @@
+$newline never
+<dd>
+  If it is intended to submit solutions for an exercise sheet via an external system #
+  (e.g. on paper), then the course participants can generate a pseudonym on the page #
+  of an exercise sheet.<br />
+  An external submission that carries this pseudonym can then enable correctors to create #
+  submissions in Uni2work that correspond with the external submission.<br />
+  This way, feedback and bonus points can be managed directly in Uni2work, even though #
+  the actual submissions are done externally.

From e517a8e4701f2df2f1a39e3ed16db0e5e3393ea1 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Thu, 31 Oct 2019 13:47:31 +0100
Subject: [PATCH 031/126] fix: fix i18n widget files

---
 src/Handler/Utils/I18n.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Handler/Utils/I18n.hs b/src/Handler/Utils/I18n.hs
index 18c27ce84..6c6ec72bf 100644
--- a/src/Handler/Utils/I18n.hs
+++ b/src/Handler/Utils/I18n.hs
@@ -57,7 +57,7 @@ i18nWidgetFilesAvailable' basename = do
   let fileKinds' = fmap (pack . dropExtension . takeBaseName &&& toTranslation . pack . takeBaseName) availableFiles
       fileKinds :: Map Text [Text]
       fileKinds = sortWith (NTop . flip List.elemIndex (NonEmpty.toList appLanguages)) . Set.toList <$> Map.fromListWith Set.union [ (kind, Set.singleton l) | (kind, Just l) <- fileKinds' ]
-      toTranslation fName = listToMaybe . sortOn length . mapMaybe (flip Text.stripPrefix fName) $ map fst fileKinds'
+      toTranslation fName = listToMaybe . sortOn length . mapMaybe (flip Text.stripPrefix fName . (<>".")) $ map fst fileKinds'
 
   availableTranslations' <- iforM fileKinds $ \kind -> maybe (fail $ "‘" <> i18nDirectory <> "’ has no translations for ‘" <> unpack kind <> "’") return . NonEmpty.nonEmpty
 

From 8af256e55dd2c23276c2894f734e80ee5b5712bb Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 31 Oct 2019 16:12:06 +0100
Subject: [PATCH 032/126] fix(i18n): fix typos

---
 templates/i18n/glossary/administrator.en-eu.hamlet          | 4 ++--
 templates/i18n/glossary/applicant.en-eu.hamlet              | 2 +-
 templates/i18n/glossary/corrector.en-eu.hamlet              | 2 +-
 .../i18n/glossary/course-application-required.en-eu.hamlet  | 6 +++---
 templates/i18n/glossary/course-lecturers.en-eu.hamlet       | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/i18n/glossary/administrator.en-eu.hamlet b/templates/i18n/glossary/administrator.en-eu.hamlet
index fcfc6d5b2..ada2d73a7 100644
--- a/templates/i18n/glossary/administrator.en-eu.hamlet
+++ b/templates/i18n/glossary/administrator.en-eu.hamlet
@@ -1,7 +1,7 @@
 $newline never
 <dd>
-  Users that have advanced permissions in one or more departments in order to #
-  sustain the operational reliability of the system.<br />
+  Users that have elevated permissions in one or more departments in order to #
+  ensure the operational reliability of the system.<br />
   Have full access to all courses and functions inside of their department(s) #
   and to some system-wide functionalities, such as the creation of Uni2work 
   accounts.
diff --git a/templates/i18n/glossary/applicant.en-eu.hamlet b/templates/i18n/glossary/applicant.en-eu.hamlet
index b47ecb2ec..7be8c0b49 100644
--- a/templates/i18n/glossary/applicant.en-eu.hamlet
+++ b/templates/i18n/glossary/applicant.en-eu.hamlet
@@ -5,5 +5,5 @@ $newline never
   _{MsgCourseApply}
 <dd>
   Students can apply for specific courses.<br />
-  The student will additionally become a course participant should the application be accepted #
+  The student will additionally become a course participant, should the application be accepted #
   (or should the student be allocated to the course).
diff --git a/templates/i18n/glossary/corrector.en-eu.hamlet b/templates/i18n/glossary/corrector.en-eu.hamlet
index a23c7554a..1f2ac33a2 100644
--- a/templates/i18n/glossary/corrector.en-eu.hamlet
+++ b/templates/i18n/glossary/corrector.en-eu.hamlet
@@ -7,7 +7,7 @@ $newline never
   Users that are authorised by a course administrator to collaborate in #
   the correction of single exercise sheets or exams.<br />
   A correction proportion can be set when assigning a corrector to an exercise sheet. #
-  These proportions will then be acknowledged as good as possible in the next automated #
+  These proportions will then be followed as closely as possible during the next automated #
   distribution of corrections.<br />
   For exercise sheets, there is the option to assign correctors in principle, but then mark #
   them as missing or excused.<br />
diff --git a/templates/i18n/glossary/course-application-required.en-eu.hamlet b/templates/i18n/glossary/course-application-required.en-eu.hamlet
index f3d03136f..1ba0a12a7 100644
--- a/templates/i18n/glossary/course-application-required.en-eu.hamlet
+++ b/templates/i18n/glossary/course-application-required.en-eu.hamlet
@@ -5,9 +5,9 @@ $newline never
     instead of students directly enrolling in the course.<br />
     It is then up to the course administrators to rate and (if applicable) accept them.
   <p>
-    Courses that participate in a central allocation also have the option of requiring an #
-    application.<br />
+    Courses that participate in a central allocation also have the option of requiring #
+    applications.<br />
     In case of a central allocation, every course that participates in it will receive #
     applications, regardless of whether this option is set or not. However, course settings #
     regardings the application procedure (e.g. submissions of files, required filenames, ...) #
-    will not be ignored.
+    will be applied.
diff --git a/templates/i18n/glossary/course-lecturers.en-eu.hamlet b/templates/i18n/glossary/course-lecturers.en-eu.hamlet
index b105dba93..20e125a17 100644
--- a/templates/i18n/glossary/course-lecturers.en-eu.hamlet
+++ b/templates/i18n/glossary/course-lecturers.en-eu.hamlet
@@ -1,4 +1,4 @@
 $newline never
 <dd>
   Users that help in organising a course and are therefore granted full control #
-  (by the user that created the course) over every aspects of the course.
+  (by the user that created the course) over every aspect of the course.

From 339fa398b48eefd7b208ede9036a35795185725e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 31 Oct 2019 16:15:16 +0100
Subject: [PATCH 033/126] fix(fe-i18n-spec): fix tests

---
 frontend/src/services/i18n/i18n.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/services/i18n/i18n.spec.js b/frontend/src/services/i18n/i18n.spec.js
index 1b4edf3c4..b809895e5 100644
--- a/frontend/src/services/i18n/i18n.spec.js
+++ b/frontend/src/services/i18n/i18n.spec.js
@@ -9,7 +9,7 @@ describe('I18n', () => {
 
   // helper function
   function expectTranslation(id, value) {
-    expect(i18n.translations[id]).toMatch(value);
+    expect(i18n.get(id)).toMatch(value);
   }
 
   it('should create', () => {
@@ -38,7 +38,7 @@ describe('I18n', () => {
 
   describe('get()', () => {
     it('should return stored translations', () => {
-      i18n.translations.id1 = 'something';
+      i18n.add('id1', 'something');
       expect(i18n.get('id1')).toMatch('something');
     });
 

From b749378d21ff92540ad850447bb0a3beeb204abc Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 31 Oct 2019 16:29:19 +0100
Subject: [PATCH 034/126] refactor: hlint

---
 src/Handler/Utils/I18n.hs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Handler/Utils/I18n.hs b/src/Handler/Utils/I18n.hs
index 6c6ec72bf..8cb60c63a 100644
--- a/src/Handler/Utils/I18n.hs
+++ b/src/Handler/Utils/I18n.hs
@@ -59,9 +59,7 @@ i18nWidgetFilesAvailable' basename = do
       fileKinds = sortWith (NTop . flip List.elemIndex (NonEmpty.toList appLanguages)) . Set.toList <$> Map.fromListWith Set.union [ (kind, Set.singleton l) | (kind, Just l) <- fileKinds' ]
       toTranslation fName = listToMaybe . sortOn length . mapMaybe (flip Text.stripPrefix fName . (<>".")) $ map fst fileKinds'
 
-  availableTranslations' <- iforM fileKinds $ \kind -> maybe (fail $ "‘" <> i18nDirectory <> "’ has no translations for ‘" <> unpack kind <> "’") return . NonEmpty.nonEmpty
-
-  return availableTranslations'
+  iforM fileKinds $ \kind -> maybe (fail $ "‘" <> i18nDirectory <> "’ has no translations for ‘" <> unpack kind <> "’") return . NonEmpty.nonEmpty
 
 i18nWidgetFilesAvailable :: FilePath -> Q Exp
 i18nWidgetFilesAvailable = TH.lift <=< i18nWidgetFilesAvailable'

From 9ba0e27ba2208ef835538f6fecc092aab85411ea Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 31 Oct 2019 16:58:30 +0100
Subject: [PATCH 035/126] fix(tests): i18n changes

---
 test/TestImport.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/TestImport.hs b/test/TestImport.hs
index 46abcbe9a..3b1280e33 100644
--- a/test/TestImport.hs
+++ b/test/TestImport.hs
@@ -108,7 +108,7 @@ authenticateAs (Entity _ User{..}) = do
   request $ do
     setMethod "POST"
     addToken_ "#login--dummy"
-    byLabelExact "Nutzer-Kennung" $ CI.original userIdent
+    byLabelExact "Identifikation" $ CI.original userIdent
     setUrl $ AuthR $ PluginR "dummy" []
 
 -- | Create a user.  The dummy email entry helps to confirm that foreign-key

From 2ccd50fa85b05751de6b36185bf52a1386458992 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 31 Oct 2019 17:23:30 +0100
Subject: [PATCH 036/126] fix(tests): explicit post parameter name for dummy
 login

---
 src/Auth/Dummy.hs       | 2 +-
 src/Utils/Parameters.hs | 1 +
 test/TestImport.hs      | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Auth/Dummy.hs b/src/Auth/Dummy.hs
index 9f88b5ed6..90f3e3cee 100644
--- a/src/Auth/Dummy.hs
+++ b/src/Auth/Dummy.hs
@@ -27,7 +27,7 @@ dummyForm :: ( RenderMessage (HandlerSite m) FormMessage
              ) => AForm m (CI Text)
 dummyForm = wFormToAForm $ do
   mr <- getMessageRender
-  aFormToWForm $ areq (ciField & addDatalist userList) (fslpI MsgDummyIdent (mr MsgDummyIdentPlaceholder) & noAutocomplete) Nothing
+  aFormToWForm $ areq (ciField & addDatalist userList) (fslpI MsgDummyIdent (mr MsgDummyIdentPlaceholder) & noAutocomplete & addName PostLoginDummy) Nothing
   where
     userList = fmap mkOptionList . runDB $ withReaderT projectBackend (map toOption <$> selectList [] [Asc UserIdent] :: ReaderT SqlBackend _ [Option UserIdent])
     toOption (Entity _ User{..}) = Option userDisplayName userIdent (CI.original userIdent)
diff --git a/src/Utils/Parameters.hs b/src/Utils/Parameters.hs
index 6a66df6e1..96fe65fd9 100644
--- a/src/Utils/Parameters.hs
+++ b/src/Utils/Parameters.hs
@@ -56,6 +56,7 @@ data GlobalPostParam = PostFormIdentifier
                      | PostMassInputShape
                      | PostBearer
                      | PostDBCsvImportAction
+                     | PostLoginDummy
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic)
 
 instance Universe GlobalPostParam
diff --git a/test/TestImport.hs b/test/TestImport.hs
index 3b1280e33..8e71a84f6 100644
--- a/test/TestImport.hs
+++ b/test/TestImport.hs
@@ -61,6 +61,9 @@ import Data.Typeable
 
 import Handler.Utils (runAppLoggingT)
 
+import Web.PathPieces (toPathPiece)
+import Utils.Parameters (GlobalPostParam(PostLoginDummy))
+
 
 runDB :: SqlPersistM a -> YesodExample UniWorX a
 runDB query = do
@@ -108,7 +111,7 @@ authenticateAs (Entity _ User{..}) = do
   request $ do
     setMethod "POST"
     addToken_ "#login--dummy"
-    byLabelExact "Identifikation" $ CI.original userIdent
+    addPostParam (toPathPiece PostLoginDummy) $ CI.original userIdent
     setUrl $ AuthR $ PluginR "dummy" []
 
 -- | Create a user.  The dummy email entry helps to confirm that foreign-key

From 3d1636ffe8b1b24b5f6e4a679bb1fbcdf9de5fa6 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 31 Oct 2019 18:49:47 +0100
Subject: [PATCH 037/126] feat(changelog): bump

---
 templates/i18n/changelog/de-de-formal.hamlet | 7 +++++++
 templates/i18n/changelog/en-eu.hamlet        | 7 +++++++
 templates/i18n/knownBugs/de-de-formal.hamlet | 4 ++++
 templates/i18n/knownBugs/en-eu.hamlet        | 4 ++++
 4 files changed, 22 insertions(+)

diff --git a/templates/i18n/changelog/de-de-formal.hamlet b/templates/i18n/changelog/de-de-formal.hamlet
index e991eb104..022b2ecdb 100644
--- a/templates/i18n/changelog/de-de-formal.hamlet
+++ b/templates/i18n/changelog/de-de-formal.hamlet
@@ -1,5 +1,12 @@
 $newline never
 <dl .deflist>
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 10 31}
+  <dd .deflist__dd>
+    <ul>
+      <li>Unterstützung für Internationalisierung
+      <li>Englische Übersetzung
+
   <dt .deflist__dt>
     ^{formatGregorianW 2019 10 23}
   <dd .deflist__dd>
diff --git a/templates/i18n/changelog/en-eu.hamlet b/templates/i18n/changelog/en-eu.hamlet
index 756fd7fef..13a7a5dd1 100644
--- a/templates/i18n/changelog/en-eu.hamlet
+++ b/templates/i18n/changelog/en-eu.hamlet
@@ -1,5 +1,12 @@
 $newline never
 <dl .deflist>
+  <dt .deflist__dt>
+    ^{formatGregorianW 2019 10 31}
+  <dd .deflist__dd>
+    <ul>
+      <li>Support for internationalisation
+      <li>English translation
+
   <dt .deflist__dt>
     ^{formatGregorianW 2019 10 23}
   <dd .deflist__dd>
diff --git a/templates/i18n/knownBugs/de-de-formal.hamlet b/templates/i18n/knownBugs/de-de-formal.hamlet
index 6eace1c7a..6c3d7168d 100644
--- a/templates/i18n/knownBugs/de-de-formal.hamlet
+++ b/templates/i18n/knownBugs/de-de-formal.hamlet
@@ -4,3 +4,7 @@ $newline never
 <ul>
   <li>
     Format von Bewertungsdateien ist noch provisorisch
+  <li>
+    Zahlen und Prüfungsergebnisse werden nicht internationalisiert (betrifft auch CSV-Import und Export)
+  <li>
+    Feste (registrierte) Abgabegruppen sind noch nicht implementiert
diff --git a/templates/i18n/knownBugs/en-eu.hamlet b/templates/i18n/knownBugs/en-eu.hamlet
index da6ed994d..98d8fa483 100644
--- a/templates/i18n/knownBugs/en-eu.hamlet
+++ b/templates/i18n/knownBugs/en-eu.hamlet
@@ -4,3 +4,7 @@ $newline never
 <ul>
   <li>
     Format of rating files is provisional
+  <li>
+    Numbers and exam results are not internationalised (also affects csv-import and export)
+  <li>
+    Fixed (registered) groups for exercise sheet submission not yet implemented

From 4759eddfa131696e1e7e411943f474d00f3e9233 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 31 Oct 2019 19:02:57 +0100
Subject: [PATCH 038/126] chore(release): 7.20.0

---
 CHANGELOG.md      | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 package-lock.json |  2 +-
 package.json      |  2 +-
 package.yaml      |  2 +-
 4 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3eb57a932..a2a4cd497 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,52 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [7.20.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.19.1...v7.20.0) (2019-10-31)
+
+
+### Bug Fixes
+
+* **datepicker:** fix for empty or browser-filled inputs ([3c24e5f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3c24e5f))
+* **fe-i18n-spec:** fix tests ([339fa39](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/339fa39))
+* **i18n:** custom language inference ([205d768](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/205d768))
+* **i18n:** fix typos ([8af256e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/8af256e))
+* **i18n:** get started on i18n-breadcrumbs ([268d9e0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/268d9e0))
+* **i18n:** i18n for all widgets ([3fe278e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3fe278e))
+* **i18n:** i18n in various places ([155ed1d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/155ed1d))
+* **tests:** explicit post parameter name for dummy login ([2ccd50f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/2ccd50f))
+* **tests:** i18n changes ([9ba0e27](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/9ba0e27))
+* fix i18n widget files ([e517a8e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/e517a8e))
+* typos ([b9c284c](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/b9c284c))
+* **i18n:** prepare translation file for en-eu ([281c98f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/281c98f))
+* **i18n:** rename i18nWidgetFiles to proper language code ([33ddbfb](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/33ddbfb))
+* **mail:** use only RFC822-timezones ([59b8bb9](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/59b8bb9))
+
+
+### Features
+
+* **changelog:** bump ([3d1636f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3d1636f))
+* **glossary:** english glossary ([237c586](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/237c586))
+* **glossary:** more de-de-formal ([7daa42d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/7daa42d))
+* **glossary:** most glossary entries in de-de-formal ([ba7c60e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/ba7c60e))
+* **i18n:** 12h-clock for english locales ([331ba1f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/331ba1f))
+* **i18n:** additional en-eu ([83a458d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/83a458d))
+* **i18n:** basic language switching ([352bdba](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/352bdba))
+* **i18n:** close language select on click anywhere ([97a29ec](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/97a29ec))
+* **i18n:** english imprint ([7b3ed79](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/7b3ed79))
+* **i18n:** english versions of imprint and data-protection ([4ee3ad0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/4ee3ad0))
+* **i18n:** get started on en-eu ([75677dc](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/75677dc))
+* **i18n:** missing message translations; small fixes ([aec4b21](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/aec4b21))
+* **i18n:** more en-eu ([67e40fd](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/67e40fd))
+* **i18n:** more en-eu ([3058737](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3058737))
+* **i18n:** more en-eu ([7c8dbc9](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/7c8dbc9))
+* **i18n:** populate frontend datetime locale from backend settings ([498d616](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/498d616))
+* more en-eu translations; minor fixes in de-de-formal ([870f1df](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/870f1df))
+* **i18n:** store language in user account ([f0f9411](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/f0f9411))
+* **info:** start glossary ([73b0546](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/73b0546))
+* **info-lecturer:** add english translation; minor fixes in german ([a4fc555](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/a4fc555))
+
+
+
 ### [7.19.2](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.19.1...v7.19.2) (2019-10-28)
 
 
diff --git a/package-lock.json b/package-lock.json
index 05990c127..891719073 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.19.2",
+  "version": "7.20.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2803e4270..6c6c022a4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.19.2",
+  "version": "7.20.0",
   "description": "",
   "keywords": [],
   "author": "",
diff --git a/package.yaml b/package.yaml
index 4542ab4f7..54873decd 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name:    uniworx
-version: 7.19.2
+version: 7.20.0
 
 dependencies:
   - base >=4.9.1.0 && <5

From 5f04593b30c14fffc58e513b79ce1c98e75328b1 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 4 Nov 2019 11:55:07 +0100
Subject: [PATCH 039/126] fix(rating files): better descriptions & tests

---
 src/Handler/Utils/Rating.hs      |  6 +++---
 test/Handler/Utils/RatingSpec.hs | 30 ++++++++++++++++++++++++++++++
 test/Model/RatingSpec.hs         | 16 ++++++++++++++++
 test/ModelSpec.hs                | 14 ++++++++++++++
 4 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 test/Handler/Utils/RatingSpec.hs
 create mode 100644 test/Model/RatingSpec.hs

diff --git a/src/Handler/Utils/Rating.hs b/src/Handler/Utils/Rating.hs
index 2292ccfed..4bea35d2b 100644
--- a/src/Handler/Utils/Rating.hs
+++ b/src/Handler/Utils/Rating.hs
@@ -47,8 +47,8 @@ instance Pretty x => Pretty (CI x) where
 
 
 instance Pretty SheetGrading where
-  pretty Points{..}     = pretty ( show maxPoints <> " Punkte" :: String)
-  pretty PassPoints{..} = pretty ( show maxPoints <> " Punkte, bestanden ab " <> show passingPoints <> " Punkte" :: String )
+  pretty Points{..}     = pretty ( "Maximal " <> show maxPoints <> " Punkt(e)" :: String)
+  pretty PassPoints{..} = pretty ( "Maximal " <> show maxPoints <> " Punkt(e), bestanden ab " <> show passingPoints <> " Punkt(en)" :: String )
   pretty PassBinary     = pretty ( "Bestanden (1) /  Nicht bestanden (0)" :: String )
 
 
@@ -113,7 +113,7 @@ formatRating cID Rating{ ratingValues = Rating'{..}, ..} = let
       [ Just $ "Veranstaltung:" <+> pretty ratingCourseName
       , Just $ "Blatt:" <+> pretty ratingSheetName
       , ("Korrektor:" <+>) . pretty <$> ratingCorrectorName
-      , ("Bewertung:" <+>) . pretty <$> (ratingSheetType ^? _grading)
+      , ("Bewertungsschema:" <+>) . pretty <$> (ratingSheetType ^? _grading)
       ]
     , "Abgabe-Id:" <+> pretty (Text.unpack $ toPathPiece cID)
     , "============================================="
diff --git a/test/Handler/Utils/RatingSpec.hs b/test/Handler/Utils/RatingSpec.hs
new file mode 100644
index 000000000..feaadd458
--- /dev/null
+++ b/test/Handler/Utils/RatingSpec.hs
@@ -0,0 +1,30 @@
+module Handler.Utils.RatingSpec where
+
+import TestImport
+import Handler.Utils.Rating
+import ModelSpec ()
+import Model.RatingSpec ()
+
+import Data.Time.Clock.System (systemEpochDay)
+import qualified Data.ByteString.Lazy as LBS
+
+import qualified Data.Text as Text
+
+import Utils (assertM)
+
+
+spec :: Spec
+spec = describe "Rating file parsing/pretty-printing" $ do
+  it "roundtrips" . property $ \(_ :: SubmissionId, subId) (mRating -> rating) ->
+    parseRating' (formatRating subId rating) === Just (ratingValues rating)
+  it "has idempotent formatting" . property $ \(_ :: SubmissionId, subId) (mRating -> rating) ->
+    fmap (\r' -> formatRating subId $ rating { ratingValues = r' }) (parseRating' $ formatRating subId rating) === Just (formatRating subId rating)
+  where
+    parseRating' :: LBS.ByteString -> Maybe Rating'
+    parseRating' = parseRating . flip (File "bewertung.txt") time . Just . LBS.toStrict
+
+    time = UTCTime systemEpochDay 0
+    mRating rating = rating { ratingValues = mRating' $ ratingValues rating }
+    mRating' rating' = rating' { ratingTime = Just time -- There is no field for ratingTime so we just always expect file modification time
+                               , ratingComment = assertM (not . Text.null) $ Text.strip <$> ratingComment rating'
+                               }
diff --git a/test/Model/RatingSpec.hs b/test/Model/RatingSpec.hs
new file mode 100644
index 000000000..44fc4f734
--- /dev/null
+++ b/test/Model/RatingSpec.hs
@@ -0,0 +1,16 @@
+module Model.RatingSpec where
+
+import TestImport
+import ModelSpec ()
+import Model.Rating
+
+instance Arbitrary Rating' where
+  arbitrary = genericArbitrary
+  shrink = genericShrink
+
+instance Arbitrary Rating where
+  arbitrary = genericArbitrary
+  shrink = genericShrink
+
+spec :: Spec
+spec = return ()
diff --git a/test/ModelSpec.hs b/test/ModelSpec.hs
index 9c616915f..654156578 100644
--- a/test/ModelSpec.hs
+++ b/test/ModelSpec.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE UndecidableInstances #-}
+
 module ModelSpec where
 
 import TestImport
@@ -22,6 +24,13 @@ import Utils
 import System.FilePath
 import Data.Time
 
+import Data.CryptoID.Poly
+import qualified Data.CryptoID.Class.ImplicitNamespace as Implicit
+
+import Control.Monad.Catch.Pure (Catch, runCatch)
+
+import System.IO.Unsafe (unsafePerformIO)
+
 
 instance Arbitrary EmailAddress where
     arbitrary = do
@@ -145,6 +154,11 @@ instance Arbitrary Term where
   arbitrary = genericArbitrary
   shrink = genericShrink
 
+instance {-# OVERLAPS #-} (HasCryptoID ns ct pt (ReaderT CryptoIDKey Catch), Arbitrary pt, ns ~ Implicit.CryptoIDNamespace ct pt) => Arbitrary (pt, CryptoID ns ct) where
+  arbitrary = arbitrary <&> \pt -> (pt, either (error . show) id . runCatch $ runReaderT (Implicit.encrypt pt) tmpKey)
+    where
+      tmpKey = unsafePerformIO genKey
+
 spec :: Spec
 spec = do
   parallel $ do

From f8442cfea9f5ab0c4b8b2b6959153034f390839e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 4 Nov 2019 13:29:18 +0100
Subject: [PATCH 040/126] fix(submission): ignore extension case within zips

---
 src/Handler/Utils/Submission.hs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Handler/Utils/Submission.hs b/src/Handler/Utils/Submission.hs
index 8304c1ec8..694ba01e7 100644
--- a/src/Handler/Utils/Submission.hs
+++ b/src/Handler/Utils/Submission.hs
@@ -50,6 +50,8 @@ import Text.Hamlet (ihamletFile)
 
 import qualified Control.Monad.Catch as E (Handler(..))
 
+import qualified Data.CaseInsensitive as CI
+
 data AssignSubmissionException = NoCorrectors
                                | NoCorrectorsByProportion
                                | SubmissionsNotFound (NonNull (Set SubmissionId))
@@ -428,7 +430,7 @@ sinkSubmission userId mExists isUpdate = do
       , Just (map unpack . Set.toList . toNullable -> exts) <- extensionRestriction
       = Conduit.mapM $ \x -> if
           | Left File{..} <- x
-          , none (`isExtensionOf` fileTitle) exts
+          , none ((flip isExtensionOf `on` CI.foldCase) fileTitle) exts
           , isn't _Nothing fileContent -- File record is not a directory, we don't care about those
             -> throwM $ InvalidFileTitleExtension fileTitle
           | otherwise

From 954bb78aae1316bbcc4e8145d63ae072c63beff8 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 4 Nov 2019 13:29:29 +0100
Subject: [PATCH 041/126] fix: improve explanation of multiUserField
 invitations

---
 messages/uniworx/de-de-formal.msg | 2 +-
 messages/uniworx/en-eu.msg        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index 94164d703..006c6d29d 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -1267,7 +1267,7 @@ RGTutorialParticipants: Tutorium-Teilnehmer
 
 MultiSelectFieldTip: Mehrfach-Auswahl ist möglich (Umschalt bzw. Strg)
 MultiEmailFieldTip: Es sind mehrere, Komma-separierte, E-Mail-Addressen möglich
-EmailInvitationWarning: Es konnte kein Nutzer mit dieser Addresse im System gefunden werden (ggf. unter gewissen Einschränkungen). Es wird eine Einladung per E-Mail versandt.
+EmailInvitationWarning: Diese Adresse konnte mit Ihren aktuellen Rechten keinem Uni2work-Benutzer zugeordnet werden (ggf. unter gewissen Einschränkungen). Es wird eine Einladung per E-Mail versandt.
 
 LecturerInvitationAccepted lType@Text csh@CourseShorthand: Sie wurden als #{lType} für #{csh} eingetragen
 LecturerInvitationDeclined csh@CourseShorthand: Sie haben die Einladung, Kursverwalter für #{csh} zu werden, abgelehnt
diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index 70e000917..e51dcc33f 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -1263,7 +1263,7 @@ RGTutorialParticipants: Tutorial participants
 
 MultiSelectFieldTip: Multiple selections are possible (Shift or Ctrl)
 MultiEmailFieldTip: Multiple emails addresses may be specified (comma-separated)
-EmailInvitationWarning: No user with that email address was found (may be subject to some restrictions). An invitation will be sent via email.
+EmailInvitationWarning: This address could not be matched to any Uni2work-user under your current permissions (may be subject to some restrictions). An invitation will be sent via email.
 
 LecturerInvitationAccepted lType csh: You were registered as #{lType} for #{csh}
 LecturerInvitationDeclined csh: You have declined the invitation to become course administrator for #{csh}

From 766ca63b409a7380b4d554b5b10a3f5b3096e838 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 4 Nov 2019 15:20:34 +0100
Subject: [PATCH 042/126] refactor: unify FileUploads type

---
 src/Handler/Allocation/Application.hs | 16 +++++++++++-----
 src/Handler/Corrections.hs            |  6 ++++--
 src/Handler/Course/Register.hs        |  4 ++--
 src/Handler/Submission.hs             |  4 ++--
 src/Handler/Utils/Form.hs             | 26 +++++++++++++++-----------
 5 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/Handler/Allocation/Application.hs b/src/Handler/Allocation/Application.hs
index 912fd8450..9c1cba0e1 100644
--- a/src/Handler/Allocation/Application.hs
+++ b/src/Handler/Allocation/Application.hs
@@ -52,7 +52,7 @@ data ApplicationForm = ApplicationForm
   { afPriority      :: Maybe Natural
   , afField         :: Maybe StudyFeaturesId
   , afText          :: Maybe Text
-  , afFiles         :: Maybe (ConduitT () File Handler ())
+  , afFiles         :: Maybe FileUploads
   , afRatingVeto    :: Bool
   , afRatingPoints  :: Maybe ExamGrade
   , afRatingComment :: Maybe Text
@@ -291,8 +291,9 @@ editApplicationR maId uid cid mAppId afMode allowAction postAction = do
             , courseApplicationRatingTime         = guardOn rated now
             }
           let
-            sinkFile' file = do
-              fId <- insert file
+            sinkFile' (Right file) =
+              insert file >>= sinkFile' . Left
+            sinkFile' (Left fId) =
               insert_ $ CourseApplicationFile appId fId
           forM_ afFiles $ \afFiles' ->
             runConduit $ transPipe liftHandler afFiles' .| C.mapM_ sinkFile'
@@ -308,7 +309,7 @@ editApplicationR maId uid cid mAppId afMode allowAction postAction = do
             | afmApplicantEdit afMode -> do
               oldFiles <- Set.fromList . map (courseApplicationFileFile . entityVal) <$> selectList [CourseApplicationFileApplication ==. appId] []
               changes <- flip execStateT oldFiles . forM_ afFiles $ \afFiles' ->
-                let sinkFile' file = do
+                let sinkFile' (Right file) = do
                       oldFiles' <- lift . E.select . E.from $ \(courseApplicationFile `E.InnerJoin` file') -> do
                         E.on $ courseApplicationFile E.^. CourseApplicationFileFile E.==. file' E.^. FileId
                         E.where_ $ file' E.^. FileTitle E.==. E.val (fileTitle file)
@@ -326,7 +327,12 @@ editApplicationR maId uid cid mAppId afMode allowAction postAction = do
                             fId <- lift $ insert file
                             lift . insert_ $ CourseApplicationFile appId fId
                             modify $ Set.insert fId
-                 in runConduit $ transPipe liftHandler afFiles' .| C.mapM_ sinkFile'
+                    sinkFile' (Left fId)
+                      | fId `Set.member` oldFiles = modify $ Set.delete fId
+                      | otherwise = do
+                          lift . insert_ $ CourseApplicationFile appId fId
+                          modify $ Set.insert fId
+                in runConduit $ transPipe liftHandler afFiles' .| C.mapM_ sinkFile'
               deleteCascadeWhere [ FileId <-. Set.toList (oldFiles `Set.intersection` changes) ]
               return changes
             | otherwise
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index b9e16b4bb..da2e47096 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -57,6 +57,8 @@ import qualified Control.Monad.State.Class as State
 
 import Data.Foldable (foldrM)
 
+import qualified Data.Conduit.List as C
+
 
 
 type CorrectionTableExpr  = (E.SqlExpr (Entity Course) `E.InnerJoin` E.SqlExpr (Entity Sheet) `E.InnerJoin` E.SqlExpr (Entity Submission)) `E.LeftOuterJoin` E.SqlExpr (Maybe (Entity User))
@@ -770,7 +772,7 @@ postCorrectionR tid ssh csh shn cid = do
       formResult uploadResult $ \fileUploads -> do
         uid <- requireAuthId
 
-        res <- msgSubmissionErrors . runDBJobs . runConduit $ transPipe (lift . lift) fileUploads .| extractRatingsMsg .| sinkSubmission uid (Right sub) True
+        res <- msgSubmissionErrors . runDBJobs . runConduit $ transPipe (lift . lift) fileUploads .| C.mapM (either get404 return) .| extractRatingsMsg .| sinkSubmission uid (Right sub) True
         case res of
           Nothing  -> return () -- ErrorMessages are already added by msgSubmissionErrors
           (Just _) -> do
@@ -818,7 +820,7 @@ postCorrectionsUploadR = do
     FormFailure errs -> mapM_ (addMessage Error . toHtml) errs
     FormSuccess files -> do
       uid <- requireAuthId
-      mbSubs <- msgSubmissionErrors . runDBJobs . runConduit $ transPipe (lift . lift) files .| extractRatingsMsg .| sinkMultiSubmission uid True
+      mbSubs <- msgSubmissionErrors . runDBJobs . runConduit $ transPipe (lift . lift) files .| C.mapM (either get404 return) .| extractRatingsMsg .| sinkMultiSubmission uid True
       case mbSubs of
         Nothing -> return ()
         (Just subs)
diff --git a/src/Handler/Course/Register.hs b/src/Handler/Course/Register.hs
index 5da5f6735..fc687713a 100644
--- a/src/Handler/Course/Register.hs
+++ b/src/Handler/Course/Register.hs
@@ -42,7 +42,7 @@ instance Button UniWorX ButtonCourseRegister where
 data CourseRegisterForm = CourseRegisterForm
   { crfStudyFeatures    :: Maybe StudyFeaturesId
   , crfApplicationText  :: Maybe Text
-  , crfApplicationFiles :: Maybe (ConduitT () File Handler ())
+  , crfApplicationFiles :: Maybe FileUploads
   }
 
 courseRegisterForm :: (MonadHandler m, HandlerSite m ~ UniWorX) => Entity Course -> m (AForm Handler CourseRegisterForm, ButtonCourseRegister)
@@ -195,7 +195,7 @@ postCRegisterR tid ssh csh = do
             whenIsJust appRes $ 
               audit . TransactionCourseApplicationEdit cid uid 
             whenIsJust ((,) <$> appRes <*> crfApplicationFiles) $ \(appId, fSource) -> do
-              runConduit $ transPipe liftHandler fSource .| C.mapM_ (\f -> insert f >>= insert_ . CourseApplicationFile appId)
+              runConduit $ transPipe liftHandler fSource .| C.mapM_ (insert_ . CourseApplicationFile appId <=< either return insert)
             return appRes
         | otherwise
         = return $ Just ()
diff --git a/src/Handler/Submission.hs b/src/Handler/Submission.hs
index 8e5ca85c1..f254f9104 100644
--- a/src/Handler/Submission.hs
+++ b/src/Handler/Submission.hs
@@ -125,7 +125,7 @@ submissionUserInvitationConfig = InvitationConfig{..}
       return . SomeRoute $ CSubmissionR courseTerm courseSchool courseShorthand sheetName cID SubShowR
 
 
-makeSubmissionForm :: CourseId -> Maybe SubmissionId -> UploadMode -> SheetGroup -> Bool -> Set (Either UserEmail UserId) -> Form (Maybe (ConduitT () File Handler ()), Set (Either UserEmail UserId))
+makeSubmissionForm :: CourseId -> Maybe SubmissionId -> UploadMode -> SheetGroup -> Bool -> Set (Either UserEmail UserId) -> Form (Maybe FileUploads, Set (Either UserEmail UserId))
 makeSubmissionForm cid msmid uploadMode grouping isLecturer prefillUsers = identifyForm FIDsubmission . renderAForm FormStandard $ (,)
   <$> fileUploadForm (not isLecturer && is _Nothing msmid) (fslI . bool MsgSubmissionFile MsgSubmissionArchive) uploadMode
   <*> wFormToAForm submittorsForm
@@ -428,7 +428,7 @@ submissionHelper tid ssh csh shn mcid = do
             (Nothing, Just smid)   -- no new files, existing submission partners updated
               -> return smid
             (Just files, _) -> -- new files
-              runConduit $ transPipe (lift . lift) files .| extractRatingsMsg .| sinkSubmission uid (maybe (Left shid) Right msmid) False
+              runConduit $ transPipe (lift . lift) files .| Conduit.mapM (either get404 return) .| extractRatingsMsg .| sinkSubmission uid (maybe (Left shid) Right msmid) False
             (Nothing, Nothing) -- new submission, no file upload requested
               -> do
                 sid <- insert Submission
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index b9f0138dd..3ab191e0a 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -643,13 +643,17 @@ pseudonymWordField = checkMMap doCheck id $ ciField & addDatalist (return $ mkOp
       | otherwise
       = return . Left $ MsgUnknownPseudonymWord (CI.original w)
 
-specificFileField :: UploadSpecificFile -> Field Handler (ConduitT () File Handler ())
+
+type FileUploads = ConduitT () (Either FileId File) Handler ()
+  
+
+specificFileField :: UploadSpecificFile -> Field Handler FileUploads 
 specificFileField UploadSpecificFile{..} = Field{..}
   where
     fieldEnctype = Multipart
     fieldParse _ files
       | [f] <- files
-      = return . Right . Just $ yieldM (acceptFile f) .| modifyFileTitle (const $ unpack specificFileName)
+      = return . Right . Just $ yieldM (acceptFile f) .| modifyFileTitle (const $ unpack specificFileName) .| C.map Right
       | null files   = return $ Right Nothing
       | otherwise    = return . Left $ SomeMessage MsgOnlyUploadOneFile
     fieldView fieldId fieldName attrs _ req = $(widgetFile "widgets/specificFileField")
@@ -661,14 +665,14 @@ specificFileField UploadSpecificFile{..} = Field{..}
 
 zipFileField :: Bool -- ^ Unpack zips?
              -> Maybe (NonNull (Set Extension)) -- ^ Restrictions on file extensions
-             -> Field Handler (ConduitT () File Handler ())
+             -> Field Handler FileUploads 
 zipFileField doUnpack permittedExtensions = Field{..}
   where
     fieldEnctype = Multipart
     fieldParse _ files
       | [f@FileInfo{..}] <- files
       , maybe True (anyOf (re _nullable . folded . unpacked) ((flip isExtensionOf `on` CI.foldCase) $ unpack fileName)) permittedExtensions || doUnpack
-      = return . Right . Just $ bool (yieldM . acceptFile) sourceFiles doUnpack f
+      = return . Right . Just $ bool (yieldM . fmap Right . acceptFile) ((.| C.map Right) . sourceFiles) doUnpack f
       | null files   = return $ Right Nothing
       | otherwise    = return . Left $ SomeMessage MsgOnlyUploadOneFile
     fieldView fieldId fieldName attrs _ req = $(widgetFile "widgets/zipFileField")
@@ -680,7 +684,7 @@ zipFileField doUnpack permittedExtensions = Field{..}
 
 fileUploadForm :: Bool -- ^ Required?
                -> (Bool -> FieldSettings UniWorX) -- ^ given @unpackZips@ generate `FieldSettings` in the case of `UploadAny`
-               -> UploadMode -> AForm Handler (Maybe (ConduitT () File Handler ()))
+               -> UploadMode -> AForm Handler (Maybe FileUploads)
 fileUploadForm isReq mkFs = \case
   NoUpload
     -> pure Nothing
@@ -689,21 +693,21 @@ fileUploadForm isReq mkFs = \case
   UploadSpecific{..}
     -> mergeFileSources <$> sequenceA (map specificFileForm . Set.toList $ toNullable specificFiles)
   where
-    specificFileForm :: UploadSpecificFile -> AForm Handler (Maybe (ConduitT () File Handler ()))
+    specificFileForm :: UploadSpecificFile -> AForm Handler (Maybe FileUploads)
     specificFileForm spec@UploadSpecificFile{..}
       = bool (\f fs d -> aopt f fs $ fmap Just d) (\f fs d -> Just <$> areq f fs d) specificFileRequired (specificFileField spec) (fsl specificFileLabel) Nothing
 
-    mergeFileSources :: [Maybe (ConduitT () File Handler ())] -> Maybe (ConduitT () File Handler ())
+    mergeFileSources :: [Maybe FileUploads] -> Maybe FileUploads 
     mergeFileSources (catMaybes -> sources) = case sources of
       [] -> Nothing
       fs -> Just $ sequence_ fs
 
-multiFileField' :: ConduitT () (Either FileId File) Handler () -- ^ Permitted files in same format as produced by `multiFileField`
-                -> Field Handler (ConduitT () (Either FileId File) Handler ())
+multiFileField' :: FileUploads -- ^ Permitted files in same format as produced by `multiFileField`
+                -> Field Handler FileUploads 
 multiFileField' permittedFiles = multiFileField . runConduit $ permittedFiles .| C.mapMaybe (preview _Left) .| C.foldMap Set.singleton
 
 multiFileField :: Handler (Set FileId) -- ^ Set of files that may be submitted by id-reference
-               -> Field Handler (ConduitT () (Either FileId File) Handler ())
+               -> Field Handler FileUploads 
 multiFileField permittedFiles' = Field{..}
   where
     fieldEnctype = Multipart
@@ -746,7 +750,7 @@ multiFileField permittedFiles' = Field{..}
       $(widgetFile "widgets/multiFileField")
     unpackZips :: Text
     unpackZips = "unpack-zip"
-    takeLefts :: Monad m => ConduitM (Either b a) b m ()
+    takeLefts :: Monad m => ConduitT (Either b a) b m ()
     takeLefts = awaitForever $ \case
       Right _ -> return ()
       Left  r -> yield r

From ff161b2e045dcd1281aec21513ed1c818f2174aa Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 4 Nov 2019 17:20:26 +0100
Subject: [PATCH 043/126] feat: pruning of unreferenced files

---
 clean.sh                       | 64 +++++++++++++++++-----------------
 config/settings.yml            |  2 ++
 models/files.model             |  6 ++++
 src/Import/NoModel.hs          |  2 ++
 src/Jobs.hs                    |  1 +
 src/Jobs/Crontab.hs            | 19 ++++++++++
 src/Jobs/Handler/PruneFiles.hs | 38 ++++++++++++++++++++
 src/Jobs/Types.hs              |  2 ++
 src/Model/Types/Common.hs      |  2 ++
 src/Settings.hs                |  6 ++++
 src/Utils/Lens.hs              |  2 ++
 test/Database.hs               |  2 ++
 12 files changed, 114 insertions(+), 32 deletions(-)
 create mode 100644 src/Jobs/Handler/PruneFiles.hs

diff --git a/clean.sh b/clean.sh
index 02487e8b2..d63a4deab 100755
--- a/clean.sh
+++ b/clean.sh
@@ -4,39 +4,39 @@ set -e
 
 [ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock -en .stack-work.lock "$0" "$@" || :
 
-case $1 in
-    "")
-        exec -- stack clean
-        ;;
-    *)
-        target=".stack-work-${1}"
-        shift
+if [[ -n "${1}" ]]; then
+    target=".stack-work-${1}"
+else
+    target=".stack-work"
+fi
+shift
 
-        if [[ ! -d "${target}" ]]; then
-            printf "%s does not exist or is no directory\n" "${target}" >&2
-            exit 1
-        fi
-        if [[ -e .stack-work-clean ]]; then
-            printf ".stack-work-clean exists\n" >&2
-            exit 1
-        fi
+if [[ ! -d "${target}" ]]; then
+    printf "%s does not exist or is no directory\n" "${target}" >&2
+    exit 1
+fi
 
-        move-back() {
-            if [[ -d .stack-work ]]; then
-                mv -v .stack-work "${target}"
-            else
-                mkdir -v "${target}"
-            fi
-            [[ -d .stack-work-clean ]] && mv -v .stack-work-clean .stack-work
-        }
+if [[ "${target}" != ".stack-work" ]]; then
+  if [[ -e .stack-work-clean ]]; then
+      printf ".stack-work-clean exists\n" >&2
+      exit 1
+  fi
 
-        mv -v .stack-work .stack-work-clean
-        mv -v "${target}" .stack-work
-        trap move-back EXIT
+  move-back() {
+      if [[ -d .stack-work ]]; then
+          mv -v .stack-work "${target}"
+      else
+          mkdir -v "${target}"
+      fi
+      [[ -d .stack-work-clean ]] && mv -v .stack-work-clean .stack-work
+  }
 
-        (
-            set -ex
-            stack clean $@
-        )
-        ;;
-esac
+  mv -v .stack-work .stack-work-clean
+  mv -v "${target}" .stack-work
+  trap move-back EXIT
+fi
+
+(
+    set -ex
+    stack clean $@
+)
diff --git a/config/settings.yml b/config/settings.yml
index 63d2fcd88..df21d993c 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -30,6 +30,8 @@ session-timeout: 7200
 jwt-expiration: 604800
 jwt-encoding: HS256
 maximum-content-length: "_env:MAX_UPLOAD_SIZE:134217728"
+session-files-expire: 3600
+prune-unreferenced-files: 86400
 health-check-interval:
   matching-cluster-config: "_env:HEALTHCHECK_INTERVAL_MATCHING_CLUSTER_CONFIG:600"
   http-reachable: "_env:HEALTHCHECK_INTERVAL_HTTP_REACHABLE:600"
diff --git a/models/files.model b/models/files.model
index f96745687..2ea0569ef 100644
--- a/models/files.model
+++ b/models/files.model
@@ -6,3 +6,9 @@ File
     content         ByteString Maybe -- Nothing iff this is a directory
     modified        UTCTime
     deriving Show Eq Generic
+
+SessionFile
+    user            UserId
+    reference       SessionFileReference
+    file            FileId
+    touched         UTCTime
\ No newline at end of file
diff --git a/src/Import/NoModel.hs b/src/Import/NoModel.hs
index eeef7957f..13d03d064 100644
--- a/src/Import/NoModel.hs
+++ b/src/Import/NoModel.hs
@@ -153,6 +153,8 @@ import Colonnade.Instances as Import ()
 import Data.Bool.Instances as Import ()
 import Data.Encoding.Instances as Import ()
 
+import Crypto.Hash as Import (Digest, SHA3_256)
+
 import Control.Lens as Import
   hiding ( (<.>)
          , universe
diff --git a/src/Jobs.hs b/src/Jobs.hs
index 526af3b6f..98ebf0209 100644
--- a/src/Jobs.hs
+++ b/src/Jobs.hs
@@ -71,6 +71,7 @@ import Jobs.Handler.TransactionLog
 import Jobs.Handler.SynchroniseLdap
 import Jobs.Handler.PruneInvitations
 import Jobs.Handler.ChangeUserDisplayEmail
+import Jobs.Handler.PruneFiles
 
 import Jobs.HealthReport
 
diff --git a/src/Jobs/Crontab.hs b/src/Jobs/Crontab.hs
index 7c0a9cf0c..29d8e0bf8 100644
--- a/src/Jobs/Crontab.hs
+++ b/src/Jobs/Crontab.hs
@@ -49,6 +49,15 @@ determineCrontab = execWriterT $ do
       , cronRateLimit = appJobCronInterval
       , cronNotAfter = Right CronNotScheduled
       }
+  whenIsJust appPruneUnreferencedFiles $ \pInterval -> 
+    tell $ HashMap.singleton
+      (JobCtlQueue JobPruneUnreferencedFiles)
+      Cron
+        { cronInitial   = CronAsap
+        , cronRepeat    = CronRepeatScheduled CronAsap
+        , cronRateLimit = pInterval
+        , cronNotAfter  = Right CronNotScheduled
+        }
   
   oldestInvitationMUTC <- lift $ preview (_head . _entityVal . _invitationExpiresAt . _Just) <$> selectList [InvitationExpiresAt !=. Nothing] [Asc InvitationExpiresAt, LimitTo 1]
   whenIsJust oldestInvitationMUTC $ \oldestInvUTC -> tell $ HashMap.singleton
@@ -60,6 +69,16 @@ determineCrontab = execWriterT $ do
       , cronNotAfter  = Right CronNotScheduled
       }
 
+  oldestSessionFile <- lift $ preview (_head . _entityVal . _sessionFileTouched) <$> selectList [] [Asc SessionFileTouched, LimitTo 1]
+  whenIsJust oldestSessionFile $ \oldest -> tell $ HashMap.singleton
+    (JobCtlQueue JobPruneSessionFiles)
+    Cron
+      { cronInitial   = CronTimestamp . utcToLocalTime $ addUTCTime appSessionFilesExpire oldest
+      , cronRepeat    = CronRepeatOnChange
+      , cronRateLimit = appSessionFilesExpire / 2
+      , cronNotAfter  = Right CronNotScheduled
+      }
+
   tell . flip foldMap universeF $ \kind -> 
     case appHealthCheckInterval kind of
       Just int -> HashMap.singleton
diff --git a/src/Jobs/Handler/PruneFiles.hs b/src/Jobs/Handler/PruneFiles.hs
new file mode 100644
index 000000000..43289dab6
--- /dev/null
+++ b/src/Jobs/Handler/PruneFiles.hs
@@ -0,0 +1,38 @@
+module Jobs.Handler.PruneFiles
+  ( dispatchJobPruneSessionFiles
+  , dispatchJobPruneUnreferencedFiles
+  ) where
+
+import Import hiding (matching)
+
+import Database.Persist.Sql (deleteWhereCount)
+
+import qualified Database.Esqueleto as E
+import qualified Database.Esqueleto.Utils as E
+
+
+dispatchJobPruneSessionFiles :: Handler ()
+dispatchJobPruneSessionFiles = do
+  now <- liftIO getCurrentTime
+  expires <- getsYesod $ view _appSessionFilesExpire
+  n <- runDB $ deleteWhereCount [ SessionFileTouched <. addUTCTime (- expires) now ]
+  $logInfoS "PruneSessionFiles" [st|Deleted #{n} expired session files|]
+
+
+dispatchJobPruneUnreferencedFiles :: Handler ()
+dispatchJobPruneUnreferencedFiles = do
+  n <- runDB . E.deleteCount . E.from $ \file ->
+    E.where_ . E.not_ . E.any E.exists $ references file
+  $logInfoS "PruneUnreferencedFiles" [st|Deleted #{n} unreferenced files|]
+  where
+    references :: E.SqlExpr (Entity File) -> [E.SqlQuery ()]
+    references ((E.^. FileId) -> fId) =
+      [ E.from $ \matching  -> E.where_ $ matching  E.^. AllocationMatchingLog        E.==. fId
+      , E.from $ \appInstr  -> E.where_ $ appInstr  E.^. CourseAppInstructionFileFile E.==. fId
+      , E.from $ \appFile   -> E.where_ $ appFile   E.^. CourseApplicationFileFile    E.==. fId
+      , E.from $ \matFile   -> E.where_ $ matFile   E.^. MaterialFileFile             E.==. fId
+      , E.from $ \newsFile  -> E.where_ $ newsFile  E.^. CourseNewsFileFile           E.==. fId
+      , E.from $ \sessFile  -> E.where_ $ sessFile  E.^. SessionFileFile              E.==. fId
+      , E.from $ \sheetFile -> E.where_ $ sheetFile E.^. SheetFileFile                E.==. fId
+      , E.from $ \subFile   -> E.where_ $ subFile   E.^. SubmissionFileFile           E.==. fId
+      ]
diff --git a/src/Jobs/Types.hs b/src/Jobs/Types.hs
index f1768c69c..058aa0219 100644
--- a/src/Jobs/Types.hs
+++ b/src/Jobs/Types.hs
@@ -67,6 +67,8 @@ data Job = JobSendNotification { jRecipient :: UserId, jNotification :: Notifica
          | JobChangeUserDisplayEmail { jUser :: UserId
                                      , jDisplayEmail :: UserEmail
                                      }
+         | JobPruneSessionFiles
+         | JobPruneUnreferencedFiles
   deriving (Eq, Ord, Show, Read, Generic, Typeable)
 data Notification = NotificationSubmissionRated { nSubmission :: SubmissionId }
                   | NotificationSheetActive { nSheet :: SheetId }
diff --git a/src/Model/Types/Common.hs b/src/Model/Types/Common.hs
index 50048eb42..33685c89b 100644
--- a/src/Model/Types/Common.hs
+++ b/src/Model/Types/Common.hs
@@ -51,3 +51,5 @@ type InstanceId              = UUID
 type ClusterId               = UUID
 type TokenId                 = UUID
 type TermCandidateIncidence  = UUID
+
+type SessionFileReference    = Digest SHA3_256
diff --git a/src/Settings.hs b/src/Settings.hs
index aeae40ff2..a8103c531 100644
--- a/src/Settings.hs
+++ b/src/Settings.hs
@@ -126,6 +126,9 @@ data AppSettings = AppSettings
     , appSynchroniseLdapUsersWithin :: Maybe NominalDiffTime
     , appSynchroniseLdapUsersInterval :: NominalDiffTime
 
+    , appSessionFilesExpire     :: NominalDiffTime
+    , appPruneUnreferencedFiles :: Maybe NominalDiffTime
+
     , appInitialLogSettings     :: LogSettings
 
     , appTransactionLogIPRetentionTime :: NominalDiffTime
@@ -417,6 +420,9 @@ instance FromJSON AppSettings where
         appSynchroniseLdapUsersWithin <- o .:? "synchronise-ldap-users-within"
         appSynchroniseLdapUsersInterval <- o .:  "synchronise-ldap-users-interval"
 
+        appSessionFilesExpire     <- o .:  "session-files-expire"
+        appPruneUnreferencedFiles <- o .:? "prune-unreferenced-files"
+
         appMaximumContentLength   <- o .: "maximum-content-length"
 
         appReloadTemplates        <- o .:? "reload-templates" .!= defaultDev
diff --git a/src/Utils/Lens.hs b/src/Utils/Lens.hs
index 4ed056e10..688c3f9eb 100644
--- a/src/Utils/Lens.hs
+++ b/src/Utils/Lens.hs
@@ -210,6 +210,8 @@ makeLenses_ ''CourseNewsFile
 makeLenses_ ''AllocationCourse
 
 makeLenses_ ''Tutorial
+
+makeLenses_ ''SessionFile
   
 
 -- makeClassy_ ''Load
diff --git a/test/Database.hs b/test/Database.hs
index f4b136512..dfe4769a0 100755
--- a/test/Database.hs
+++ b/test/Database.hs
@@ -802,3 +802,5 @@ fillDb = do
     }
   insert_ $ AllocationCourse funAlloc pmo 100
   insert_ $ AllocationCourse funAlloc ffp 2
+
+  void $ insertFile "H10-2.hs" -- unreferenced

From b9734953cfb0a63922e52b828c3b47cd32d2834e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 5 Nov 2019 11:07:31 +0100
Subject: [PATCH 044/126] feat: better explain behaviour of submittorForm

---
 messages/uniworx/de-de-formal.msg | 1 +
 messages/uniworx/en-eu.msg        | 1 +
 src/Handler/Submission.hs         | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index 006c6d29d..4ec9695d9 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -322,6 +322,7 @@ SubmissionEditHead tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetNa
 CorrectionHead     tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName cid@CryptoFileNameSubmission: #{tid}-#{ssh}-#{csh} #{sheetName}: Korrektur
 SubmissionMembers: Abgebende
 SubmissionMember: Abgebende(r)
+CosubmittorTip: Einladungen per E-Mail erhalten genau jene Adressen, für die nicht gesichert werden kann, dass sie mit der dahinter stehenden Person schon einmal für diesen Kurs abgegeben haben. Wenn eine angegebene Adresse einer Person zugeordnet werden kann, mit der Sie in diesem Kurs schon einmal zusammen abgegeben haben, wird der Name der Person angezeigt und die Abgabe erfolgt sofort auch im Namen jener Person.
 SubmissionArchive: Zip-Archiv der Abgabedatei(en)
 SubmissionFile: Datei zur Abgabe
 SubmissionFiles: Abgegebene Dateien
diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index e51dcc33f..7232e1590 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -321,6 +321,7 @@ SubmissionEditHead tid ssh csh sheetName: #{tid}-#{ssh}-#{csh} #{sheetName}: Edi
 CorrectionHead tid ssh csh sheetName cid: #{tid}-#{ssh}-#{csh} #{sheetName}: Marking
 SubmissionMembers: Submittors
 SubmissionMember: Submittor
+CosubmittorTip: Invitations are sent via email to exactly those addresses for which it cannot be determined, that you have already submitted for this course with the associated person, at least once. If one of the specified addresses can be matched to a person with whom you have submitted at least once for this course already, the name of that person will be shown and the submission will immediately be made in their name as well.
 SubmissionArchive: Zip-archive of submission files
 SubmissionFile: Submission file
 SubmissionFiles: Submitted files
diff --git a/src/Handler/Submission.hs b/src/Handler/Submission.hs
index f254f9104..d132683b1 100644
--- a/src/Handler/Submission.hs
+++ b/src/Handler/Submission.hs
@@ -265,6 +265,8 @@ makeSubmissionForm cid msmid uploadMode grouping isLecturer prefillUsers = ident
 
           postProcess :: Map ListPosition (Either UserEmail UserId, ()) -> Set (Either UserEmail UserId)
           postProcess = setOf $ folded . _1
+        when (maxSize > Just 1) $
+          wformMessage =<< messageI Info MsgCosubmittorTip
         fmap postProcess <$> massInputW MassInput{..} submittorSettings' True (Just . Map.fromList . zip [0..] . map (, ()) $ Set.toList prefillUsers)
 
 

From acfd3129ec561725dded5a24c7f293086c9087e5 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 5 Nov 2019 16:19:10 +0100
Subject: [PATCH 045/126] fix(sheets): integrate corrector interface into
 SheetEdit

---
 messages/uniworx/de-de-formal.msg     |  12 +-
 messages/uniworx/en-eu.msg            |  12 +-
 models/sheets.model                   |   4 +-
 routes                                |   1 -
 src/Foundation.hs                     |  53 +----
 src/Handler/Home.hs                   |  10 +-
 src/Handler/Sheet.hs                  | 299 ++++++++++++--------------
 src/Handler/Utils/Exam.hs             |   2 +-
 src/Handler/Utils/Form.hs             |  13 +-
 src/Handler/Utils/Sheet.hs            |   2 +-
 src/Jobs/Crontab.hs                   |  62 +++---
 src/Utils/Sheet.hs                    |   7 +-
 templates/corrections-overview.hamlet |   2 +-
 templates/sheetShow.hamlet            |  19 +-
 14 files changed, 231 insertions(+), 267 deletions(-)

diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index 4ec9695d9..b23d44074 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -289,9 +289,15 @@ SheetDescription: Hinweise für Teilnehmer
 SheetGroup: Gruppenabgabe
 SheetVisibleFrom: Sichtbar für Teilnehmer ab
 SheetVisibleFromTip: Ohne Datum nie sichtbar und keine Abgabe möglich; nur für unfertige Blätter leer lassen, deren Bewertung/Fristen sich noch ändern können
-SheetActiveFrom: Beginn Abgabezeitraum
-SheetActiveFromTip: Download der Aufgabenstellung erst ab diesem Datum möglich
-SheetActiveTo: Ende Abgabezeitraum
+SheetActiveFrom: Aktiv ab/Beginn Abgabezeitraum
+SheetActiveFromParticipant: Beginn Abgabezeitraum
+SheetActiveFromParticipantNoSubmit: Herausgabe der Aufgabestellung
+SheetActiveFromTip: Download der Aufgabenstellung und Abgabe erst ab diesem Datum möglich. Ohne Datum keine Abgabe und keine Herausgabe der Aufgabenstellung
+SheetActiveFromUnset: Nie
+SheetActiveTo: Aktiv bis/Ende Abgabezeitraum
+SheetActiveToParticipant: Ende Abgabezeitraum
+SheetActiveToTip: Abgabe nur bis zu diesem Datum möglich. Ohne Datum unbeschränkte Abgabe möglich (soweit gefordert).
+SheetActiveToUnset: Nie
 SheetHintFromTip: Ohne Datum nie für Teilnehmer sichtbar, Korrektoren können diese Dateien immer herunterladen
 SheetSolutionFromTip: Ohne Datum nie für Teilnehmer sichtbar, Korrektoren können diese Dateien immer herunterladen
 SheetMarkingTip: Hinweise zur Korrektur, sichtbar nur für Korrektoren
diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index 7232e1590..f760368f4 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -288,9 +288,15 @@ SheetDescription: Description
 SheetGroup: Group submission
 SheetVisibleFrom: Visible from (for participants)
 SheetVisibleFromTip: Always invisible for participants and no submission possible if left empty; only leave this field empty for temporary/unfinished sheets
-SheetActiveFrom: Submission period start
-SheetActiveFromTip: The exercise sheet will only be available for download starting at this time
-SheetActiveTo: Submission period end
+SheetActiveFrom: Active from/Submission period start
+SheetActiveFromParticipant: Submission period start
+SheetActiveFromParticipantNoSubmit: Assignment published
+SheetActiveFromTip: The exercise sheet's assignment will only be available for download and submission starting at this time. If left empty no submission or download of assignment is ever allowed
+SheetActiveFromUnset: Never
+SheetActiveTo: Active to/Submission period end
+SheetActiveToParticipant: Submission period end
+SheetActiveToTip: Submission will only be possible until this time. If left empty submissions are allowed forever (if at all possible)
+SheetActiveToUnset: Never
 SheetHintFromTip: Always invisible for participants if left empty; correctors can always download hints
 SheetSolutionFromTip: Always invisible for participants if left empty; correctors can always download solutions
 SheetMarkingTip: Instructions for correction, visible only to correctors
diff --git a/models/sheets.model b/models/sheets.model
index 138b50bf1..fcd2cadc4 100644
--- a/models/sheets.model
+++ b/models/sheets.model
@@ -6,8 +6,8 @@ Sheet   -- exercise sheet for a given course
     grouping        SheetGroup       -- May participants submit in groups of certain sizes?
     markingText     Html Maybe       -- Instructons for correctors, included in marking templates
     visibleFrom     UTCTime Maybe    -- Invisible to enrolled participants before
-    activeFrom      UTCTime          -- Download of questions and submission is permitted afterwards
-    activeTo        UTCTime          -- Submission is only permitted before
+    activeFrom      UTCTime Maybe    -- Download of questions and submission is permitted afterwards
+    activeTo        UTCTime Maybe    -- Submission is only permitted before
     hintFrom        UTCTime Maybe    -- Additional files are made available
     solutionFrom    UTCTime Maybe    -- Solution is made available
     submissionMode  SubmissionMode   -- Submission upload by students and/or through tutors?
diff --git a/routes b/routes
index 1c5500267..af3ba9fc1 100644
--- a/routes
+++ b/routes
@@ -143,7 +143,6 @@
       /invite                   SInviteR       GET POST        !ownerANDtimeANDuser-submissions
       !/#SubmissionFileType     SubArchiveR    GET             !owner !corrector
       !/#SubmissionFileType/*FilePath SubDownloadR  GET        !owner !corrector
-    /correctors                 SCorrR         GET POST
     /iscorrector                SIsCorrR       GET             !corrector -- Route is used to check for corrector access to this sheet
     /pseudonym                  SPseudonymR    GET POST        !course-registeredANDcorrector-submissions
     /corrector-invite/          SCorrInviteR   GET POST
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 5dc20beb7..501c7b22b 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -922,19 +922,19 @@ tagAccessPredicate AuthTime = APDB $ \mAuthId route _ -> case route of
     cTime <- liftIO getCurrentTime
     let
       visible = NTop sheetVisibleFrom <= NTop (Just cTime)
-      active = sheetActiveFrom <= cTime && cTime <= sheetActiveTo
-      marking = cTime > sheetActiveTo
+      active  = NTop sheetActiveFrom <= NTop (Just cTime) && NTop (Just cTime) <= NTop sheetActiveTo
+      marking = NTop (Just cTime) > NTop sheetActiveTo
 
     guard visible
 
     case subRoute of
       -- Single Files
-      SFileR                SheetExercise _ -> guard $ sheetActiveFrom <= cTime
+      SFileR                SheetExercise _ -> guard $ NTop sheetActiveFrom <= NTop (Just cTime)
       SFileR                SheetHint     _ -> guard $ maybe False (<= cTime) sheetHintFrom
       SFileR                SheetSolution _ -> guard $ maybe False (<= cTime) sheetSolutionFrom
       SFileR                _             _ -> mzero
       -- Archives of SheetFileType
-      SZipR                 SheetExercise   -> guard $ sheetActiveFrom <= cTime
+      SZipR                 SheetExercise   -> guard $ NTop sheetActiveFrom <= NTop (Just cTime)
       SZipR                 SheetHint       -> guard $ maybe False (<= cTime) sheetHintFrom
       SZipR                 SheetSolution   -> guard $ maybe False (<= cTime) sheetSolutionFrom
       SZipR                 _               -> mzero
@@ -2192,7 +2192,6 @@ instance YesodBreadcrumbs UniWorX where
       SInviteR -> i18nCrumb MsgBreadcrumbSubmissionUserInvite . Just $ CSubmissionR tid ssh csh shn cid SubShowR
       SubArchiveR sft -> i18nCrumb sft . Just $ CSubmissionR tid ssh csh shn cid SubShowR
       SubDownloadR _ _ -> i18nCrumb MsgBreadcrumbSubmissionFile . Just $ CSubmissionR tid ssh csh shn cid SubShowR
-    SCorrR -> i18nCrumb MsgMenuCorrectors . Just $ CSheetR tid ssh csh shn SShowR
     SArchiveR -> i18nCrumb MsgBreadcrumbSheetArchive . Just $ CSheetR tid ssh csh shn SShowR
     SIsCorrR -> i18nCrumb MsgBreadcrumbSheetIsCorrector . Just $ CSheetR tid ssh csh shn SShowR
     SPseudonymR -> i18nCrumb MsgBreadcrumbSheetPseudonym . Just $ CSheetR tid ssh csh shn SShowR
@@ -3120,14 +3119,6 @@ pageActions (CSheetR tid ssh csh shn SShowR) =
       , menuItemModal = False
       , menuItemAccessCallback' = (== Authorized) <$> evalAccessCorrector tid ssh csh
       }
-  , MenuItem
-      { menuItemType  = PageActionPrime
-      , menuItemLabel = MsgMenuCorrectors
-      , menuItemIcon  = Nothing
-      , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SCorrR
-      , menuItemModal = False
-      , menuItemAccessCallback' = return True
-      }
   , MenuItem
       { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuSubmissions
@@ -3178,14 +3169,6 @@ pageActions (CSheetR tid ssh csh shn SSubsR) =
       , menuItemModal = True
       , menuItemAccessCallback' = return True
       }
-  , MenuItem
-      { menuItemType  = PageActionPrime
-      , menuItemLabel = MsgMenuCorrectors
-      , menuItemIcon  = Nothing
-      , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SCorrR
-      , menuItemModal = False
-      , menuItemAccessCallback' = return True
-      }
  , MenuItem
       { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuCorrectionsAssign
@@ -3231,32 +3214,6 @@ pageActions (CSubmissionR tid ssh csh shn cid CorrectionR) =
       , menuItemAccessCallback' = return True
       }
   ]
-pageActions (CSheetR tid ssh csh shn SCorrR) =
-  [ MenuItem
-      { menuItemType  = PageActionPrime
-      , menuItemLabel = MsgMenuSubmissions
-      , menuItemIcon  = Nothing
-      , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SSubsR
-      , menuItemModal = False
-      , menuItemAccessCallback' = return True
-      }
-  , MenuItem
-      { menuItemType  = PageActionPrime
-      , menuItemLabel = MsgMenuCorrectionsAssign
-      , menuItemIcon  = Nothing
-      , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SAssignR
-      , menuItemModal = False
-      , menuItemAccessCallback' = return True
-      }
-  , MenuItem
-      { menuItemType  = PageActionSecondary
-      , menuItemLabel = MsgMenuSheetEdit
-      , menuItemIcon  = Nothing
-      , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SEditR
-      , menuItemModal = False
-      , menuItemAccessCallback' = return True
-      }
-  ]
 pageActions (CourseR tid ssh csh CApplicationsR) =
   [ MenuItem
       { menuItemType  = PageActionPrime
@@ -3456,8 +3413,6 @@ pageHeading (CSubmissionR tid ssh csh shn _ SubShowR) -- TODO: Rethink this one!
 pageHeading (CSubmissionR tid ssh csh shn cid CorrectionR)
   = Just $ i18nHeading $ MsgCorrectionHead tid ssh csh shn cid
 --          (CSubmissionR tid csh shn cid SubDownloadR) -- just a download
-pageHeading (CSheetR _tid _ssh _csh shn SCorrR)
-  = Just $ i18nHeading $ MsgCorrectorsHead shn
 --          (CSheetR tid ssh csh shn SFileR) -- just for Downloads
 
 pageHeading CorrectionsR
diff --git a/src/Handler/Home.hs b/src/Handler/Home.hs
index 0382fab4a..7608b1195 100644
--- a/src/Handler/Home.hs
+++ b/src/Handler/Home.hs
@@ -32,7 +32,7 @@ homeUpcomingSheets uid = do
                                 , E.SqlExpr (E.Value SchoolId)
                                 , E.SqlExpr (E.Value CourseShorthand)
                                 , E.SqlExpr (E.Value SheetName)
-                                , E.SqlExpr (E.Value UTCTime)
+                                , E.SqlExpr (E.Value (Maybe UTCTime))
                                 , E.SqlExpr (E.Value (Maybe SubmissionId)))
       tableData ((participant `E.InnerJoin` course `E.InnerJoin` sheet) `E.LeftOuterJoin` (submission `E.InnerJoin` subuser)) = do
         E.on $ submission E.?. SubmissionId    E.==. subuser      E.?. SubmissionUserSubmission
@@ -41,7 +41,7 @@ homeUpcomingSheets uid = do
         E.on $ course     E.^. CourseId        E.==. sheet        E.^. SheetCourse
         E.on $ course     E.^. CourseId        E.==. participant  E.^. CourseParticipantCourse
         E.where_ $ participant E.^. CourseParticipantUser E.==. E.val uid
-            E.&&. sheet E.^. SheetActiveTo E.>=. E.val cTime
+            E.&&. E.maybe E.true (E.>=. E.val cTime) (sheet E.^. SheetActiveTo)
         return
           ( course  E.^. CourseTerm
           , course  E.^. CourseSchool
@@ -55,7 +55,7 @@ homeUpcomingSheets uid = do
                                              , E.Value SchoolId
                                              , E.Value CourseShorthand
                                              , E.Value SheetName
-                                             , E.Value UTCTime
+                                             , E.Value (Maybe UTCTime)
                                              , E.Value (Maybe SubmissionId)
                                              ))
                                       (DBCell Handler ())
@@ -70,8 +70,8 @@ homeUpcomingSheets uid = do
             anchorCell (CourseR tid ssh csh CShowR) csh
         , sortable (Just "sheet")  (i18nCell MsgSheet)  $ \DBRow{ dbrOutput=(E.Value tid, E.Value ssh, E.Value csh, E.Value shn, _, _) } ->
             anchorCell (CSheetR tid ssh csh shn SShowR) shn
-        , sortable (Just "deadline") (i18nCell MsgDeadline) $ \DBRow{ dbrOutput=(_, _, _, _, E.Value deadline, _) } ->
-            cell $ formatTime SelFormatDateTime deadline >>= toWidget
+        , sortable (Just "deadline") (i18nCell MsgDeadline) $ \DBRow{ dbrOutput=(_, _, _, _, E.Value mDeadline, _) } ->
+            maybe mempty (cell . formatTimeW SelFormatDateTime) mDeadline
         , sortable (Just "done")   (i18nCell MsgDone)   $ \DBRow{ dbrOutput=(E.Value tid, E.Value ssh, E.Value csh, E.Value shn, _, E.Value mbsid) } ->
             case mbsid of
               Nothing    -> cell $ do
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index caca8b576..661744614 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -55,6 +55,8 @@ import Text.Hamlet (ihamlet)
 
 import System.FilePath (addExtension)
 
+import Data.Time.Clock.System (systemEpochDay)
+
 
 {-
   * Implement Handlers
@@ -62,22 +64,38 @@ import System.FilePath (addExtension)
   * Implement Access in Foundation
 -}
 
+type Loads = Map (Either UserEmail UserId) (InvitationData SheetCorrector)
+
 data SheetForm = SheetForm
       { sfName         :: SheetName
+      , sfDescription  :: Maybe Html
+      , sfSheetF, sfHintF, sfSolutionF, sfMarkingF :: Maybe (ConduitT () (Either FileId File) Handler ())
       , sfVisibleFrom  :: Maybe UTCTime
-      , sfActiveFrom   :: UTCTime
-      , sfActiveTo     :: UTCTime
+      , sfActiveFrom   :: Maybe UTCTime
+      , sfActiveTo     :: Maybe UTCTime
       , sfHintFrom     :: Maybe UTCTime
       , sfSolutionFrom :: Maybe UTCTime
-      , sfSheetF, sfHintF, sfSolutionF, sfMarkingF :: Maybe (ConduitT () (Either FileId File) Handler ())
       , sfType         :: SheetType
       , sfGrouping     :: SheetGroup
       , sfSubmissionMode :: SubmissionMode
-      , sfDescription  :: Maybe Html
+      , sfAutoDistribute :: Bool
       , sfMarkingText  :: Maybe Html
+      , sfCorrectors   :: Loads
       -- Keine SheetId im Formular!
       }
 
+data ButtonGeneratePseudonym = BtnGenerate
+  deriving (Enum, Eq, Ord, Bounded, Read, Show, Generic, Typeable)
+instance Universe ButtonGeneratePseudonym
+instance Finite ButtonGeneratePseudonym
+
+nullaryPathPiece ''ButtonGeneratePseudonym (camelToPathPiece' 1)
+
+instance Button UniWorX ButtonGeneratePseudonym where
+  btnLabel BtnGenerate = [whamlet|_{MsgSheetGeneratePseudonym}|]
+  btnClasses BtnGenerate = [BCIsButton, BCDefault]
+
+
 getFtIdMap :: Key Sheet -> DB (SheetFileType -> Set FileId)
 getFtIdMap sId = do
   allfIds <- E.select . E.from $ \(sheetFile `E.InnerJoin` file) -> do
@@ -95,33 +113,34 @@ makeSheetForm msId template = identifyForm FIDsheet $ \html -> do
     ctime <- ceilingQuarterHour <$> liftIO getCurrentTime
     (result, widget) <- flip (renderAForm FormStandard) html $ SheetForm
       <$> areq (textField & cfStrip & cfCI) (fslI MsgSheetName)         (sfName        <$> template)
-      <* aformSection MsgSheetFormTimes
-      <*> aopt utcTimeField   (fslI MsgSheetVisibleFrom
-            & setTooltip MsgSheetVisibleFromTip)
-                                                              ((sfVisibleFrom  <$> template) <|> pure (Just ctime))
-      <*> areq utcTimeField   (fslI MsgSheetActiveFrom
-            & setTooltip MsgSheetActiveFromTip)
-                                                              (sfActiveFrom   <$> template)
-      <*> areq utcTimeField   (fslI MsgSheetActiveTo)         (sfActiveTo     <$> template)
-      <*> aopt utcTimeField   (fslpI MsgSheetHintFrom (mr MsgSheetHintFromPlaceholder)
-            & setTooltip MsgSheetHintFromTip)                 (sfHintFrom     <$> template)
-      <*> aopt utcTimeField   (fslpI MsgSheetSolutionFrom (mr MsgSheetSolutionFromPlaceholder)
-            & setTooltip MsgSheetSolutionFromTip)             (sfSolutionFrom <$> template)
+      <*> aopt htmlField      (fslpI MsgSheetDescription "Html") (sfDescription <$> template)
       <* aformSection MsgSheetFormFiles
       <*> aopt (multiFileField $ oldFileIds SheetExercise) (fslI MsgSheetExercise) (sfSheetF <$> template)
       <*> aopt (multiFileField $ oldFileIds SheetHint)     (fslI MsgSheetHint)      (sfHintF <$> template)
       <*> aopt (multiFileField $ oldFileIds SheetSolution) (fslI MsgSheetSolution) (sfSolutionF <$> template)
       <*> aopt (multiFileField $ oldFileIds SheetMarking)  (fslI MsgSheetMarkingFiles
             & setTooltip MsgSheetMarkingTip)                  (sfMarkingF <$> template)
+      <* aformSection MsgSheetFormTimes
+      <*> aopt utcTimeField   (fslI MsgSheetVisibleFrom
+            & setTooltip MsgSheetVisibleFromTip)
+                                                              ((sfVisibleFrom  <$> template) <|> pure (Just ctime))
+      <*> aopt utcTimeField   (fslI MsgSheetActiveFrom
+            & setTooltip MsgSheetActiveFromTip)
+                                                              (sfActiveFrom   <$> template)
+      <*> aopt utcTimeField   (fslI MsgSheetActiveTo & setTooltip MsgSheetActiveToTip) (sfActiveTo <$> template)
+      <*> aopt utcTimeField   (fslpI MsgSheetHintFrom (mr MsgSheetHintFromPlaceholder)
+            & setTooltip MsgSheetHintFromTip)                 (sfHintFrom     <$> template)
+      <*> aopt utcTimeField   (fslpI MsgSheetSolutionFrom (mr MsgSheetSolutionFromPlaceholder)
+            & setTooltip MsgSheetSolutionFromTip)             (sfSolutionFrom <$> template)
       <* aformSection MsgSheetFormType
       <*> sheetTypeAFormReq   (fslI MsgSheetType
             & setTooltip (uniworxMessages [MsgSheetTypeInfoBonus, MsgSheetTypeInfoInformational, MsgSheetTypeInfoNotGraded]))
                                                           (sfType        <$> template)
       <*> sheetGroupAFormReq  (fslI MsgSheetGroup)        (sfGrouping    <$> template)
       <*> submissionModeForm ((sfSubmissionMode <$> template) <|> pure (SubmissionMode False . Just $ UploadAny True defaultExtensionRestriction))
-      <*> aopt htmlField      (fslpI MsgSheetDescription "Html")
-                                                          (sfDescription <$> template)
+      <*> apopt checkBoxField (fslI MsgAutoAssignCorrs) (sfAutoDistribute <$> template)
       <*> aopt htmlField    (fslpI MsgSheetMarking "Html") (sfMarkingText <$> template)
+      <*> correctorForm (fromMaybe mempty $ sfCorrectors <$> template)
     return $ case result of
       FormSuccess sheetResult
         | errorMsgs <- validateSheet mr' sheetResult
@@ -132,10 +151,10 @@ makeSheetForm msId template = identifyForm FIDsheet $ \html -> do
     validateSheet :: MsgRenderer -> SheetForm -> [Text]
     validateSheet (MsgRenderer {..}) (SheetForm{..}) =
       [ msg | (False, msg) <-
-        [ (      sfVisibleFrom  <=       Just sfActiveFrom  , render MsgSheetErrVisibility)
-        , (      sfActiveFrom   <=            sfActiveTo    , render MsgSheetErrDeadlineEarly)
-        , ( NTop sfHintFrom     >= NTop (Just sfActiveFrom) , render MsgSheetErrHintEarly)
-        , ( NTop sfSolutionFrom >= NTop (Just sfActiveTo)   , render MsgSheetErrSolutionEarly)
+        [ ( NTop sfVisibleFrom  <= NTop sfActiveFrom  , render MsgSheetErrVisibility)
+        , ( NTop sfActiveFrom   <= NTop sfActiveTo    , render MsgSheetErrDeadlineEarly)
+        , ( NTop sfHintFrom     >= NTop sfActiveFrom  , render MsgSheetErrHintEarly)
+        , ( NTop sfSolutionFrom >= NTop sfActiveTo    , render MsgSheetErrSolutionEarly)
       ] ]
 
 
@@ -216,9 +235,9 @@ getSheetListR tid ssh csh = do
                               else spacerCell
               ] id & cellAttrs <>~ [("class","list--inline list--space-separated")]
       , sortable (Just "submission-since") (i18nCell MsgSheetActiveFrom)
-          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _, _)} -> dateTimeCell sheetActiveFrom
+          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _, _)} -> maybe mempty dateTimeCell sheetActiveFrom
       , sortable (Just "submission-until") (i18nCell MsgSheetActiveTo)
-          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _, _)} -> dateTimeCell sheetActiveTo
+          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _, _)} -> maybe mempty dateTimeCell sheetActiveTo
       , sortable Nothing (i18nCell MsgSheetType)
           $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _, _)} -> i18nCell sheetType
       , sortable Nothing (i18nCell MsgSubmission)
@@ -319,17 +338,6 @@ getSheetListR tid ssh csh = do
   defaultLayout $ do
     $(widgetFile "sheetList")
 
-data ButtonGeneratePseudonym = BtnGenerate
-  deriving (Enum, Eq, Ord, Bounded, Read, Show, Generic, Typeable)
-instance Universe ButtonGeneratePseudonym
-instance Finite ButtonGeneratePseudonym
-
-nullaryPathPiece ''ButtonGeneratePseudonym (camelToPathPiece' 1)
-
-instance Button UniWorX ButtonGeneratePseudonym where
-  btnLabel BtnGenerate = [whamlet|_{MsgSheetGeneratePseudonym}|]
-  btnClasses BtnGenerate = [BCIsButton, BCDefault]
-
 -- Show single sheet
 getSShowR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html
 getSShowR tid ssh csh shn = do
@@ -422,8 +430,9 @@ getSShowR tid ssh csh shn = do
     setTitleI $ prependCourseTitle tid ssh csh $ SomeMessage shn
     let zipLink = CSheetR tid ssh csh shn SArchiveR
         visibleFrom =     visibleUTCTime SelFormatDateTime <$> sheetVisibleFrom  sheet
-    sheetFrom     <-           formatTime SelFormatDateTime  $  sheetActiveFrom   sheet
-    sheetTo       <-           formatTime SelFormatDateTime  $  sheetActiveTo     sheet
+        hasSubmission = classifySubmissionMode (sheetSubmissionMode sheet) /= SubmissionModeNone
+    sheetFrom     <- traverse (formatTime SelFormatDateTime) $  sheetActiveFrom   sheet
+    sheetTo       <- traverse (formatTime SelFormatDateTime) $  sheetActiveTo     sheet
     hintsFrom     <- traverse (formatTime SelFormatDateTime) $  sheetHintFrom     sheet
     solutionFrom  <- traverse (formatTime SelFormatDateTime) $  sheetSolutionFrom sheet
     markingText   <- runMaybeT $ assertM_ (Authorized ==) (evalAccessCorrector tid ssh csh) >> hoistMaybe (sheetMarkingText sheet)
@@ -480,7 +489,8 @@ getSheetNewR tid ssh csh = do
         (FormSuccess (Just shn)) -> E.where_ $ sheet E.^. SheetName E.==. E.val shn
         -- (FormFailure msgs) -> -- not in MonadHandler anymore -- forM_ msgs (addMessage Error . toHtml)
         _other -> return ()
-  lastSheets <- runDB $ E.select . E.from $ \(course `E.InnerJoin` sheet) -> do
+  (lastSheets, loads) <- runDB $ do
+    lSheets <- E.select . E.from $ \(course `E.InnerJoin` sheet) -> do
       E.on     $ course E.^. CourseId E.==. sheet E.^. SheetCourse
       E.where_ $ course E.^. CourseTerm      E.==. E.val tid
           E.&&.  course E.^. CourseSchool    E.==. E.val ssh
@@ -493,27 +503,35 @@ getSheetNewR tid ssh csh = do
       -- E.orderBy [E.desc lastSheetEdit, E.desc (sheet E.^. SheetActiveFrom)]
       E.orderBy [E.desc (sheet E.^. SheetActiveFrom)]
       E.limit 1
-      return sheet
+      let firstEdit = E.sub_select . E.from $ \sheetEdit -> do
+            E.where_ $ sheetEdit E.^. SheetEditSheet E.==. sheet E.^. SheetId
+            return . E.min_ $ sheetEdit E.^. SheetEditTime
+      return (sheet, firstEdit)
+    cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
+    loads <- defaultLoads cid
+    return (lSheets, loads)
   now <- liftIO getCurrentTime
   let template = case lastSheets of
-        ((Entity {entityVal=Sheet{..}}):_)  ->
-          let addTime = addWeeks $ max 1 $ weeksToAdd sheetActiveTo now
+        ((Entity {entityVal=Sheet{..}}, E.Value fEdit):_)  ->
+          let addTime = addWeeks $ max 1 $ weeksToAdd (fromMaybe (UTCTime systemEpochDay 0) $ sheetActiveTo <|> fEdit) now
           in Just $ SheetForm
-            { sfName         = stepTextCounterCI sheetName
-            , sfDescription  = sheetDescription
-            , sfType         = sheetType
-            , sfGrouping     = sheetGrouping
-            , sfVisibleFrom  = addTime <$> sheetVisibleFrom
-            , sfActiveFrom   = addTime     sheetActiveFrom
-            , sfActiveTo     = addTime     sheetActiveTo
+            { sfName           = stepTextCounterCI sheetName
+            , sfDescription    = sheetDescription
+            , sfType           = sheetType
+            , sfGrouping       = sheetGrouping
+            , sfVisibleFrom    = addTime <$> sheetVisibleFrom
+            , sfActiveFrom     = addTime <$> sheetActiveFrom
+            , sfActiveTo       = addTime <$> sheetActiveTo
             , sfSubmissionMode = sheetSubmissionMode
-            , sfSheetF       = Nothing
-            , sfHintFrom     = addTime <$> sheetHintFrom
-            , sfHintF        = Nothing
-            , sfSolutionFrom = addTime <$> sheetSolutionFrom
-            , sfSolutionF    = Nothing
-            , sfMarkingF     = Nothing
-            , sfMarkingText  = sheetMarkingText
+            , sfSheetF         = Nothing
+            , sfHintFrom       = addTime <$> sheetHintFrom
+            , sfHintF          = Nothing
+            , sfSolutionFrom   = addTime <$> sheetSolutionFrom
+            , sfSolutionF      = Nothing
+            , sfMarkingF       = Nothing
+            , sfMarkingText    = sheetMarkingText
+            , sfAutoDistribute = sheetAutoDistribute
+            , sfCorrectors     = loads
             }
         _other -> Nothing
   let action newSheet = -- More specific error message for new sheet could go here, if insertUnique returns Nothing
@@ -526,44 +544,49 @@ postSheetNewR = getSheetNewR
 
 getSEditR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html
 getSEditR tid ssh csh shn = do
-  (Entity sid Sheet{..}, sheetFileIds) <- runDB $ do
-    ent <- fetchSheet tid ssh csh shn
+  (Entity sid Sheet{..}, sheetFileIds, currentLoads) <- runDB $ do
+    ent@(Entity sid _) <- fetchSheet tid ssh csh shn
     fti <- getFtIdMap $ entityKey ent
-    return (ent, fti)
+    cLoads <- Map.union
+      <$> fmap (foldMap $ \(Entity _ SheetCorrector{..}) -> Map.singleton (Right sheetCorrectorUser) (InvDBDataSheetCorrector sheetCorrectorLoad sheetCorrectorState, InvTokenDataSheetCorrector)) (selectList [ SheetCorrectorSheet ==. sid ] [])
+      <*> fmap (fmap (, InvTokenDataSheetCorrector) . Map.mapKeysMonotonic Left) (sourceInvitationsF sid)
+    return (ent, fti, cLoads)
   let template = Just $ SheetForm
-        { sfName         = sheetName
-        , sfDescription  = sheetDescription
-        , sfType         = sheetType
-        , sfGrouping     = sheetGrouping
-        , sfVisibleFrom  = sheetVisibleFrom
-        , sfActiveFrom   = sheetActiveFrom
-        , sfActiveTo     = sheetActiveTo
+        { sfName           = sheetName
+        , sfDescription    = sheetDescription
+        , sfType           = sheetType
+        , sfGrouping       = sheetGrouping
+        , sfVisibleFrom    = sheetVisibleFrom
+        , sfActiveFrom     = sheetActiveFrom
+        , sfActiveTo       = sheetActiveTo
         , sfSubmissionMode = sheetSubmissionMode
-        , sfSheetF       = Just . yieldMany . map Left . Set.elems $ sheetFileIds SheetExercise
-        , sfHintFrom     = sheetHintFrom
-        , sfHintF        = Just . yieldMany . map Left . Set.elems $ sheetFileIds SheetHint
-        , sfSolutionFrom = sheetSolutionFrom
-        , sfSolutionF    = Just . yieldMany . map Left . Set.elems $ sheetFileIds SheetSolution
-        , sfMarkingF     = Just . yieldMany . map Left . Set.elems $ sheetFileIds SheetMarking
-        , sfMarkingText  = sheetMarkingText
+        , sfSheetF         = Just . yieldMany . map Left . Set.elems $ sheetFileIds SheetExercise
+        , sfHintFrom       = sheetHintFrom
+        , sfHintF          = Just . yieldMany . map Left . Set.elems $ sheetFileIds SheetHint
+        , sfSolutionFrom   = sheetSolutionFrom
+        , sfSolutionF      = Just . yieldMany . map Left . Set.elems $ sheetFileIds SheetSolution
+        , sfMarkingF       = Just . yieldMany . map Left . Set.elems $ sheetFileIds SheetMarking
+        , sfMarkingText    = sheetMarkingText
+        , sfAutoDistribute = sheetAutoDistribute
+        , sfCorrectors     = currentLoads
         }
+
   let action = uniqueReplace sid -- More specific error message for edit old sheet could go here by using myReplaceUnique instead
   handleSheetEdit tid ssh csh (Just sid) template action
 
 postSEditR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html
 postSEditR = getSEditR
 
-handleSheetEdit :: TermId -> SchoolId -> CourseShorthand -> Maybe SheetId -> Maybe SheetForm -> (Sheet -> YesodDB UniWorX (Maybe SheetId)) -> Handler Html
+handleSheetEdit :: TermId -> SchoolId -> CourseShorthand -> Maybe SheetId -> Maybe SheetForm -> (Sheet -> YesodJobDB UniWorX (Maybe SheetId)) -> Handler Html
 handleSheetEdit tid ssh csh msId template dbAction = do
   let mbshn  = sfName <$> template
   aid  <- requireAuthId
+  cid <- runDB $ getKeyBy404 $ TermSchoolCourseShort tid ssh csh
   ((res,formWidget), formEnctype) <- runFormPost $ makeSheetForm msId template
   case res of
     (FormSuccess SheetForm{..}) -> do
-      saveOkay <- runDB $ do
+      saveOkay <- runDBJobs $ do
         actTime <- liftIO getCurrentTime
-        cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
-        oldAutoDistribute <- fmap sheetAutoDistribute . join <$> traverse get msId
         let newSheet = Sheet
               { sheetCourse         = cid
               , sheetName           = sfName
@@ -577,7 +600,7 @@ handleSheetEdit tid ssh csh msId template dbAction = do
               , sheetHintFrom       = sfHintFrom
               , sheetSolutionFrom   = sfSolutionFrom
               , sheetSubmissionMode = sfSubmissionMode
-              , sheetAutoDistribute = fromMaybe False oldAutoDistribute
+              , sheetAutoDistribute = sfAutoDistribute
               }
         mbsid <- dbAction newSheet
         case mbsid of
@@ -590,22 +613,36 @@ handleSheetEdit tid ssh csh msId template dbAction = do
             insert_ $ SheetEdit aid actTime sid
             addMessageI Success $ MsgSheetEditOk tid ssh csh sfName
             -- Sanity checks generating warnings only, but not errors!
-            warnTermDays tid $ Map.fromList [ (date,name) | (Just date, name) <-
+            hoist lift . warnTermDays tid $ Map.fromList [ (date,name) | (Just date, name) <-
                 [ (sfVisibleFrom,     MsgSheetVisibleFrom)
-                , (Just sfActiveFrom, MsgSheetActiveFrom)
-                , (Just sfActiveTo,   MsgSheetActiveTo)
+                , (sfActiveFrom,      MsgSheetActiveFrom)
+                , (sfActiveTo,        MsgSheetActiveTo)
                 , (sfHintFrom,        MsgSheetSolutionFromTip)
                 , (sfSolutionFrom,    MsgSheetSolutionFrom)
                 ] ]
+
+            let
+              sheetCorrectors :: Set (Either (Invitation' SheetCorrector) SheetCorrector)
+              sheetCorrectors = Set.fromList . map f $ Map.toList sfCorrectors
+                where
+                  f (Left email, invData) = Left (email, sid, invData)
+                  f (Right uid, (InvDBDataSheetCorrector load cState, InvTokenDataSheetCorrector)) = Right $ SheetCorrector uid sid load cState
+              (invites, adds) = partitionEithers $ Set.toList sheetCorrectors
+
+            deleteWhere [ SheetCorrectorSheet ==. sid ]
+            insertMany_ adds
+
+            deleteWhere [InvitationFor ==. invRef @SheetCorrector sid, InvitationEmail /<-. toListOf (folded . _1) invites]
+            sinkInvitationsF correctorInvitationConfig invites
+  
             return True
-      when saveOkay $ redirect $ case msId of
-        Just _  -> CSheetR tid ssh csh sfName SShowR -- redirect must happen outside of runDB
-        Nothing -> CSheetR tid ssh csh sfName SCorrR
+      when saveOkay $
+        redirect $ CSheetR tid ssh csh sfName SShowR -- redirect must happen outside of runDB
     (FormFailure msgs) -> forM_ msgs $ (addMessage Error) . toHtml
     _ -> runDB $ warnTermDays tid $ Map.fromList [ (date,name) | (Just date, name) <-
             [(sfVisibleFrom  =<< template, MsgSheetVisibleFrom)
-            ,(sfActiveFrom   <$> template, MsgSheetActiveFrom)
-            ,(sfActiveTo     <$> template, MsgSheetActiveTo)
+            ,(sfActiveFrom   =<< template, MsgSheetActiveFrom)
+            ,(sfActiveTo     =<< template, MsgSheetActiveTo)
             ,(sfHintFrom     =<< template, MsgSheetSolutionFromTip)
             ,(sfSolutionFrom =<< template, MsgSheetSolutionFrom)
             ] ]
@@ -641,14 +678,14 @@ insertSheetFile sid ftype finfo = do
       fid <- insert file
       void . insert $ SheetFile sid fid ftype -- cannot fail due to uniqueness, since we generated a fresh FileId in the previous step
 
-insertSheetFile' :: SheetId -> SheetFileType -> ConduitT () (Either FileId File) Handler () -> YesodDB UniWorX ()
+insertSheetFile' :: SheetId -> SheetFileType -> ConduitT () (Either FileId File) Handler () -> YesodJobDB UniWorX ()
 insertSheetFile' sid ftype fs = do
     oldFileIds <- fmap setFromList . fmap (map E.unValue) . E.select . E.from $ \(file `E.InnerJoin` sheetFile) -> do
       E.on $ file E.^. FileId E.==. sheetFile E.^. SheetFileFile
       E.where_ $ sheetFile E.^. SheetFileSheet E.==. E.val sid
            E.&&. sheetFile E.^. SheetFileType    E.==. E.val ftype
       return (file E.^. FileId)
-    keep <- execWriterT . runConduit $ transPipe (lift . lift) fs .| C.mapM_ finsert
+    keep <- execWriterT . runConduit $ transPipe liftHandler fs .| C.mapM_ finsert
     mapM_ deleteCascade $ (oldFileIds \\ keep :: Set FileId)
   where
     finsert (Left fileId) = tell $ singleton fileId
@@ -657,22 +694,12 @@ insertSheetFile' sid ftype fs = do
       void . insert $ SheetFile sid fid ftype -- cannot fail due to uniqueness, since we generated a fresh FileId in the previous step
 
 
-data CorrectorForm = CorrectorForm
-  { cfUserId :: UserId
-  , cfUserName :: Text
-  , cfResult :: FormResult (CorrectorState, Load)
-  , cfViewByTut, cfViewProp, cfViewDel, cfViewState :: FieldView UniWorX
-  }
-
-type Loads = Map (Either UserEmail UserId) (CorrectorState, Load)
-
-defaultLoads :: SheetId -> DB Loads
+defaultLoads :: CourseId -> DB Loads
 -- ^ Generate `Loads` in such a way that minimal editing is required
 --
 -- For every user, that ever was a corrector for this course, return their last `Load`.
 -- "Last `Load`" is taken to mean their `Load` on the `Sheet` with the most recent creation time (first edit).
-defaultLoads shid = do
-  cId <- sheetCourse <$> getJust shid
+defaultLoads cId = do
   fmap toMap . E.select . E.from $ \(sheet `E.InnerJoin` sheetCorrector) -> E.distinctOnOrderBy [E.asc (sheetCorrector E.^. SheetCorrectorUser)] $ do
     E.on $ sheet E.^. SheetId E.==. sheetCorrector E.^. SheetCorrectorSheet
 
@@ -687,37 +714,20 @@ defaultLoads shid = do
     return (sheetCorrector E.^. SheetCorrectorUser, sheetCorrector E.^. SheetCorrectorLoad, sheetCorrector E.^. SheetCorrectorState)
   where
     toMap :: [(E.Value UserId, E.Value Load, E.Value CorrectorState)] -> Loads
-    toMap = foldMap $ \(E.Value uid, E.Value cLoad, E.Value cState) -> Map.singleton (Right uid) (cState, cLoad)
+    toMap = foldMap $ \(E.Value uid, E.Value cLoad, E.Value cState) -> Map.singleton (Right uid) (InvDBDataSheetCorrector cLoad cState, InvTokenDataSheetCorrector)
 
 
-correctorForm :: SheetId -> AForm Handler (Set (Either (Invitation' SheetCorrector) SheetCorrector))
-correctorForm shid = wFormToAForm $ do
+correctorForm :: Loads -> AForm Handler Loads
+correctorForm loads' = wFormToAForm $ do
   currentRoute <- fromMaybe (error "correctorForm called from 404-handler") <$> liftHandler getCurrentRoute
   userId <- liftHandler requireAuthId
   MsgRenderer mr <- getMsgRenderer
 
   let
-    currentLoads :: DB Loads
-    currentLoads = Map.union
-      <$> fmap (foldMap $ \(Entity _ SheetCorrector{..}) -> Map.singleton (Right sheetCorrectorUser) (sheetCorrectorState, sheetCorrectorLoad)) (selectList [ SheetCorrectorSheet ==. shid ] [])
-      <*> fmap (fmap ((,) <$> invDBSheetCorrectorState <*> invDBSheetCorrectorLoad) . Map.mapKeysMonotonic Left) (sourceInvitationsF shid)
-  (defaultLoads', currentLoads') <- liftHandler . runDB $ (,) <$> defaultLoads shid <*> currentLoads
-
-  isWrite <- liftHandler $ isWriteRequest currentRoute
-
-  let
-    applyDefaultLoads = Map.null currentLoads' && not isWrite
     loads :: Map (Either UserEmail UserId) (CorrectorState, Load)
-    loads
-      | applyDefaultLoads = defaultLoads'
-      | otherwise         = currentLoads'
+    loads = loads' <&> \(InvDBDataSheetCorrector load cState, InvTokenDataSheetCorrector) -> (cState, load)
 
-  countTutRes <- wreq checkBoxField (fslI MsgCountTutProp & setTooltip MsgCountTutPropTip) . Just . any (\(_, Load{..}) -> fromMaybe False byTutorial) $ Map.elems loads
-
-  -- when (not (Map.null loads) && applyDefaultLoads) $       -- Alert Message
-  --   addMessageI Warning MsgCorrectorsDefaulted
-  when (not (Map.null loads) && applyDefaultLoads) $          -- Alert Notification
-    wformMessage =<< messageIconI Warning IconNoCorrectors MsgCorrectorsDefaulted
+  countTutRes <- wpopt checkBoxField (fslI MsgCountTutProp & setTooltip MsgCountTutPropTip) . Just . any (\(_, Load{..}) -> fromMaybe False byTutorial) $ Map.elems loads
 
 
   let
@@ -804,51 +814,16 @@ correctorForm shid = wFormToAForm $ do
     miIdent :: Text
     miIdent = "correctors"
 
-    postProcess :: Map ListPosition (Either UserEmail UserId, (CorrectorState, Load)) -> Set (Either (Invitation' SheetCorrector) SheetCorrector)
-    postProcess = Set.fromList . map postProcess' . Map.elems
-      where
-        sheetCorrectorSheet = shid
-
-        postProcess' :: (Either UserEmail UserId, (CorrectorState, Load)) -> Either (Invitation' SheetCorrector) SheetCorrector
-        postProcess' (Right sheetCorrectorUser, (sheetCorrectorState, sheetCorrectorLoad)) = Right SheetCorrector{..}
-        postProcess' (Left email, (cState, load)) = Left (email, shid, (InvDBDataSheetCorrector load cState, InvTokenDataSheetCorrector))
+    postProcess :: Map ListPosition (Either UserEmail UserId, (CorrectorState, Load)) -> Loads
+    postProcess = Map.fromList . map postProcess' . Map.elems
+      where 
+        postProcess' :: (Either UserEmail UserId, (CorrectorState, Load)) -> (Either UserEmail UserId, (InvitationDBData SheetCorrector, InvitationTokenData SheetCorrector))
+        postProcess' = over _2 $ \(cState, load) -> (InvDBDataSheetCorrector load cState, InvTokenDataSheetCorrector)
 
     filledData :: Maybe (Map ListPosition (Either UserEmail UserId, (CorrectorState, Load)))
     filledData = Just . Map.fromList . zip [0..] $ Map.toList loads -- TODO orderBy Name?!
 
-  fmap postProcess <$> massInputW MassInput{..} (fslI MsgCorrectors & setTooltip MsgMassInputTip) True filledData
-
-getSCorrR, postSCorrR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html
-postSCorrR = getSCorrR
-getSCorrR tid ssh csh shn = do
-  Entity shid Sheet{..} <- runDB $ fetchSheet tid ssh csh shn
-
-  ((res,formWidget), formEnctype) <- runFormPost . identifyForm FIDcorrectors . renderAForm FormStandard $
-    (,) <$> areq checkBoxField (fslI MsgAutoAssignCorrs) (Just sheetAutoDistribute)
-        <*> correctorForm shid
-
-  case res of
-    FormFailure errs -> mapM_ (addMessage Error . toHtml) errs
-    FormSuccess (autoDistribute, sheetCorrectors) -> runDBJobs $ do
-      update shid [ SheetAutoDistribute =. autoDistribute ]
-
-      let (invites, adds) = partitionEithers $ Set.toList sheetCorrectors
-
-      deleteWhere [ SheetCorrectorSheet ==. shid ]
-      insertMany_ adds
-
-      deleteWhere [InvitationFor ==. invRef @SheetCorrector shid, InvitationEmail /<-. toListOf (folded . _1) invites]
-      sinkInvitationsF correctorInvitationConfig invites
-
-      addMessageI Success MsgCorrectorsUpdated
-    FormMissing -> return ()
-
-  defaultLayout $ do
-    setTitleI $ MsgSheetCorrectorsTitle tid ssh csh shn
-    wrapForm formWidget def
-      { formAction = Just . SomeRoute $ CSheetR tid ssh csh shn SCorrR
-      , formEncoding = formEnctype
-      }
+  fmap postProcess <$> massInputW MassInput{..} (fslI MsgCorrectors & setTooltip MsgMassInputTip) False filledData
 
 
 instance IsInvitableJunction SheetCorrector where
diff --git a/src/Handler/Utils/Exam.hs b/src/Handler/Utils/Exam.hs
index ec5d7f5d2..dd9742e39 100644
--- a/src/Handler/Utils/Exam.hs
+++ b/src/Handler/Utils/Exam.hs
@@ -70,7 +70,7 @@ examBonus (Entity eId Exam{..}) = runConduit $
         [ E.when_
             ( E.not_ . E.isNothing $ examRegistration E.^. ExamRegistrationOccurrence )
           E.then_
-            (       E.just (sheet E.^. SheetActiveTo) E.<=. examOccurrence E.?. ExamOccurrenceStart
+            (       E.maybe E.true ((E.<=. examOccurrence E.?. ExamOccurrenceStart) . E.just) (sheet E.^. SheetActiveTo)
               E.&&. sheet E.^. SheetVisibleFrom E.<=. examOccurrence E.?. ExamOccurrenceStart
             )
         ]
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index 3ab191e0a..85467b5f7 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -220,8 +220,17 @@ multiAction :: forall action a.
             -> FieldSettings UniWorX
             -> Maybe action
             -> (Html -> MForm Handler (FormResult a, [FieldView UniWorX]))
-multiAction acts fs@FieldSettings{..} defAction csrf = do
-  (actionRes, actionView) <- mreq (selectField . optionsF $ Map.keysSet acts) fs defAction
+multiAction = multiAction' mpopt
+  
+multiAction' :: forall action a.
+                ( RenderMessage UniWorX action, PathPiece action, Ord action )
+             => (Field Handler action -> FieldSettings UniWorX -> Maybe action -> MForm Handler (FormResult action, FieldView UniWorX))
+             -> Map action (AForm Handler a)
+             -> FieldSettings UniWorX
+             -> Maybe action
+             -> (Html -> MForm Handler (FormResult a, [FieldView UniWorX]))
+multiAction' minp acts fs@FieldSettings{..} defAction csrf = do
+  (actionRes, actionView) <- minp (selectField . optionsF $ Map.keysSet acts) fs defAction
   results <- mapM (fmap (over _2 ($ [])) . aFormToForm) acts
 
   let actionResults = view _1 <$> results
diff --git a/src/Handler/Utils/Sheet.hs b/src/Handler/Utils/Sheet.hs
index 58a873228..723461206 100644
--- a/src/Handler/Utils/Sheet.hs
+++ b/src/Handler/Utils/Sheet.hs
@@ -10,7 +10,7 @@ import qualified Database.Esqueleto.Internal.Sql as E
 -- | Map sheet file types to their visibily dates of a given sheet, for convenience
 sheetFileTypeDates :: Sheet -> SheetFileType -> Maybe UTCTime
 sheetFileTypeDates Sheet{..} = \case
-  SheetExercise -> Just sheetActiveFrom
+  SheetExercise -> sheetActiveFrom
   SheetHint     -> sheetHintFrom
   SheetSolution -> sheetSolutionFrom
   SheetMarking  -> Nothing
diff --git a/src/Jobs/Crontab.hs b/src/Jobs/Crontab.hs
index 29d8e0bf8..814a53407 100644
--- a/src/Jobs/Crontab.hs
+++ b/src/Jobs/Crontab.hs
@@ -163,39 +163,41 @@ determineCrontab = execWriterT $ do
 
   let
     sheetJobs (Entity nSheet Sheet{..}) = do
-      tell $ HashMap.singleton
-        (JobCtlQueue $ JobQueueNotification NotificationSheetActive{..})
-        Cron
-          { cronInitial = CronTimestamp $ utcToLocalTimeTZ appTZ sheetActiveFrom
-          , cronRepeat = CronRepeatNever
-          , cronRateLimit = appNotificationRateLimit
-          , cronNotAfter = Right . CronTimestamp $ utcToLocalTimeTZ appTZ sheetActiveTo
-          }
-      tell $ HashMap.singleton
-        (JobCtlQueue $ JobQueueNotification NotificationSheetSoonInactive{..})
-        Cron
-          { cronInitial = CronTimestamp . utcToLocalTimeTZ appTZ . max sheetActiveFrom $ addUTCTime (-nominalDay) sheetActiveTo
-          , cronRepeat = CronRepeatOnChange -- Allow repetition of the notification (if something changes), but wait at least an hour
-          , cronRateLimit = appNotificationRateLimit
-          , cronNotAfter = Right . CronTimestamp $ utcToLocalTimeTZ appTZ sheetActiveTo
-          }
-      tell $ HashMap.singleton
-        (JobCtlQueue $ JobQueueNotification NotificationSheetInactive{..})
-        Cron
-          { cronInitial   = CronTimestamp $ utcToLocalTimeTZ appTZ sheetActiveTo
-          , cronRepeat    = CronRepeatOnChange
-          , cronRateLimit = appNotificationRateLimit
-          , cronNotAfter  = Left appNotificationExpiration
-          }             
-      when sheetAutoDistribute $
+      for_ sheetActiveFrom $ \aFrom -> 
         tell $ HashMap.singleton
-          (JobCtlQueue $ JobDistributeCorrections nSheet)
+          (JobCtlQueue $ JobQueueNotification NotificationSheetActive{..})
           Cron
-            { cronInitial   = CronTimestamp $ utcToLocalTimeTZ appTZ sheetActiveTo
-            , cronRepeat    = CronRepeatNever
-            , cronRateLimit = 3600 -- Irrelevant due to `cronRepeat`
-            , cronNotAfter  = Left nominalDay
+            { cronInitial = CronTimestamp $ utcToLocalTimeTZ appTZ aFrom
+            , cronRepeat = CronRepeatNever
+            , cronRateLimit = appNotificationRateLimit
+            , cronNotAfter = Right $ maybe CronNotScheduled (CronTimestamp . utcToLocalTimeTZ appTZ) sheetActiveTo
             }
+      for_ sheetActiveTo $ \aTo -> do
+        tell $ HashMap.singleton
+          (JobCtlQueue $ JobQueueNotification NotificationSheetSoonInactive{..})
+          Cron
+            { cronInitial = CronTimestamp . utcToLocalTimeTZ appTZ . maybe id max sheetActiveFrom $ addUTCTime (-nominalDay) aTo
+            , cronRepeat = CronRepeatOnChange -- Allow repetition of the notification (if something changes), but wait at least an hour
+            , cronRateLimit = appNotificationRateLimit
+            , cronNotAfter = Right . CronTimestamp $ utcToLocalTimeTZ appTZ aTo
+            }
+        tell $ HashMap.singleton
+          (JobCtlQueue $ JobQueueNotification NotificationSheetInactive{..})
+          Cron
+            { cronInitial   = CronTimestamp $ utcToLocalTimeTZ appTZ aTo
+            , cronRepeat    = CronRepeatOnChange
+            , cronRateLimit = appNotificationRateLimit
+            , cronNotAfter  = Left appNotificationExpiration
+            }             
+        when sheetAutoDistribute $
+          tell $ HashMap.singleton
+            (JobCtlQueue $ JobDistributeCorrections nSheet)
+            Cron
+              { cronInitial   = CronTimestamp $ utcToLocalTimeTZ appTZ aTo
+              , cronRepeat    = CronRepeatNever
+              , cronRateLimit = 3600 -- Irrelevant due to `cronRepeat`
+              , cronNotAfter  = Left nominalDay
+              }
 
   runConduit $ transPipe lift (selectSource [] []) .| C.mapM_ sheetJobs
 
diff --git a/src/Utils/Sheet.hs b/src/Utils/Sheet.hs
index 820def03d..31ee278d6 100644
--- a/src/Utils/Sheet.hs
+++ b/src/Utils/Sheet.hs
@@ -2,6 +2,7 @@ module Utils.Sheet where
 
 import Import.NoFoundation
 import qualified Database.Esqueleto as E
+import qualified Database.Esqueleto.Utils as E
 
 -- DB Queries for Sheets that are used in several places
 
@@ -10,8 +11,8 @@ sheetCurrent tid ssh csh = do
   now <- liftIO getCurrentTime
   sheets <- E.select . E.from $ \(course `E.InnerJoin` sheet) -> do
     E.on $ sheet      E.^. SheetCourse     E.==. course E.^. CourseId
-    E.where_ $ sheet E.^. SheetActiveTo   E.>.  E.val now
-        E.&&.  sheet E.^. SheetActiveFrom E.<=. E.val now
+    E.where_ $ E.maybe E.true (E.>. E.val now) (sheet E.^. SheetActiveTo)
+        E.&&. sheet E.^. SheetActiveFrom  E.<=. E.just (E.val now)
         E.&&. course E.^. CourseTerm      E.==. E.val tid
         E.&&. course E.^. CourseSchool    E.==. E.val ssh
         E.&&. course E.^. CourseShorthand E.==. E.val csh
@@ -29,7 +30,7 @@ sheetOldUnassigned tid ssh csh = do
   now <- liftIO getCurrentTime
   sheets <- E.select . E.from $ \(course `E.InnerJoin` sheet) -> do
     E.on $ sheet     E.^. SheetCourse     E.==. course E.^. CourseId
-    E.where_ $ sheet E.^. SheetActiveTo   E.<=. E.val now
+    E.where_ $ sheet E.^. SheetActiveTo   E.<=. E.just (E.val now)
         E.&&. course E.^. CourseTerm      E.==. E.val tid
         E.&&. course E.^. CourseSchool    E.==. E.val ssh
         E.&&. course E.^. CourseShorthand E.==. E.val csh
diff --git a/templates/corrections-overview.hamlet b/templates/corrections-overview.hamlet
index d6f118de5..da6dc8e8e 100644
--- a/templates/corrections-overview.hamlet
+++ b/templates/corrections-overview.hamlet
@@ -129,7 +129,7 @@
           $maybe CorrectionInfo{ciSubmissions} <- Map.lookup shn sheetMap
             <td .table__th>#{getLoadSum shn}
             <td .table__th>#{ciSubmissions}
-            <td .table__td colspan=3>^{simpleLinkI (SomeMessage MsgMenuCorrectorsChange) (CSheetR tid ssh csh shn SCorrR)}
+            <td .table__td colspan=3>^{simpleLinkI (SomeMessage MsgMenuCorrectorsChange) (CSheetR tid ssh csh shn SEditR)}
 
       <tr .table__row .table__row--head>
         <th>
diff --git a/templates/sheetShow.hamlet b/templates/sheetShow.hamlet
index 9f9ddd3e2..321fc573a 100644
--- a/templates/sheetShow.hamlet
+++ b/templates/sheetShow.hamlet
@@ -14,10 +14,21 @@ $maybe descr <- sheetDescription sheet
       $nothing
         #{isVisible False}
         _{MsgSheetInvisible}
-    <dt .deflist__dt>_{MsgSheetActiveFrom}
-    <dd .deflist__dd>#{sheetFrom}
-    <dt .deflist__dt>_{MsgSheetActiveTo}
-    <dd .deflist__dd>#{sheetTo}
+    <dt .deflist__dt>
+      $if hasSubmission
+        _{MsgSheetActiveFromParticipant}
+      $else
+        _{MsgSheetActiveFromParticipantNoSubmit}
+    $maybe ts <- sheetFrom
+      <dd .deflist__dd>#{ts}
+    $nothing
+      <dd .deflist__dd>_{MsgSheetActiveFromUnset}
+    $if hasSubmission
+      <dt .deflist__dt>_{MsgSheetActiveToParticipant}
+      $maybe ts <- sheetTo
+        <dd .deflist__dd>#{ts}
+      $nothing
+        <dd .deflist__dd>_{MsgSheetActiveToUnset}
     $maybe hints <- hintsFrom <* guard hasHints
       <dt .deflist__dt>_{MsgSheetHintFrom}
       <dd .deflist__dd>#{hints}

From 746760475a60da9df8ce4e310ee379bb69edf491 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 7 Nov 2019 13:25:53 +0100
Subject: [PATCH 046/126] Add .gitlab-ci.yml

---
 .gitlab-ci.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000000000..9d27cee2b
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,13 @@
+image: fpco/stack-build:lts-13.21
+
+build:
+  stage: build
+  script:
+    - stack build --copy-bins --local-bin-path $(pwd) --flag uniworx:-library-only --flag uniworx:-dev --flag uniworx:pedantic
+  artifacts:
+    paths:
+      - uniworx
+  cache:
+    key: "%CI_COMMIT_REF_SLUG"
+    paths:
+      - .stack-work
\ No newline at end of file

From 8c9d7a37ca1e2a63eca3a9d58b9693b4639c8a83 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 7 Nov 2019 16:04:21 +0100
Subject: [PATCH 047/126] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d27cee2b..5ec70d3c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,16 @@
-image: fpco/stack-build:lts-13.21
+default:
+  image: fpco/stack-build:lts-13.21
+  before_script: |
+    apt-get install -y --no-install-recommends g++
+
+variables:
+  STACK_ROOT: "${CI_PROJECT_DIR}/.stack"
+
+cache:
+  key: "%CI_COMMIT_REF_SLUG"
+  paths:
+    - .stack
+    - .stack-work
 
 build:
   stage: build
@@ -6,8 +18,4 @@ build:
     - stack build --copy-bins --local-bin-path $(pwd) --flag uniworx:-library-only --flag uniworx:-dev --flag uniworx:pedantic
   artifacts:
     paths:
-      - uniworx
-  cache:
-    key: "%CI_COMMIT_REF_SLUG"
-    paths:
-      - .stack-work
\ No newline at end of file
+      - uniworx
\ No newline at end of file

From 26ccef6a90a7eb15a0f757c009b899ec3cccf769 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 7 Nov 2019 16:05:26 +0100
Subject: [PATCH 048/126] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5ec70d3c4..93738248a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 default:
   image: fpco/stack-build:lts-13.21
-  before_script: |
-    apt-get install -y --no-install-recommends g++
+  before_script:
+    - apt-get install -y --no-install-recommends g++
 
 variables:
   STACK_ROOT: "${CI_PROJECT_DIR}/.stack"

From 529db3a6c7efc333bb06c62ad6a358717129ae70 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 7 Nov 2019 16:08:40 +0100
Subject: [PATCH 049/126] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 93738248a..f28e757c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ variables:
   STACK_ROOT: "${CI_PROJECT_DIR}/.stack"
 
 cache:
-  key: "%CI_COMMIT_REF_SLUG"
+  key: "${CI_COMMIT_REF_SLUG}"
   paths:
     - .stack
     - .stack-work

From 93351f4019036e95791488030d124ae0754498e7 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 7 Nov 2019 16:43:39 +0100
Subject: [PATCH 050/126] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f28e757c6..b89322aa4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 default:
   image: fpco/stack-build:lts-13.21
   before_script:
-    - apt-get install -y --no-install-recommends g++
+    - apt-get install -y --no-install-recommends gcc
 
 variables:
   STACK_ROOT: "${CI_PROJECT_DIR}/.stack"

From ef34d0894fbd6074fffbcf8b3bcb7fd65d877da1 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 7 Nov 2019 16:45:27 +0100
Subject: [PATCH 051/126] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b89322aa4..805df1b82 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,7 @@ default:
   image: fpco/stack-build:lts-13.21
   before_script:
     - apt-get install -y --no-install-recommends gcc
+    - echo $PATH | xargs -d ':' -- ls
 
 variables:
   STACK_ROOT: "${CI_PROJECT_DIR}/.stack"

From 496e1e5a32ccfe45861d05ceb2785a7a7dc86f7b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 7 Nov 2019 16:47:37 +0100
Subject: [PATCH 052/126] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 805df1b82..9136c0eb0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,8 @@
 default:
   image: fpco/stack-build:lts-13.21
   before_script:
-    - apt-get install -y --no-install-recommends gcc
-    - echo $PATH | xargs -d ':' -- ls
+    - apt-get install -y --no-install-recommends build-essential
+    - ln -s $(which g++-7) $(dirname $(which g++-7))/g++
 
 variables:
   STACK_ROOT: "${CI_PROJECT_DIR}/.stack"

From 1082cea8bd7a3783f622b59d47a27d324839886d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 8 Nov 2019 09:27:36 +0100
Subject: [PATCH 053/126] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 59 +++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 44 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9136c0eb0..21c42ee02 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,22 +1,51 @@
 default:
   image: fpco/stack-build:lts-13.21
-  before_script:
-    - apt-get install -y --no-install-recommends build-essential
-    - ln -s $(which g++-7) $(dirname $(which g++-7))/g++
 
+  cache:
+    key: "${CI_COMMIT_REF_SLUG}"
+    paths:
+      - .stack
+      - .stack-work
+      
 variables:
   STACK_ROOT: "${CI_PROJECT_DIR}/.stack"
 
-cache:
-  key: "${CI_COMMIT_REF_SLUG}"
-  paths:
-    - .stack
-    - .stack-work
-
-build:
-  stage: build
+stages:
+  - setup
+  - frontend:build
+  - yesod:build
+  - test
+  
+container setup:
+  stage: .pre
   script:
-    - stack build --copy-bins --local-bin-path $(pwd) --flag uniworx:-library-only --flag uniworx:-dev --flag uniworx:pedantic
-  artifacts:
-    paths:
-      - uniworx
\ No newline at end of file
+    - apt-get install -y --no-install-recommends build-essential nodejs chromium
+    - ln -s $(which g++-7) $(dirname $(which g++-7))/g++
+  
+npm install:
+  stage: setup
+  script:
+    - npm install
+  needs:
+    - container setup
+  
+frontend:build:
+  stage: frontend:build
+  script:
+    - npm run frontend:build
+  needs:
+    - npm install
+
+yesod:build:dev:
+  stage: yesod:build
+  script:
+    - stack build --copy-bins --local-bin-path $(pwd)/bin --fast --flag uniworx:-library-only --flag uniworx:dev --flag uniworx:pedantic
+  needs:
+    - frontend:build
+    
+frontend:test:
+  stage: test
+  script:
+    - npm run frontend:test
+  needs:
+    - frontend:build
\ No newline at end of file

From fd61600830fd222d6dc483744cc654a846535f83 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 8 Nov 2019 09:39:49 +0100
Subject: [PATCH 054/126] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 21c42ee02..a5380a748 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,7 @@ default:
       
 variables:
   STACK_ROOT: "${CI_PROJECT_DIR}/.stack"
+  CHROME_BIN: "/usr/bin/chromium"
 
 stages:
   - setup
@@ -19,7 +20,7 @@ stages:
 container setup:
   stage: .pre
   script:
-    - apt-get install -y --no-install-recommends build-essential nodejs chromium
+    - apt-get install -y --no-install-recommends build-essential nodejs chromium-browser
     - ln -s $(which g++-7) $(dirname $(which g++-7))/g++
   
 npm install:

From 4dfc3795b5746f721dae9d4f6d451a0d71449099 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 8 Nov 2019 09:41:18 +0100
Subject: [PATCH 055/126] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5380a748..49669cb9b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ default:
       
 variables:
   STACK_ROOT: "${CI_PROJECT_DIR}/.stack"
-  CHROME_BIN: "/usr/bin/chromium"
+  CHROME_BIN: "/usr/bin/chromium-browser"
 
 stages:
   - setup
@@ -20,6 +20,7 @@ stages:
 container setup:
   stage: .pre
   script:
+    - apt-get update
     - apt-get install -y --no-install-recommends build-essential nodejs chromium-browser
     - ln -s $(which g++-7) $(dirname $(which g++-7))/g++
   

From 2979e40f21ff016c780ed3677b1d85e0a5eeb814 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 8 Nov 2019 09:45:38 +0100
Subject: [PATCH 056/126] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49669cb9b..4dd8cae61 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,8 @@ default:
     paths:
       - .stack
       - .stack-work
+      - node_modules
+      - static/bundles
       
 variables:
   STACK_ROOT: "${CI_PROJECT_DIR}/.stack"
@@ -23,6 +25,8 @@ container setup:
     - apt-get update
     - apt-get install -y --no-install-recommends build-essential nodejs chromium-browser
     - ln -s $(which g++-7) $(dirname $(which g++-7))/g++
+    - npm install -g n
+    - n stable
   
 npm install:
   stage: setup

From 43340bcaf67fa27ea62f212450a816bfeaae9ea2 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 8 Nov 2019 09:59:07 +0100
Subject: [PATCH 057/126] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 62 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 42 insertions(+), 20 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4dd8cae61..89b201866 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,5 @@
 default:
   image: fpco/stack-build:lts-13.21
-
-  cache:
-    key: "${CI_COMMIT_REF_SLUG}"
-    paths:
-      - .stack
-      - .stack-work
-      - node_modules
-      - static/bundles
       
 variables:
   STACK_ROOT: "${CI_PROJECT_DIR}/.stack"
@@ -19,28 +11,39 @@ stages:
   - yesod:build
   - test
   
-container setup:
-  stage: .pre
-  script:
-    - apt-get update
-    - apt-get install -y --no-install-recommends build-essential nodejs chromium-browser
-    - ln -s $(which g++-7) $(dirname $(which g++-7))/g++
-    - npm install -g n
-    - n stable
-  
 npm install:
   stage: setup
   script:
     - npm install
-  needs:
-    - container setup
+  before_script: &npm
+    - apt-get update
+    - npm install -g n
+    - n stable
+  cache:
+    key: "${CI_COMMIT_REF_SLUG}"
+    paths:
+      - node_modules
+  artifacts:
+    paths:
+      - node_modules/
+    name: "${CI_JOB_NAME}"
+    expire_in: "1 day"
   
 frontend:build:
   stage: frontend:build
   script:
     - npm run frontend:build
+  before_script:
+    - *npm
   needs:
     - npm install
+  artifacts:
+    paths:
+      - static/bundles/
+    name: "${CI_JOB_NAME}"
+    expire_in: "1 day"
+  dependencies:
+    - npm install
 
 yesod:build:dev:
   stage: yesod:build
@@ -48,10 +51,29 @@ yesod:build:dev:
     - stack build --copy-bins --local-bin-path $(pwd)/bin --fast --flag uniworx:-library-only --flag uniworx:dev --flag uniworx:pedantic
   needs:
     - frontend:build
+  before_script:
+    - ln -s $(which g++-7) $(dirname $(which g++-7))/g++
+  cache:
+    key: "${CI_COMMIT_REF_SLUG}"
+    paths:
+      - .stack
+      - .stack_work
+  artifacts:
+    paths:
+      - bin/uniworx
+    name: "${CI_JOB_NAME}"
+    expire_in: "1 week"
+  dependencies:
+    - frontend:build
     
 frontend:test:
   stage: test
   script:
     - npm run frontend:test
   needs:
-    - frontend:build
\ No newline at end of file
+    - frontend:build
+  before_script:
+    - *npm
+    - apt-get install -y --no-install-recommends chromium-browser
+  dependencies:
+    - npm install
\ No newline at end of file

From 17c9db5427dba9298f1ce331d3bc9042420c09c5 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 8 Nov 2019 09:59:44 +0100
Subject: [PATCH 058/126] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 89b201866..cb03b1b2d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,8 +33,7 @@ frontend:build:
   stage: frontend:build
   script:
     - npm run frontend:build
-  before_script:
-    - *npm
+  before_script: *npm
   needs:
     - npm install
   artifacts:

From 7f8e8c789e67240ef14ce90a73824b1f92502ac9 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 8 Nov 2019 10:00:45 +0100
Subject: [PATCH 059/126] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cb03b1b2d..f25399c48 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,7 +70,7 @@ frontend:test:
   script:
     - npm run frontend:test
   needs:
-    - frontend:build
+    - npm install
   before_script:
     - *npm
     - apt-get install -y --no-install-recommends chromium-browser

From 182f44dc0d8e7ddf29c27682b31429b725dbe8c7 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 8 Nov 2019 10:02:11 +0100
Subject: [PATCH 060/126] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f25399c48..a717fbb32 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,7 +72,9 @@ frontend:test:
   needs:
     - npm install
   before_script:
-    - *npm
+    - apt-get update
+    - npm install -g n
+    - n stable
     - apt-get install -y --no-install-recommends chromium-browser
   dependencies:
     - npm install
\ No newline at end of file

From 56842134d3d68c22ee875cca18cd05f31087f83e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 8 Nov 2019 11:48:45 +0100
Subject: [PATCH 061/126] fix: build

---
 test/Database.hs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/Database.hs b/test/Database.hs
index dfe4769a0..0de2da726 100755
--- a/test/Database.hs
+++ b/test/Database.hs
@@ -481,11 +481,11 @@ fillDb = do
   void . insert $ DegreeCourse ffp sdMst sdInf
   void . insert $ Lecturer jost   ffp CourseLecturer
   void . insert $ Lecturer gkleen ffp CourseAssistant
-  adhoc <- insert $ Sheet ffp "AdHoc-Gruppen" Nothing NotGraded (Arbitrary 3) Nothing Nothing now now Nothing Nothing (SubmissionMode False . Just $ UploadAny True Nothing) False
+  adhoc <- insert $ Sheet ffp "AdHoc-Gruppen" Nothing NotGraded (Arbitrary 3) Nothing Nothing (Just now) (Just now) Nothing Nothing (SubmissionMode False . Just $ UploadAny True Nothing) False
   insert_ $ SheetEdit gkleen now adhoc
-  feste <- insert $ Sheet ffp "Feste Gruppen" Nothing NotGraded RegisteredGroups Nothing Nothing now now Nothing Nothing (SubmissionMode False . Just $ UploadAny True Nothing) False
+  feste <- insert $ Sheet ffp "Feste Gruppen" Nothing NotGraded RegisteredGroups Nothing Nothing (Just now) (Just now) Nothing Nothing (SubmissionMode False . Just $ UploadAny True Nothing) False
   insert_ $ SheetEdit gkleen now feste
-  keine <- insert $ Sheet ffp "Keine Gruppen" Nothing NotGraded NoGroups Nothing Nothing now now Nothing Nothing (SubmissionMode False . Just $ UploadAny True Nothing) False
+  keine <- insert $ Sheet ffp "Keine Gruppen" Nothing NotGraded NoGroups Nothing Nothing (Just now) (Just now) Nothing Nothing (SubmissionMode False . Just $ UploadAny True Nothing) False
   insert_ $ SheetEdit gkleen now keine
   void . insertMany $ map (\(u,sf) -> CourseParticipant ffp u now sf Nothing)
     [(fhamann   , Nothing)
@@ -623,8 +623,8 @@ fillDb = do
     , sheetGrouping = Arbitrary 3
     , sheetMarkingText = Nothing
     , sheetVisibleFrom = Just now
-    , sheetActiveFrom = now
-    , sheetActiveTo = (14 * nominalDay) `addUTCTime` now
+    , sheetActiveFrom = Just now
+    , sheetActiveTo = Just $ (14 * nominalDay) `addUTCTime` now
     , sheetSubmissionMode = SubmissionMode True Nothing
     , sheetHintFrom = Nothing
     , sheetSolutionFrom = Nothing
@@ -667,8 +667,8 @@ fillDb = do
     , sheetGrouping = Arbitrary 3
     , sheetMarkingText = Nothing
     , sheetVisibleFrom = Just now
-    , sheetActiveFrom = now
-    , sheetActiveTo = (14 * nominalDay) `addUTCTime` now
+    , sheetActiveFrom = Just now
+    , sheetActiveTo = Just $ (14 * nominalDay) `addUTCTime` now
     , sheetSubmissionMode = SubmissionMode False $ Just UploadSpecific
       { specificFiles = impureNonNull $ Set.fromList
         [ UploadSpecificFile "Aufgabe 1" "exercise_2.1.hs" False
@@ -689,8 +689,8 @@ fillDb = do
     , sheetGrouping = Arbitrary 3
     , sheetMarkingText = Nothing
     , sheetVisibleFrom = Just now
-    , sheetActiveFrom = now
-    , sheetActiveTo = (14 * nominalDay) `addUTCTime` now
+    , sheetActiveFrom = Just now
+    , sheetActiveTo = Just $ (14 * nominalDay) `addUTCTime` now
     , sheetSubmissionMode = SubmissionMode False . Just $ UploadAny True defaultExtensionRestriction
     , sheetHintFrom = Nothing
     , sheetSolutionFrom = Nothing
@@ -705,8 +705,8 @@ fillDb = do
     , sheetGrouping = Arbitrary 3
     , sheetMarkingText = Nothing
     , sheetVisibleFrom = Just now
-    , sheetActiveFrom = now
-    , sheetActiveTo = (14 * nominalDay) `addUTCTime` now
+    , sheetActiveFrom = Just now
+    , sheetActiveTo = Just $ (14 * nominalDay) `addUTCTime` now
     , sheetSubmissionMode = SubmissionMode False . Just $ UploadAny False Nothing
     , sheetHintFrom = Nothing
     , sheetSolutionFrom = Nothing

From 43aff72314ec16ce58a6776127e0174590e71a7d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 8 Nov 2019 12:56:31 +0100
Subject: [PATCH 062/126] chore: fix cache & locales for yesod:build

---
 .gitlab-ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a717fbb32..7a78487ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,12 +51,14 @@ yesod:build:dev:
   needs:
     - frontend:build
   before_script:
+    - apt-get update
+    - apt-get install -y --no-install-recommends locales-all
     - ln -s $(which g++-7) $(dirname $(which g++-7))/g++
   cache:
     key: "${CI_COMMIT_REF_SLUG}"
     paths:
       - .stack
-      - .stack_work
+      - .stack-work
   artifacts:
     paths:
       - bin/uniworx
@@ -77,4 +79,4 @@ frontend:test:
     - n stable
     - apt-get install -y --no-install-recommends chromium-browser
   dependencies:
-    - npm install
\ No newline at end of file
+    - npm install

From ca8edfd731ff7e40ffbf35bfbe44521ace92e23e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 8 Nov 2019 13:51:04 +0100
Subject: [PATCH 063/126] chore: set up backend tests

---
 .gitlab-ci.yml | 93 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 92 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7a78487ef..025c8aa33 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,22 @@
 default:
   image: fpco/stack-build:lts-13.21
       
+services:
+  - postgres:latest
+
 variables:
   STACK_ROOT: "${CI_PROJECT_DIR}/.stack"
   CHROME_BIN: "/usr/bin/chromium-browser"
+  POSTGRES_DB: uniworx_test
+  POSTGRES_USER: uniworx
+  POSTGRES_PASSWORD: uniworx
+  PGHOST: postgres
 
 stages:
   - setup
   - frontend:build
   - yesod:build
+  - lint
   - test
   
 npm install:
@@ -44,6 +52,16 @@ frontend:build:
   dependencies:
     - npm install
 
+frontend:lint:
+  stage: lint
+  script:
+    - npm run frontend:lint
+  before_script: *npm
+  needs:
+    - npm install
+  dependencies:
+    - npm install
+
 yesod:build:dev:
   stage: yesod:build
   script:
@@ -61,12 +79,40 @@ yesod:build:dev:
       - .stack-work
   artifacts:
     paths:
-      - bin/uniworx
+      - bin/
     name: "${CI_JOB_NAME}"
     expire_in: "1 week"
   dependencies:
     - frontend:build
+
+  only:
+    - '${CI_COMMIT_REF_SLUG} !~ /^v[0-9].*/'
     
+yesod:build:
+  stage: yesod:build
+  script:
+    - stack build --copy-bins --local-bin-path $(pwd)/bin --flag uniworx:-library-only --flag uniworx:-dev --flag uniworx:pedantic
+  needs:
+    - frontend:build
+  before_script:
+    - apt-get update
+    - apt-get install -y --no-install-recommends locales-all
+    - ln -s $(which g++-7) $(dirname $(which g++-7))/g++
+  cache:
+    key: "${CI_COMMIT_REF_SLUG}"
+    paths:
+      - .stack
+      - .stack-work
+  artifacts:
+    paths:
+      - bin/
+    name: "${CI_JOB_NAME}"
+  dependencies:
+    - frontend:build
+    
+  only:
+    - '${CI_COMMIT_REF_SLUG} =~ /^v[0-9].*/'
+
 frontend:test:
   stage: test
   script:
@@ -80,3 +126,48 @@ frontend:test:
     - apt-get install -y --no-install-recommends chromium-browser
   dependencies:
     - npm install
+
+hlint:dev:
+  stage: lint
+  script:
+    - stack test --fast --flag uniworx:-library-only --flag uniworx:dev --flag uniworx:pedantic uniworx:test:hlint
+  needs:
+    - frontend:build
+    - yesod:build:dev # For caching
+  before_script:
+    - apt-get update
+    - apt-get install -y --no-install-recommends locales-all
+    - ln -s $(which g++-7) $(dirname $(which g++-7))/g++
+  dependencies:
+    - frontend:build
+  cache:
+    key: "${CI_COMMIT_REF_SLUG}"
+    paths:
+      - .stack
+      - .stack-work
+
+  only:
+    - '${CI_COMMIT_REF_SLUG} !~ /^v[0-9].*/'
+
+yesod:test:dev:
+  stage: test
+  script:
+    - stack test --coverage --fast --flag uniworx:-library-only --flag uniworx:-dev --flag uniworx:pedantic --skip hlint
+  needs:
+    - frontend:build
+    - yesod:build:dev # For caching
+  before_script:
+    - apt-get update
+    - apt-get install -y --no-install-recommends locales-all
+    - ln -s $(which g++-7) $(dirname $(which g++-7))/g++
+  dependencies:
+    - frontend:build
+  cache:
+    key: "${CI_COMMIT_REF_SLUG}"
+    paths:
+      - .stack
+      - .stack-work
+      
+  only:
+    - '${CI_COMMIT_REF_SLUG} !~ /^v[0-9].*/'
+

From 3035b66d236ca728f4e9f2b32e9c019aa80e8995 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 8 Nov 2019 13:54:43 +0100
Subject: [PATCH 064/126] chore: adjust pipeline for v-tags

---
 .gitlab-ci.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 025c8aa33..05de2b33b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -86,7 +86,8 @@ yesod:build:dev:
     - frontend:build
 
   only:
-    - '${CI_COMMIT_REF_SLUG} !~ /^v[0-9].*/'
+    variables:
+      - '${CI_COMMIT_REF_NAME} !~ /^v[0-9].*/'
     
 yesod:build:
   stage: yesod:build
@@ -111,7 +112,8 @@ yesod:build:
     - frontend:build
     
   only:
-    - '${CI_COMMIT_REF_SLUG} =~ /^v[0-9].*/'
+    variables:
+      - '${CI_COMMIT_REF_NAME} =~ /^v[0-9].*/'
 
 frontend:test:
   stage: test
@@ -147,7 +149,8 @@ hlint:dev:
       - .stack-work
 
   only:
-    - '${CI_COMMIT_REF_SLUG} !~ /^v[0-9].*/'
+    variables:
+      - '${CI_COMMIT_REF_NAME} !~ /^v[0-9].*/'
 
 yesod:test:dev:
   stage: test
@@ -169,5 +172,6 @@ yesod:test:dev:
       - .stack-work
       
   only:
-    - '${CI_COMMIT_REF_SLUG} !~ /^v[0-9].*/'
+    variables:
+      - '${CI_COMMIT_REF_NAME} !~ /^v[0-9].*/'
 

From 664fea0d1c3bd642fb2147d112437233e65ca09a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 8 Nov 2019 13:56:11 +0100
Subject: [PATCH 065/126] chore: fix gitlab-ci syntax

---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 05de2b33b..54d4a56db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -87,7 +87,7 @@ yesod:build:dev:
 
   only:
     variables:
-      - '${CI_COMMIT_REF_NAME} !~ /^v[0-9].*/'
+      - $CI_COMMIT_REF_NAME !~ /^v[0-9].*/
     
 yesod:build:
   stage: yesod:build
@@ -113,7 +113,7 @@ yesod:build:
     
   only:
     variables:
-      - '${CI_COMMIT_REF_NAME} =~ /^v[0-9].*/'
+      - $CI_COMMIT_REF_NAME =~ /^v[0-9].*/
 
 frontend:test:
   stage: test
@@ -150,7 +150,7 @@ hlint:dev:
 
   only:
     variables:
-      - '${CI_COMMIT_REF_NAME} !~ /^v[0-9].*/'
+      - $CI_COMMIT_REF_NAME !~ /^v[0-9].*/
 
 yesod:test:dev:
   stage: test
@@ -173,5 +173,5 @@ yesod:test:dev:
       
   only:
     variables:
-      - '${CI_COMMIT_REF_NAME} !~ /^v[0-9].*/'
+      - $CI_COMMIT_REF_NAME !~ /^v[0-9].*/
 

From 2e3be37e5d45153112cf9955bd9524cad0f16a4f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 8 Nov 2019 14:23:10 +0100
Subject: [PATCH 066/126] chore(ci): move build cache to global & deploy

---
 .gitlab-ci.yml | 104 +++++++++++++++++++++++++++++++++++--------------
 1 file changed, 74 insertions(+), 30 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 54d4a56db..7c2da98a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,11 @@
 default:
   image: fpco/stack-build:lts-13.21
+  cache:
+    key: "${CI_COMMIT_REF_SLUG}"
+    paths:
+      - node_modules
+      - .stack
+      - .stack-work
       
 services:
   - postgres:latest
@@ -18,19 +24,16 @@ stages:
   - yesod:build
   - lint
   - test
+  - deploy
   
 npm install:
   stage: setup
   script:
     - npm install
   before_script: &npm
-    - apt-get update
+    - apt-get update -y
     - npm install -g n
     - n stable
-  cache:
-    key: "${CI_COMMIT_REF_SLUG}"
-    paths:
-      - node_modules
   artifacts:
     paths:
       - node_modules/
@@ -69,14 +72,9 @@ yesod:build:dev:
   needs:
     - frontend:build
   before_script:
-    - apt-get update
+    - apt-get update -y
     - apt-get install -y --no-install-recommends locales-all
     - ln -s $(which g++-7) $(dirname $(which g++-7))/g++
-  cache:
-    key: "${CI_COMMIT_REF_SLUG}"
-    paths:
-      - .stack
-      - .stack-work
   artifacts:
     paths:
       - bin/
@@ -96,14 +94,9 @@ yesod:build:
   needs:
     - frontend:build
   before_script:
-    - apt-get update
+    - apt-get update -y
     - apt-get install -y --no-install-recommends locales-all
     - ln -s $(which g++-7) $(dirname $(which g++-7))/g++
-  cache:
-    key: "${CI_COMMIT_REF_SLUG}"
-    paths:
-      - .stack
-      - .stack-work
   artifacts:
     paths:
       - bin/
@@ -122,7 +115,7 @@ frontend:test:
   needs:
     - npm install
   before_script:
-    - apt-get update
+    - apt-get update -y
     - npm install -g n
     - n stable
     - apt-get install -y --no-install-recommends chromium-browser
@@ -137,16 +130,11 @@ hlint:dev:
     - frontend:build
     - yesod:build:dev # For caching
   before_script:
-    - apt-get update
+    - apt-get update -y
     - apt-get install -y --no-install-recommends locales-all
     - ln -s $(which g++-7) $(dirname $(which g++-7))/g++
   dependencies:
     - frontend:build
-  cache:
-    key: "${CI_COMMIT_REF_SLUG}"
-    paths:
-      - .stack
-      - .stack-work
 
   only:
     variables:
@@ -160,18 +148,74 @@ yesod:test:dev:
     - frontend:build
     - yesod:build:dev # For caching
   before_script:
-    - apt-get update
+    - apt-get update -y
     - apt-get install -y --no-install-recommends locales-all
     - ln -s $(which g++-7) $(dirname $(which g++-7))/g++
   dependencies:
     - frontend:build
-  cache:
-    key: "${CI_COMMIT_REF_SLUG}"
-    paths:
-      - .stack
-      - .stack-work
       
   only:
     variables:
       - $CI_COMMIT_REF_NAME !~ /^v[0-9].*/
 
+hlint:
+  stage: lint
+  script:
+    - stack test --flag uniworx:-library-only --flag uniworx:-dev --flag uniworx:pedantic uniworx:test:hlint
+  needs:
+    - frontend:build
+    - yesod:build # For caching
+  before_script:
+    - apt-get update -y
+    - apt-get install -y --no-install-recommends locales-all
+    - ln -s $(which g++-7) $(dirname $(which g++-7))/g++
+  dependencies:
+    - frontend:build
+
+  only:
+    variables:
+      - $CI_COMMIT_REF_NAME =~ /^v[0-9].*/
+
+yesod:test:
+  stage: test
+  script:
+    - stack test --coverage --flag uniworx:-library-only --flag uniworx:-dev --flag uniworx:pedantic uniworx:test:hlint --skip hlint
+  needs:
+    - frontend:build
+    - yesod:build # For caching
+  before_script:
+    - apt-get update -y
+    - apt-get install -y --no-install-recommends locales-all
+    - ln -s $(which g++-7) $(dirname $(which g++-7))/g++
+  dependencies:
+    - frontend:build
+      
+  only:
+    variables:
+      - $CI_COMMIT_REF_NAME =~ /^v[0-9].*/
+
+deploy:uniworx4:
+  stage: deploy
+  script:
+    - ssh root@uniworx4.ifi.lmu.de <bin/uniworx
+  needs:
+    - yesod:build
+    - yesod:test # For sanity
+    - hlint # For sanity
+  before_script:
+    - apt-get update -y
+    - apt-get install -y --no-install-recommends openssh-client
+    - eval $(ssh-agent -s)
+    - ssh-add ${SSH_PRIVATE_KEY_UNIWORX4}
+    - mkdir -p ~/.ssh
+    - chmod 700 ~/.ssh
+    - cp ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts
+    - chmod 644 ~/.ssh/known_hosts
+  dependencies:
+    - yesod:build
+        
+  only:
+    variables:
+      - $CI_COMMIT_REF_NAME =~ /^v[0-9].*/
+
+  when: manual

From ec0852428271140219a4775214863e43593db423 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 8 Nov 2019 14:46:49 +0100
Subject: [PATCH 067/126] chore: remove node_modules from ci cache

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c2da98a9..4857c260c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,6 @@ default:
   cache:
     key: "${CI_COMMIT_REF_SLUG}"
     paths:
-      - node_modules
       - .stack
       - .stack-work
       

From 9b10b3690db8da398493b2a7bc8a07318fce80a7 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 8 Nov 2019 15:23:00 +0100
Subject: [PATCH 068/126] chore(release): 7.21.0

---
 CHANGELOG.md      | 19 +++++++++++++++++++
 package-lock.json |  2 +-
 package.json      |  2 +-
 package.yaml      |  2 +-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2a4cd497..783402c3a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,25 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [7.21.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.20.0...v7.21.0) (2019-11-08)
+
+
+### Bug Fixes
+
+* build ([5684213](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/5684213))
+* **sheets:** integrate corrector interface into SheetEdit ([acfd312](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/acfd312))
+* improve explanation of multiUserField invitations ([954bb78](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/954bb78))
+* **rating files:** better descriptions & tests ([5f04593](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/5f04593))
+* **submission:** ignore extension case within zips ([f8442cf](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/f8442cf))
+
+
+### Features
+
+* better explain behaviour of submittorForm ([b973495](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/b973495))
+* pruning of unreferenced files ([ff161b2](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/ff161b2))
+
+
+
 ## [7.20.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.19.1...v7.20.0) (2019-10-31)
 
 
diff --git a/package-lock.json b/package-lock.json
index 891719073..17d56ce91 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.20.0",
+  "version": "7.21.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6c6c022a4..b32d17a38 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.20.0",
+  "version": "7.21.0",
   "description": "",
   "keywords": [],
   "author": "",
diff --git a/package.yaml b/package.yaml
index 54873decd..af5244f8f 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name:    uniworx
-version: 7.20.0
+version: 7.21.0
 
 dependencies:
   - base >=4.9.1.0 && <5

From 1d161eef02f3ac370bcf96e55f6d48c079c85782 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 8 Nov 2019 15:51:52 +0100
Subject: [PATCH 069/126] Revert "chore: remove node_modules from ci cache"

This reverts commit ec0852428271140219a4775214863e43593db423.
---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4857c260c..7c2da98a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@ default:
   cache:
     key: "${CI_COMMIT_REF_SLUG}"
     paths:
+      - node_modules
       - .stack
       - .stack-work
       

From 2082979ace7da7999571c34dafcb845dc807ceba Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 11 Nov 2019 08:32:03 +0100
Subject: [PATCH 070/126] chore(gitlab ci): fix tests & ssh permissions

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c2da98a9..0ac55fda3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -143,7 +143,7 @@ hlint:dev:
 yesod:test:dev:
   stage: test
   script:
-    - stack test --coverage --fast --flag uniworx:-library-only --flag uniworx:-dev --flag uniworx:pedantic --skip hlint
+    - stack test --coverage --fast --flag uniworx:-library-only --flag uniworx:dev --flag uniworx:pedantic --skip hlint
   needs:
     - frontend:build
     - yesod:build:dev # For caching
@@ -179,7 +179,7 @@ hlint:
 yesod:test:
   stage: test
   script:
-    - stack test --coverage --flag uniworx:-library-only --flag uniworx:-dev --flag uniworx:pedantic uniworx:test:hlint --skip hlint
+    - stack test --coverage --flag uniworx:-library-only --flag uniworx:-dev --flag uniworx:pedantic --skip hlint
   needs:
     - frontend:build
     - yesod:build # For caching
@@ -206,7 +206,7 @@ deploy:uniworx4:
     - apt-get update -y
     - apt-get install -y --no-install-recommends openssh-client
     - eval $(ssh-agent -s)
-    - ssh-add ${SSH_PRIVATE_KEY_UNIWORX4}
+    - "ssh-add - <${SSH_PRIVATE_KEY_UNIWORX4}"
     - mkdir -p ~/.ssh
     - chmod 700 ~/.ssh
     - cp ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts

From f75ee28f3b9286851dfb7db68f9041028a02154e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 11 Nov 2019 11:09:59 +0100
Subject: [PATCH 071/126] chore(gitlab-ci): link postgres service to job

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ac55fda3..bc01c47f6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,9 +7,6 @@ default:
       - .stack
       - .stack-work
       
-services:
-  - postgres:latest
-
 variables:
   STACK_ROOT: "${CI_PROJECT_DIR}/.stack"
   CHROME_BIN: "/usr/bin/chromium-browser"
@@ -177,6 +174,9 @@ hlint:
       - $CI_COMMIT_REF_NAME =~ /^v[0-9].*/
 
 yesod:test:
+  services:
+    - postgres:10.10
+
   stage: test
   script:
     - stack test --coverage --flag uniworx:-library-only --flag uniworx:-dev --flag uniworx:pedantic --skip hlint

From 79f9890a4a6397172f4c23add9ae8376fa2b1e4b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 11 Nov 2019 12:05:02 +0100
Subject: [PATCH 072/126] chore(gitlab-ci): also link postgres to test:dev

---
 .gitlab-ci.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bc01c47f6..cbed5940c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,6 @@
 default:
-  image: fpco/stack-build:lts-13.21
+  image:
+    name: fpco/stack-build:lts-13.21
   cache:
     key: "${CI_COMMIT_REF_SLUG}"
     paths:
@@ -138,6 +139,10 @@ hlint:dev:
       - $CI_COMMIT_REF_NAME !~ /^v[0-9].*/
 
 yesod:test:dev:
+  services:
+    - name: postgres:10.10
+      alias: postgres
+
   stage: test
   script:
     - stack test --coverage --fast --flag uniworx:-library-only --flag uniworx:dev --flag uniworx:pedantic --skip hlint
@@ -175,7 +180,8 @@ hlint:
 
 yesod:test:
   services:
-    - postgres:10.10
+    - name: postgres:10.10
+      alias: postgres
 
   stage: test
   script:

From a2c6c48af6bc776b20c6449c365f6e32af2fe031 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 11 Nov 2019 15:22:39 +0100
Subject: [PATCH 073/126] chore(gitlab ci): don't expose PGHOST to postgres
 container

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cbed5940c..7a5fff21e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,6 @@ variables:
   POSTGRES_DB: uniworx_test
   POSTGRES_USER: uniworx
   POSTGRES_PASSWORD: uniworx
-  PGHOST: postgres
 
 stages:
   - setup
@@ -185,6 +184,7 @@ yesod:test:
 
   stage: test
   script:
+    - export PGHOST=postgres
     - stack test --coverage --flag uniworx:-library-only --flag uniworx:-dev --flag uniworx:pedantic --skip hlint
   needs:
     - frontend:build

From 9bdee61f1d228c413796493c554624251a32a012 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 11 Nov 2019 16:18:05 +0100
Subject: [PATCH 074/126] chore(gitlab ci): postgres i18n & npm update

---
 .gitlab-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7a5fff21e..910dfdda2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,6 +14,8 @@ variables:
   POSTGRES_DB: uniworx_test
   POSTGRES_USER: uniworx
   POSTGRES_PASSWORD: uniworx
+  POSTGRES_INITDB_ARGS: "--locale=de-DE --encoding=UTF-8"
+  TZ: Europe/Berlin
 
 stages:
   - setup
@@ -31,6 +33,7 @@ npm install:
     - apt-get update -y
     - npm install -g n
     - n stable
+    - npm install -g npm
   artifacts:
     paths:
       - node_modules/

From f989796a7156c6107491467ee5ebc1d04c31dd5a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 11 Nov 2019 16:23:03 +0100
Subject: [PATCH 075/126] chore(release): 7.21.1

---
 CHANGELOG.md      | 4 ++++
 package-lock.json | 2 +-
 package.json      | 2 +-
 package.yaml      | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 783402c3a..0961e04ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [7.21.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.21.0...v7.21.1) (2019-11-11)
+
+
+
 ## [7.21.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.20.0...v7.21.0) (2019-11-08)
 
 
diff --git a/package-lock.json b/package-lock.json
index 17d56ce91..45e5ba773 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.21.0",
+  "version": "7.21.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b32d17a38..d573837b6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.21.0",
+  "version": "7.21.1",
   "description": "",
   "keywords": [],
   "author": "",
diff --git a/package.yaml b/package.yaml
index af5244f8f..651741ec4 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name:    uniworx
-version: 7.21.0
+version: 7.21.1
 
 dependencies:
   - base >=4.9.1.0 && <5

From 9cd1ef4b77ca8c8bd9e0cb59d0b23b864fda6f1e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 11 Nov 2019 16:52:10 +0100
Subject: [PATCH 076/126] chore(gitlab-ci): try to rehash after installing npm

---
 .gitlab-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 910dfdda2..4f3b28f2a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,6 +34,7 @@ npm install:
     - npm install -g n
     - n stable
     - npm install -g npm
+    - hash -r
   artifacts:
     paths:
       - node_modules/
@@ -118,6 +119,8 @@ frontend:test:
     - apt-get update -y
     - npm install -g n
     - n stable
+    - npm install -g npm
+    - hash -r
     - apt-get install -y --no-install-recommends chromium-browser
   dependencies:
     - npm install

From 990f2f67723c2dd56df47d8a2a198148f4acc507 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 12 Nov 2019 11:00:54 +0100
Subject: [PATCH 077/126] chore(gitlab-ci): retry

---
 .gitlab-ci.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f3b28f2a..28f913e57 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,6 +40,7 @@ npm install:
       - node_modules/
     name: "${CI_JOB_NAME}"
     expire_in: "1 day"
+  retry: 2
   
 frontend:build:
   stage: frontend:build
@@ -55,6 +56,7 @@ frontend:build:
     expire_in: "1 day"
   dependencies:
     - npm install
+  retry: 2
 
 frontend:lint:
   stage: lint
@@ -65,6 +67,7 @@ frontend:lint:
     - npm install
   dependencies:
     - npm install
+  retry: 2
 
 yesod:build:dev:
   stage: yesod:build
@@ -87,6 +90,7 @@ yesod:build:dev:
   only:
     variables:
       - $CI_COMMIT_REF_NAME !~ /^v[0-9].*/
+  retry: 2
     
 yesod:build:
   stage: yesod:build
@@ -108,6 +112,7 @@ yesod:build:
   only:
     variables:
       - $CI_COMMIT_REF_NAME =~ /^v[0-9].*/
+  retry: 2
 
 frontend:test:
   stage: test
@@ -124,6 +129,7 @@ frontend:test:
     - apt-get install -y --no-install-recommends chromium-browser
   dependencies:
     - npm install
+  retry: 2
 
 hlint:dev:
   stage: lint
@@ -142,6 +148,7 @@ hlint:dev:
   only:
     variables:
       - $CI_COMMIT_REF_NAME !~ /^v[0-9].*/
+  retry: 2
 
 yesod:test:dev:
   services:
@@ -150,6 +157,7 @@ yesod:test:dev:
 
   stage: test
   script:
+    - export PGHOST=postgres
     - stack test --coverage --fast --flag uniworx:-library-only --flag uniworx:dev --flag uniworx:pedantic --skip hlint
   needs:
     - frontend:build
@@ -164,6 +172,7 @@ yesod:test:dev:
   only:
     variables:
       - $CI_COMMIT_REF_NAME !~ /^v[0-9].*/
+  retry: 2
 
 hlint:
   stage: lint
@@ -182,6 +191,7 @@ hlint:
   only:
     variables:
       - $CI_COMMIT_REF_NAME =~ /^v[0-9].*/
+  retry: 2
 
 yesod:test:
   services:
@@ -205,6 +215,7 @@ yesod:test:
   only:
     variables:
       - $CI_COMMIT_REF_NAME =~ /^v[0-9].*/
+  retry: 2
 
 deploy:uniworx4:
   stage: deploy
@@ -231,3 +242,4 @@ deploy:uniworx4:
       - $CI_COMMIT_REF_NAME =~ /^v[0-9].*/
 
   when: manual
+  retry: 2

From 2525cef62daea7290d282bf5e32bf5bd9e08e0bf Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 12 Nov 2019 11:02:31 +0100
Subject: [PATCH 078/126] chore(gitlab-ci): fix postgres ci

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28f913e57..9e668e0ba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ variables:
   POSTGRES_DB: uniworx_test
   POSTGRES_USER: uniworx
   POSTGRES_PASSWORD: uniworx
-  POSTGRES_INITDB_ARGS: "--locale=de-DE --encoding=UTF-8"
+  POSTGRES_INITDB_ARGS: "--locale=de_DE --encoding=UTF-8"
   TZ: Europe/Berlin
 
 stages:

From 2045ab026f9d4a893bcad7165d9cbc1513fc1e2c Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 12 Nov 2019 11:19:30 +0100
Subject: [PATCH 079/126] chore(gitlab-ci): postgres docker has no support for
 locales

---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e668e0ba..0dd8ee06e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,8 +14,6 @@ variables:
   POSTGRES_DB: uniworx_test
   POSTGRES_USER: uniworx
   POSTGRES_PASSWORD: uniworx
-  POSTGRES_INITDB_ARGS: "--locale=de_DE --encoding=UTF-8"
-  TZ: Europe/Berlin
 
 stages:
   - setup

From a146cdddf098d7d2bdfd8ed3ef4f031b01289550 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 12 Nov 2019 11:20:38 +0100
Subject: [PATCH 080/126] chore(release): 7.21.2

---
 CHANGELOG.md      | 4 ++++
 package-lock.json | 2 +-
 package.json      | 2 +-
 package.yaml      | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0961e04ee..cdb80e1f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [7.21.2](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.21.1...v7.21.2) (2019-11-12)
+
+
+
 ### [7.21.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.21.0...v7.21.1) (2019-11-11)
 
 
diff --git a/package-lock.json b/package-lock.json
index 45e5ba773..cc96409e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.21.1",
+  "version": "7.21.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d573837b6..9ffb22b43 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.21.1",
+  "version": "7.21.2",
   "description": "",
   "keywords": [],
   "author": "",
diff --git a/package.yaml b/package.yaml
index 651741ec4..b324dcc72 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name:    uniworx
-version: 7.21.1
+version: 7.21.2
 
 dependencies:
   - base >=4.9.1.0 && <5

From dceb026be1cecaedfd740e540088f783b48cb808 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 13 Nov 2019 10:13:33 +0100
Subject: [PATCH 081/126] chore(gitlab-ci): work around service related dns bug

https://gitlab.com/gitlab-org/gitlab-runner/issues/2229
---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0dd8ee06e..0aa6d6270 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -155,7 +155,6 @@ yesod:test:dev:
 
   stage: test
   script:
-    - export PGHOST=postgres
     - stack test --coverage --fast --flag uniworx:-library-only --flag uniworx:dev --flag uniworx:pedantic --skip hlint
   needs:
     - frontend:build
@@ -198,7 +197,6 @@ yesod:test:
 
   stage: test
   script:
-    - export PGHOST=postgres
     - stack test --coverage --flag uniworx:-library-only --flag uniworx:-dev --flag uniworx:pedantic --skip hlint
   needs:
     - frontend:build

From 2c364b7166116c8386839cb13ed60774449c3843 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 13 Nov 2019 10:14:43 +0100
Subject: [PATCH 082/126] chore(release): 7.21.3

---
 CHANGELOG.md      | 4 ++++
 package-lock.json | 2 +-
 package.json      | 2 +-
 package.yaml      | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cdb80e1f3..e432c473f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [7.21.3](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.21.2...v7.21.3) (2019-11-13)
+
+
+
 ### [7.21.2](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.21.1...v7.21.2) (2019-11-12)
 
 
diff --git a/package-lock.json b/package-lock.json
index cc96409e4..73da65624 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.21.2",
+  "version": "7.21.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9ffb22b43..255f806a1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.21.2",
+  "version": "7.21.3",
   "description": "",
   "keywords": [],
   "author": "",
diff --git a/package.yaml b/package.yaml
index b324dcc72..6e2a2833d 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name:    uniworx
-version: 7.21.2
+version: 7.21.3
 
 dependencies:
   - base >=4.9.1.0 && <5

From 382156c9d2177bb842aa0d71f9cb3ce49f829e32 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 13 Nov 2019 13:41:14 +0100
Subject: [PATCH 083/126] chore(gitlab-ci): experiment with deployment to
 uniworx4

---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0aa6d6270..c998f0c9e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -224,12 +224,12 @@ deploy:uniworx4:
   before_script:
     - apt-get update -y
     - apt-get install -y --no-install-recommends openssh-client
-    - eval $(ssh-agent -s)
-    - "ssh-add - <${SSH_PRIVATE_KEY_UNIWORX4}"
     - mkdir -p ~/.ssh
     - chmod 700 ~/.ssh
-    - cp ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts
-    - chmod 644 ~/.ssh/known_hosts
+    - install -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts
+    - install -m 0400 ${SSH_PRIVATE_KEY_UNIWORX4} ~/.ssh/id
+    - eval $(ssh-agent -s)
+    - ssh-add ~/.ssh/id
   dependencies:
     - yesod:build
         

From 22163c8fdbd89cb8bfda78cee53f3e24300146f2 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 13 Nov 2019 13:42:33 +0100
Subject: [PATCH 084/126] chore(release): 7.21.4

---
 CHANGELOG.md      | 4 ++++
 package-lock.json | 2 +-
 package.json      | 2 +-
 package.yaml      | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e432c473f..b3539d11e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [7.21.4](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.21.3...v7.21.4) (2019-11-13)
+
+
+
 ### [7.21.3](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.21.2...v7.21.3) (2019-11-13)
 
 
diff --git a/package-lock.json b/package-lock.json
index 73da65624..aa31e0341 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.21.3",
+  "version": "7.21.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 255f806a1..96ed901ca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.21.3",
+  "version": "7.21.4",
   "description": "",
   "keywords": [],
   "author": "",
diff --git a/package.yaml b/package.yaml
index 6e2a2833d..b00a30902 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name:    uniworx
-version: 7.21.3
+version: 7.21.4
 
 dependencies:
   - base >=4.9.1.0 && <5

From f8c462fd03abf4085bbd225e6df10ff40249aa21 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 13 Nov 2019 17:02:52 +0100
Subject: [PATCH 085/126] chore(gitlab-ci): manually handle ssh key

---
 .gitlab-ci.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c998f0c9e..d4bad27ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -216,7 +216,7 @@ yesod:test:
 deploy:uniworx4:
   stage: deploy
   script:
-    - ssh root@uniworx4.ifi.lmu.de <bin/uniworx
+    - ssh -i .ssh/id root@uniworx4.ifi.lmu.de <bin/uniworx
   needs:
     - yesod:build
     - yesod:test # For sanity
@@ -228,8 +228,6 @@ deploy:uniworx4:
     - chmod 700 ~/.ssh
     - install -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts
     - install -m 0400 ${SSH_PRIVATE_KEY_UNIWORX4} ~/.ssh/id
-    - eval $(ssh-agent -s)
-    - ssh-add ~/.ssh/id
   dependencies:
     - yesod:build
         

From d3a0fcbc47510f7d1368ba6fc31d8cb24555e29f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 13 Nov 2019 17:03:43 +0100
Subject: [PATCH 086/126] chore(release): 7.21.5

---
 CHANGELOG.md      | 4 ++++
 package-lock.json | 2 +-
 package.json      | 2 +-
 package.yaml      | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3539d11e..b4a2ad067 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [7.21.5](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.21.4...v7.21.5) (2019-11-13)
+
+
+
 ### [7.21.4](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.21.3...v7.21.4) (2019-11-13)
 
 
diff --git a/package-lock.json b/package-lock.json
index aa31e0341..c6e822607 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.21.4",
+  "version": "7.21.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 96ed901ca..6ad208149 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.21.4",
+  "version": "7.21.5",
   "description": "",
   "keywords": [],
   "author": "",
diff --git a/package.yaml b/package.yaml
index b00a30902..4570780fa 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name:    uniworx
-version: 7.21.4
+version: 7.21.5
 
 dependencies:
   - base >=4.9.1.0 && <5

From c799adcd2881df8fe7b43c7fbd4993558d62fe29 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 13 Nov 2019 17:07:23 +0100
Subject: [PATCH 087/126] chore(gitlab-ci): cache always

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d4bad27ef..770718493 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,6 @@ default:
   image:
     name: fpco/stack-build:lts-13.21
   cache:
-    key: "${CI_COMMIT_REF_SLUG}"
     paths:
       - node_modules
       - .stack

From d03fd4bee6d645624c30297907c91bf4697aa2f8 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Tue, 12 Nov 2019 12:15:48 +0100
Subject: [PATCH 088/126] feat(corrections-grade): basic filter UI with
 pseudonyms

---
 src/Handler/Corrections.hs | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index da2e47096..2da3ef67f 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -1015,6 +1015,23 @@ postCorrectionsGradeR = do
         , colPointsField
         , colCommentField
         ] -- Continue here
+      filterUI = Just $ \mPrev -> mconcat
+        [ prismAForm (singletonFilter "course" ) mPrev $ aopt (lift `hoistField` selectField courseOptions) (fslI MsgCourse)
+        , prismAForm (singletonFilter "term"   ) mPrev $ aopt (lift `hoistField` selectField termOptions)   (fslI MsgTerm)
+        , prismAForm (singletonFilter "school" ) mPrev $ aopt (lift `hoistField` selectField schoolOptions) (fslI MsgCourseSchool)
+        , Map.singleton "sheet-search" . maybeToList <$> aopt (lift `hoistField` textField)                 (fslI MsgSheet)        (Just <$> listToMaybe =<< ((Map.lookup "sheet-search" =<< mPrev) <|> (Map.lookup "sheet" =<< mPrev)))
+        , Map.singleton "pseudonym" . maybeToList <$> aopt (lift `hoistField` textField)                    (fslI MsgPseudonyms)   (Just <$> listToMaybe =<< ((Map.lookup "pseudonym" =<< mPrev) <|> (Map.lookup "pseudonym" =<< mPrev)))
+        , prismAForm (singletonFilter "israted" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant)             (fslI MsgRatingTime)
+        ]
+      courseOptions = runDB $ do
+        courses <- selectList [] [Asc CourseShorthand] >>= filterM (\(Entity _ Course{..}) -> (== Authorized) <$> evalAccessCorrector courseTerm courseSchool courseShorthand)
+        optionsPairs $ map (id &&& id) $ nub $ map (CI.original . courseShorthand . entityVal) courses
+      termOptions = runDB $ do
+        courses <- selectList [] [Asc CourseTerm]      >>= filterM (\(Entity _ Course{..}) -> (== Authorized) <$> evalAccessCorrector courseTerm courseSchool courseShorthand)
+        optionsPairs $ map (id &&& id) $ nub $ map (termToText . unTermKey . courseTerm . entityVal) courses
+      schoolOptions = runDB $ do
+        courses <- selectList [] [Asc CourseSchool]    >>= filterM (\(Entity _ Course{..}) -> (== Authorized) <$> evalAccessCorrector courseTerm courseSchool courseShorthand)
+        optionsPairs $ map (id &&& id) $ nub $ map (CI.original . unSchoolKey . courseSchool . entityVal) courses
       psValidator = def
         & defaultSorting [SortDescBy "ratingtime"] :: PSValidator (MForm (HandlerFor UniWorX)) (FormResult (DBFormResult SubmissionId (Bool, Maybe Points, Maybe Text) CorrectionTableData))
       unFormResult = getDBFormResult $ \DBRow{ dbrOutput = (Entity _ sub@Submission{..}, _, _, _, _, _) } -> (submissionRatingDone sub, submissionRatingPoints, submissionRatingComment)
@@ -1023,7 +1040,7 @@ postCorrectionsGradeR = do
         void . assertM (== Authorized) . lift $ evalAccessDB (CSubmissionR tid ssh csh shn cID CorrectionR) True
         return i
 
-  (fmap unFormResult -> tableRes, table) <- runDB $ makeCorrectionsTable whereClause displayColumns mempty psValidator dbtProj' $ def
+  (fmap unFormResult -> tableRes, table) <- runDB $ makeCorrectionsTable whereClause displayColumns filterUI psValidator dbtProj' $ def
     { dbParamsFormAction = Just $ SomeRoute CorrectionsGradeR
     }
 

From c4eb2c0f04adc6c7193b602b6bfa570c1ba3483b Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Tue, 12 Nov 2019 17:05:39 +0100
Subject: [PATCH 089/126] feat(corrections-grade): working additional filters

---
 src/Handler/Corrections.hs | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 2da3ef67f..91e5aa239 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -369,11 +369,22 @@ makeCorrectionsTable whereClause dbtColonnade dbtFilterUI psValidator dbtProj' d
               E.where_ $ (\f -> f user $ Set.singleton needle) $
                 E.mkContainsFilter (E.^. UserMatrikelnummer)
         )
-      -- , ( "pseudonym"
-      --   , FilterColumn $ E.mkExistsFilter $ \table needle -> E.from $ \(pseudonym) -> do
-      --       E.where_ $ querySheet table E.^. SheetId E.==. pseudonym E.^. SheetPseudonymSheet
-      --       E.where_ $ E.mkContainsFilter -- DB only stores Pseudonym == Word24. Conversion not possible in DB.
-      --   )
+      , ( "rating-visible"
+        , FilterColumn $  \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _ :: CorrectionTableExpr) criterion -> case getLast (criterion :: Last Bool) of
+            Nothing   -> E.val True :: E.SqlExpr (E.Value Bool)
+            Just True -> E.isJust    $ submission E.^. SubmissionRatingTime
+            Just False-> E.isNothing $ submission E.^. SubmissionRatingTime
+        )
+      , ( "rating"
+        , FilterColumn $  \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _ :: CorrectionTableExpr) pts -> if
+            | Set.null pts -> E.val True :: E.SqlExpr (E.Value Bool)
+            | otherwise    -> E.maybe (E.val False :: E.SqlExpr (E.Value Bool)) (\p -> p `E.in_` E.valList (Set.toList pts)) (submission E.^. SubmissionRatingPoints)
+        )
+      , ( "comment"
+        , FilterColumn $ \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _ :: CorrectionTableExpr) comm -> case getLast (comm :: Last Text) of
+            Nothing     -> E.val True :: E.SqlExpr (E.Value Bool)
+            Just needle -> E.maybe (E.val False :: E.SqlExpr (E.Value Bool)) (E.hasInfix $ E.val needle) (submission E.^. SubmissionRatingComment)
+        )
       ]
     , dbtFilterUI  = fromMaybe mempty dbtFilterUI
     , dbtStyle     = def { dbsFilterLayout = maybe (\_ _ _ -> id) (\_ -> defaultDBSFilterLayout) dbtFilterUI }
@@ -1020,8 +1031,10 @@ postCorrectionsGradeR = do
         , prismAForm (singletonFilter "term"   ) mPrev $ aopt (lift `hoistField` selectField termOptions)   (fslI MsgTerm)
         , prismAForm (singletonFilter "school" ) mPrev $ aopt (lift `hoistField` selectField schoolOptions) (fslI MsgCourseSchool)
         , Map.singleton "sheet-search" . maybeToList <$> aopt (lift `hoistField` textField)                 (fslI MsgSheet)        (Just <$> listToMaybe =<< ((Map.lookup "sheet-search" =<< mPrev) <|> (Map.lookup "sheet" =<< mPrev)))
-        , Map.singleton "pseudonym" . maybeToList <$> aopt (lift `hoistField` textField)                    (fslI MsgPseudonyms)   (Just <$> listToMaybe =<< ((Map.lookup "pseudonym" =<< mPrev) <|> (Map.lookup "pseudonym" =<< mPrev)))
         , prismAForm (singletonFilter "israted" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant)             (fslI MsgRatingTime)
+        , prismAForm (singletonFilter "rating-visible" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgRatingDone)
+        , prismAForm (singletonFilter "rating" . maybePrism _PathPiece) mPrev $ aopt (lift `hoistField` pointsField) (fslI MsgColumnRatingPoints)
+        , Map.singleton "comment" . maybeToList <$> aopt (lift `hoistField` textField)                   (fslI MsgRatingComment) (Just <$> listToMaybe =<< ((Map.lookup "comment" =<< mPrev) <|> (Map.lookup "comment" =<< mPrev)))
         ]
       courseOptions = runDB $ do
         courses <- selectList [] [Asc CourseShorthand] >>= filterM (\(Entity _ Course{..}) -> (== Authorized) <$> evalAccessCorrector courseTerm courseSchool courseShorthand)

From 4cb2d4f07ddc0d873601ae43636a76adfd5a481a Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 13 Nov 2019 11:36:37 +0100
Subject: [PATCH 090/126] feat(corrections-grade): additional column for
 sheetType

---
 src/Handler/Corrections.hs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 91e5aa239..570532b36 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -217,6 +217,9 @@ colPointsField = sortable (Just "rating") (i18nCell MsgColumnRatingPoints) $ for
       _other -> over (_1.mapped) (_2 .~) . over _2 fvInput <$> mopt (pointsFieldMax $ preview (_grading . _maxPoints) sheetType) (fsUniq mkUnique "points") (Just submissionRatingPoints)
   )
 
+colMaxPointsField :: Colonnade Sortable CorrectionTableData (DBCell _ (FormResult (DBFormResult SubmissionId (a, Maybe Points, b) CorrectionTableData)))
+colMaxPointsField = sortable (Just "maxPoints") (i18nCell MsgSheetType) $ i18nCell . (\DBRow{ dbrOutput=(_, Entity _ Sheet{sheetType}, _, _, _, _) } -> sheetType)
+
 colCommentField :: Colonnade Sortable CorrectionTableData (DBCell _ (FormResult (DBFormResult SubmissionId (a, b, Maybe Text) CorrectionTableData)))
 colCommentField = sortable (Just "comment") (i18nCell MsgRatingComment) $ fmap (cellAttrs <>~ [("style","width:60%")]) $ formCell id
   (\DBRow{ dbrOutput=(Entity subId _, _, _, _, _, _) } -> return subId)
@@ -1024,6 +1027,7 @@ postCorrectionsGradeR = do
         , colRated
         , colRatedField
         , colPointsField
+        , colMaxPointsField
         , colCommentField
         ] -- Continue here
       filterUI = Just $ \mPrev -> mconcat

From 702fb1dfdb0bc9d9124d824efef56620b6666d33 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 13 Nov 2019 14:47:16 +0100
Subject: [PATCH 091/126] feat(corrections-grade): sorting by sheetType

---
 src/Database/Esqueleto/Utils.hs | 4 ++++
 src/Handler/Corrections.hs      | 9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Database/Esqueleto/Utils.hs b/src/Database/Esqueleto/Utils.hs
index 2cdfc69d2..b9cc734bb 100644
--- a/src/Database/Esqueleto/Utils.hs
+++ b/src/Database/Esqueleto/Utils.hs
@@ -19,6 +19,7 @@ module Database.Esqueleto.Utils
   , sha256
   , maybe
   , SqlProject(..)
+  , (->.)
   , module Database.Esqueleto.Utils.TH
   ) where
 
@@ -246,3 +247,6 @@ instance (PersistEntity val, PersistField typ) => SqlProject val typ (E.Entity v
 instance (PersistEntity val, PersistField typ) => SqlProject val typ (Maybe (E.Entity val)) (Maybe typ) where
   sqlProject = (E.?.)
   unSqlProject _ _ = Just
+
+(->.) :: E.SqlExpr (E.Value a) -> Text -> E.SqlExpr (E.Value b)
+(->.) expr t = E.unsafeSqlBinOp "->" expr $ E.val t
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 570532b36..16d284145 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -218,7 +218,7 @@ colPointsField = sortable (Just "rating") (i18nCell MsgColumnRatingPoints) $ for
   )
 
 colMaxPointsField :: Colonnade Sortable CorrectionTableData (DBCell _ (FormResult (DBFormResult SubmissionId (a, Maybe Points, b) CorrectionTableData)))
-colMaxPointsField = sortable (Just "maxPoints") (i18nCell MsgSheetType) $ i18nCell . (\DBRow{ dbrOutput=(_, Entity _ Sheet{sheetType}, _, _, _, _) } -> sheetType)
+colMaxPointsField = sortable (Just "sheet-type") (i18nCell MsgSheetType) $ i18nCell . (\DBRow{ dbrOutput=(_, Entity _ Sheet{sheetType}, _, _, _, _) } -> sheetType)
 
 colCommentField :: Colonnade Sortable CorrectionTableData (DBCell _ (FormResult (DBFormResult SubmissionId (a, b, Maybe Text) CorrectionTableData)))
 colCommentField = sortable (Just "comment") (i18nCell MsgRatingComment) $ fmap (cellAttrs <>~ [("style","width:60%")]) $ formCell id
@@ -279,6 +279,13 @@ makeCorrectionsTable whereClause dbtColonnade dbtFilterUI psValidator dbtProj' d
       , ( "rating"
         , SortColumn $ \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _) -> submission E.^. SubmissionRatingPoints
         )
+      , ( "sheet-type"
+        , SortColumns $ \((_ `E.InnerJoin` sheet `E.InnerJoin` _) `E.LeftOuterJoin` _) -> 
+          [ SomeExprValue ((sheet E.^. SheetType) E.->. "type" :: E.SqlExpr (E.Value Value))
+          , SomeExprValue (((sheet E.^. SheetType) E.->. "grading" :: E.SqlExpr (E.Value Value)) E.->. "max" :: E.SqlExpr (E.Value Value))
+          , SomeExprValue (((sheet E.^. SheetType) E.->. "grading" :: E.SqlExpr (E.Value Value)) E.->. "passing" :: E.SqlExpr (E.Value Value))
+          ]
+        )
       , ( "israted"
         , SortColumn $ \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _) -> E.not_ . E.isNothing $ submission E.^. SubmissionRatingTime
         )

From 2c2dd8d3ff3334df675972bafc367349e13d7ef5 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 13 Nov 2019 15:11:25 +0100
Subject: [PATCH 092/126] fix(corrections-grade): fix inFix

---
 src/Handler/Corrections.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 16d284145..234c5eab1 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -393,7 +393,7 @@ makeCorrectionsTable whereClause dbtColonnade dbtFilterUI psValidator dbtProj' d
       , ( "comment"
         , FilterColumn $ \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _ :: CorrectionTableExpr) comm -> case getLast (comm :: Last Text) of
             Nothing     -> E.val True :: E.SqlExpr (E.Value Bool)
-            Just needle -> E.maybe (E.val False :: E.SqlExpr (E.Value Bool)) (E.hasInfix $ E.val needle) (submission E.^. SubmissionRatingComment)
+            Just needle -> E.maybe (E.val False :: E.SqlExpr (E.Value Bool)) (E.isInfixOf $ E.val needle) (submission E.^. SubmissionRatingComment)
         )
       ]
     , dbtFilterUI  = fromMaybe mempty dbtFilterUI
@@ -1045,7 +1045,7 @@ postCorrectionsGradeR = do
         , prismAForm (singletonFilter "israted" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant)             (fslI MsgRatingTime)
         , prismAForm (singletonFilter "rating-visible" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgRatingDone)
         , prismAForm (singletonFilter "rating" . maybePrism _PathPiece) mPrev $ aopt (lift `hoistField` pointsField) (fslI MsgColumnRatingPoints)
-        , Map.singleton "comment" . maybeToList <$> aopt (lift `hoistField` textField)                   (fslI MsgRatingComment) (Just <$> listToMaybe =<< ((Map.lookup "comment" =<< mPrev) <|> (Map.lookup "comment" =<< mPrev)))
+        , Map.singleton "comment" . maybeToList <$> aopt (lift `hoistField` textField) (fslI MsgRatingComment) (Just <$> listToMaybe =<< (Map.lookup "comment" =<< mPrev))
         ]
       courseOptions = runDB $ do
         courses <- selectList [] [Asc CourseShorthand] >>= filterM (\(Entity _ Course{..}) -> (== Authorized) <$> evalAccessCorrector courseTerm courseSchool courseShorthand)

From 018082ec4a8d1fb90fb5fa874a9b971f6162716b Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 13 Nov 2019 16:03:38 +0100
Subject: [PATCH 093/126] feat(corrections): added missing titles; small
 message fixes

---
 messages/uniworx/de-de-formal.msg | 4 +++-
 messages/uniworx/en-eu.msg        | 6 ++++--
 src/Handler/Corrections.hs        | 6 ++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index b23d44074..d5615c318 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -347,6 +347,8 @@ CourseCorrectionsTitle: Korrekturen für diesen Kurs
 CorrectorsHead sheetName@SheetName: Korrektoren für #{sheetName}
 CorrectorAssignTitle: Korrektor zuweisen
 
+CorrectionsGrade: Abgaben online korrigieren
+
 MaterialName: Name
 MaterialType: Art
 MaterialTypePlaceholder: Folien, Code, Beispiel, ...
@@ -958,7 +960,7 @@ NotificationTriggerKindEvaluation: Für Vorlesungsumfragen
 NotificationTriggerKindAllocationStaff: Für Zentralanmeldungen (Dozenten)
 NotificationTriggerKindAllocationParticipant: Für Zentralanmeldungen
 
-CorrCreate: Abgaben erstellen
+CorrCreate: Abgaben registrieren
 UnknownPseudonymWord pseudonymWord@Text: Unbekanntes Pseudonym-Wort "#{pseudonymWord}"
 InvalidPseudonym pseudonym@Text: Invalides Pseudonym "#{pseudonym}"
 InvalidPseudonymSubmissionIgnored oPseudonyms@Text iPseudonym@Text: Abgabe mit Pseudonymen „#{oPseudonyms}“ wurde ignoriert, da „#{iPseudonym}“ nicht automatisiert zu einem validen Pseudonym korrigiert werden konnte.
diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index f760368f4..99313f48a 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -346,6 +346,8 @@ CourseCorrectionsTitle: Corrections for this course
 CorrectorsHead sheetName: Correctors for #{sheetName}
 CorrectorAssignTitle: Assign corrector
 
+CorrectionsGrade: Grade submissions online
+
 MaterialName: Name
 MaterialType: Type
 MaterialTypePlaceholder: Slides, Code, Example, ...
@@ -955,7 +957,7 @@ NotificationTriggerKindEvaluation: For course evaluations
 NotificationTriggerKindAllocationStaff: For central allocations (lecturers)
 NotificationTriggerKindAllocationParticipant: For central allocations
 
-CorrCreate: Create submissions
+CorrCreate: Register submissions
 UnknownPseudonymWord pseudonymWord: Invalid pseudonym-word “#{pseudonymWord}”
 InvalidPseudonym pseudonym: Invalid pseudonym “#{pseudonym}”
 InvalidPseudonymSubmissionIgnored oPseudonyms iPseudonym: The submission with pseudonyms “#{oPseudonyms}” has been ignored since “#{iPseudonym}” could not be automatically corrected to be a valid pseudonym.
@@ -1114,7 +1116,7 @@ MenuSheetClone: Clone exercise sheet
 MenuCorrectionsUpload: Upload corrections
 MenuCorrectionsDownload: Download corrections
 MenuCorrectionsCreate: Register submissions
-MenuCorrectionsGrade: Mark submissions online
+MenuCorrectionsGrade: Grade submissions online
 MenuCorrectionsAssign: Assign corrections
 MenuCorrectionsAssignSheet name@Text: Assign corrections for #{name}
 MenuAuthPreds: Authorisation settings
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 234c5eab1..8a39796fc 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -1004,7 +1004,8 @@ postCorrectionsCreateR = do
         , formEncoding = pseudonymEncoding
         }
 
-  defaultLayout
+  siteLayoutMsg MsgCorrCreate $ do
+    setTitleI MsgCorrCreate
     $(widgetFile "corrections-create")
   where
     partitionEithers' :: [[Either a b]] -> ([[b]], [a])
@@ -1089,7 +1090,8 @@ postCorrectionsGradeR = do
           content = Right $(widgetFile "messages/correctionsUploaded")
       unless (null subs') $ addMessageModal Success trigger content
 
-  defaultLayout $
+  siteLayoutMsg MsgCorrectionsGrade $ do
+    setTitleI MsgCorrectionsGrade
     $(widgetFile "corrections-grade")
 
 

From 3f9ca5e230f0d8b5f83b5fc35c18fca6afcae6f7 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 13 Nov 2019 17:25:56 +0100
Subject: [PATCH 094/126] fix(datepicker): close datepickers on focus loss

---
 frontend/src/utils/form/datepicker.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/utils/form/datepicker.js b/frontend/src/utils/form/datepicker.js
index b8ba0869f..c6e6ff589 100644
--- a/frontend/src/utils/form/datepicker.js
+++ b/frontend/src/utils/form/datepicker.js
@@ -180,11 +180,11 @@ export class Datepicker {
     // change the selected date in the tail.datetime instance if the value of the input element is changed
     this._element.addEventListener('change', setDatepickerDate, { once: true });
 
-    // close the instance if something other than the instance was clicked (i.e. if the target is not within the datepicker instance and if any previously clicked calendar view was replaced (is not in the window anymore) because it was clicked). YES, I KNOW
-    window.addEventListener('click', event => {
-      if (!this.datepickerInstance.dt.contains(event.target) && window.document.contains(event.target)) {
+    // close the instance on focus loss of the corresponding input element
+    // (only close the instance if source and target IDs differ, since interactions with the opened datepicker also triggers this event in some cases)
+    this._element.addEventListener('focusout', event => {
+      if (!event.relatedTarget || event.relatedTarget.id !== event.srcElement.id)
         this.datepickerInstance.close();
-      }
     });
 
     // close the datepicker on escape keydown events

From 1075122a22988dd04524b3025e9d3f07e25e8d61 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 14 Nov 2019 08:42:33 +0100
Subject: [PATCH 095/126] chore(gitlab-ci): fix relative paths

---
 .gitlab-ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 770718493..19ba3fb20 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -215,7 +215,7 @@ yesod:test:
 deploy:uniworx4:
   stage: deploy
   script:
-    - ssh -i .ssh/id root@uniworx4.ifi.lmu.de <bin/uniworx
+    - ssh -i ~/.ssh/id root@uniworx4.ifi.lmu.de <bin/uniworx
   needs:
     - yesod:build
     - yesod:test # For sanity
@@ -223,8 +223,7 @@ deploy:uniworx4:
   before_script:
     - apt-get update -y
     - apt-get install -y --no-install-recommends openssh-client
-    - mkdir -p ~/.ssh
-    - chmod 700 ~/.ssh
+    - install -m 0700 -d ~/.ssh
     - install -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts
     - install -m 0400 ${SSH_PRIVATE_KEY_UNIWORX4} ~/.ssh/id
   dependencies:

From 8708ca4a0258691327349ffd0b35744bebf23ee3 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 14 Nov 2019 08:43:29 +0100
Subject: [PATCH 096/126] chore(release): 7.22.0

---
 CHANGELOG.md      | 18 ++++++++++++++++++
 package-lock.json |  2 +-
 package.json      |  2 +-
 package.yaml      |  2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4a2ad067..c77475fdd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [7.22.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.21.5...v7.22.0) (2019-11-14)
+
+
+### Bug Fixes
+
+* **corrections-grade:** fix inFix ([2c2dd8d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/2c2dd8d))
+
+
+### Features
+
+* **corrections:** added missing titles; small message fixes ([018082e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/018082e))
+* **corrections-grade:** additional column for sheetType ([4cb2d4f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/4cb2d4f))
+* **corrections-grade:** basic filter UI with pseudonyms ([d03fd4b](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d03fd4b))
+* **corrections-grade:** sorting by sheetType ([702fb1d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/702fb1d))
+* **corrections-grade:** working additional filters ([c4eb2c0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/c4eb2c0))
+
+
+
 ### [7.21.5](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.21.4...v7.21.5) (2019-11-13)
 
 
diff --git a/package-lock.json b/package-lock.json
index c6e822607..5beb67181 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.21.5",
+  "version": "7.22.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6ad208149..49cf620a0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.21.5",
+  "version": "7.22.0",
   "description": "",
   "keywords": [],
   "author": "",
diff --git a/package.yaml b/package.yaml
index 4570780fa..04a6230e4 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name:    uniworx
-version: 7.21.5
+version: 7.22.0
 
 dependencies:
   - base >=4.9.1.0 && <5

From 7fa0124fe25a53caa07c478e157dace3c4f2a6ee Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Thu, 14 Nov 2019 12:24:02 +0100
Subject: [PATCH 097/126] fix(datepicker): close datepickers on focusout or
 click outside

---
 frontend/src/utils/form/datepicker.js | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/frontend/src/utils/form/datepicker.js b/frontend/src/utils/form/datepicker.js
index c6e6ff589..de7b0f6db 100644
--- a/frontend/src/utils/form/datepicker.js
+++ b/frontend/src/utils/form/datepicker.js
@@ -180,14 +180,27 @@ export class Datepicker {
     // change the selected date in the tail.datetime instance if the value of the input element is changed
     this._element.addEventListener('change', setDatepickerDate, { once: true });
 
-    // close the instance on focus loss of the corresponding input element
-    // (only close the instance if source and target IDs differ, since interactions with the opened datepicker also triggers this event in some cases)
-    this._element.addEventListener('focusout', event => {
-      if (!event.relatedTarget || event.relatedTarget.id !== event.srcElement.id)
+    // close the instance on focusout of any element if the target is outside of the instance
+    window.addEventListener('focusout', event => {
+      console.log('focusout', event);
+      const targetIsOutside       = !this.datepickerInstance.dt.contains(event.explicitOriginalTarget);
+      const targetIsNotTimepicker = !this.datepickerInstance.dt.contains(event.relatedTarget);
+      console.log(targetIsOutside, targetIsNotTimepicker);
+      if (targetIsOutside && targetIsNotTimepicker)
+        this.datepickerInstance.close();
+    });
+    
+    // close the instance on click on any element outside of the datepicker (except the input element itself)
+    window.addEventListener('click', event => {
+      const targetIsOutside    = !this.datepickerInstance.dt.contains(event.target);
+      const targetIsInDocument = window.document.contains(event.target);
+      const targetIsNotInput   = event.target !== this._element;
+      console.log(targetIsOutside, targetIsInDocument, targetIsNotInput);
+      if (targetIsOutside && targetIsInDocument && targetIsNotInput)
         this.datepickerInstance.close();
     });
 
-    // close the datepicker on escape keydown events
+    // close the instance on escape keydown events
     this._element.addEventListener('keydown', event => {
       if (event.keyCode === KEYCODE_ESCAPE) {
         this.datepickerInstance.close();

From 85ae663d91aaed981301765eae0d7da49b2d0f67 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel@cip.ifi.lmu.de>
Date: Thu, 14 Nov 2019 13:16:40 +0100
Subject: [PATCH 098/126] Apply suggestion to
 frontend/src/utils/form/datepicker.js

---
 frontend/src/utils/form/datepicker.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/utils/form/datepicker.js b/frontend/src/utils/form/datepicker.js
index de7b0f6db..0d27fb691 100644
--- a/frontend/src/utils/form/datepicker.js
+++ b/frontend/src/utils/form/datepicker.js
@@ -182,7 +182,6 @@ export class Datepicker {
 
     // close the instance on focusout of any element if the target is outside of the instance
     window.addEventListener('focusout', event => {
-      console.log('focusout', event);
       const targetIsOutside       = !this.datepickerInstance.dt.contains(event.explicitOriginalTarget);
       const targetIsNotTimepicker = !this.datepickerInstance.dt.contains(event.relatedTarget);
       console.log(targetIsOutside, targetIsNotTimepicker);

From e661cb9f65a938168a92e4cd56aab37f26dce25a Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel@cip.ifi.lmu.de>
Date: Thu, 14 Nov 2019 13:16:43 +0100
Subject: [PATCH 099/126] Apply suggestion to
 frontend/src/utils/form/datepicker.js

---
 frontend/src/utils/form/datepicker.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/utils/form/datepicker.js b/frontend/src/utils/form/datepicker.js
index 0d27fb691..c24708516 100644
--- a/frontend/src/utils/form/datepicker.js
+++ b/frontend/src/utils/form/datepicker.js
@@ -184,7 +184,6 @@ export class Datepicker {
     window.addEventListener('focusout', event => {
       const targetIsOutside       = !this.datepickerInstance.dt.contains(event.explicitOriginalTarget);
       const targetIsNotTimepicker = !this.datepickerInstance.dt.contains(event.relatedTarget);
-      console.log(targetIsOutside, targetIsNotTimepicker);
       if (targetIsOutside && targetIsNotTimepicker)
         this.datepickerInstance.close();
     });

From 999dd6b29b3737936e5f75f0a2f77b603e9bb4b2 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel@cip.ifi.lmu.de>
Date: Thu, 14 Nov 2019 13:16:46 +0100
Subject: [PATCH 100/126] Apply suggestion to
 frontend/src/utils/form/datepicker.js

---
 frontend/src/utils/form/datepicker.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/utils/form/datepicker.js b/frontend/src/utils/form/datepicker.js
index c24708516..d0f6123b2 100644
--- a/frontend/src/utils/form/datepicker.js
+++ b/frontend/src/utils/form/datepicker.js
@@ -193,7 +193,6 @@ export class Datepicker {
       const targetIsOutside    = !this.datepickerInstance.dt.contains(event.target);
       const targetIsInDocument = window.document.contains(event.target);
       const targetIsNotInput   = event.target !== this._element;
-      console.log(targetIsOutside, targetIsInDocument, targetIsNotInput);
       if (targetIsOutside && targetIsInDocument && targetIsNotInput)
         this.datepickerInstance.close();
     });

From ecada87dc5c4073afe0a31cbc20c292bb5ba7107 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 14 Nov 2019 13:35:56 +0100
Subject: [PATCH 101/126] refactor: split foundation for ram usage during
 compilation

---
 src/Foundation.hs      | 328 ++---------------------------------------
 src/Foundation/I18n.hs | 313 +++++++++++++++++++++++++++++++++++++++
 src/Foundation/Type.hs |  58 ++++++++
 3 files changed, 380 insertions(+), 319 deletions(-)
 create mode 100644 src/Foundation/I18n.hs
 create mode 100644 src/Foundation/Type.hs

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 501c7b22b..2470d2088 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -2,23 +2,25 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-} -- MonadCrypto
 
-module Foundation where
+module Foundation
+  ( module Foundation
+  ) where
+
+import Foundation.Type as Foundation
+import Foundation.I18n as Foundation
+
 
 import Import.NoFoundation hiding (embedFile)
-import Database.Persist.Sql (ConnectionPool, runSqlPool)
+import Database.Persist.Sql (runSqlPool)
 import Text.Hamlet          (hamletFile)
 
-import qualified Web.ClientSession as ClientSession
-
 import Yesod.Auth.Message
 import Auth.LDAP
 import Auth.PWHash
 import Auth.Dummy
-import Jobs.Types
 
 import qualified Network.Wai as W (pathInfo)
 
-import Yesod.Core.Types     (Logger)
 import qualified Yesod.Core.Unsafe as Unsafe
 import Data.CaseInsensitive (original, mk)
 
@@ -79,9 +81,6 @@ import qualified Yesod.Auth.Message as Auth
 
 import qualified Data.Conduit.List as C
 
-import qualified Crypto.Saltine.Core.SecretBox as SecretBox
-import qualified Jose.Jwk as Jose
-
 import qualified Database.Memcached.Binary.IO as Memcached
 import Data.Bits (Bits(zeroBits))
 
@@ -96,45 +95,6 @@ import qualified Ldap.Client as Ldap
 import UnliftIO.Pool
 
 
-type SMTPPool = Pool SMTPConnection
-
--- infixl 9 :$:
--- pattern a :$: b = a b
-
--- | The foundation datatype for your application. This can be a good place to
--- keep settings and values requiring initialization before your application
--- starts running, such as database connections. Every handler will have
--- access to the data present here.
-data UniWorX = UniWorX
-    { appSettings'       :: AppSettings
-    , appStatic          :: EmbeddedStatic -- ^ Settings for static file serving.
-    , appConnPool        :: ConnectionPool -- ^ Database connection pool.
-    , appSmtpPool        :: Maybe SMTPPool
-    , appLdapPool        :: Maybe LdapPool
-    , appWidgetMemcached :: Maybe Memcached.Connection -- ^ Actually a proper pool
-    , appHttpManager     :: Manager
-    , appLogger          :: (ReleaseKey, TVar Logger)
-    , appLogSettings     :: TVar LogSettings
-    , appCryptoIDKey     :: CryptoIDKey
-    , appClusterID       :: ClusterId
-    , appInstanceID      :: InstanceId
-    , appJobState        :: TMVar JobState
-    , appSessionKey      :: ClientSession.Key
-    , appSecretBoxKey    :: SecretBox.Key
-    , appJSONWebKeySet   :: Jose.JwkSet
-    , appHealthReport    :: TVar (Set (UTCTime, HealthReport))
-    }
-
-makeLenses_ ''UniWorX
-instance HasInstanceID UniWorX InstanceId where
-  instanceID = _appInstanceID
-instance HasJSONWebKeySet UniWorX Jose.JwkSet where
-  jsonWebKeySet = _appJSONWebKeySet
-instance HasHttpManager UniWorX Manager where
-  httpManager = _appHttpManager
-instance HasAppSettings UniWorX where
-  appSettings = _appSettings'
-
 -- This is where we define all of the routes in our application. For a full
 -- explanation of the syntax, please see:
 -- http://www.yesodweb.com/book/routing-and-handlers
@@ -214,141 +174,7 @@ pattern CEventR tid ssh csh nId ptn
   = CourseR tid ssh csh (CourseEventR nId ptn)
 
 
-pluralDE :: (Eq a, Num a)
-            =>    a -- ^ Count
-            -> Text -- ^ Singular
-            -> Text -- ^ Plural
-            -> Text
-pluralDE num singularForm pluralForm
-  | num == 1  = singularForm
-  | otherwise = pluralForm
-
-noneOneMoreDE :: (Eq a, Num a)
-            =>    a -- ^ Count
-            -> Text -- ^ None
-            -> Text -- ^ Singular
-            -> Text -- ^ Plural
-            -> Text
-noneOneMoreDE num noneText singularForm pluralForm
-  | num == 0  = noneText
-  | num == 1  = singularForm
-  | otherwise = pluralForm
-
-noneMoreDE :: (Eq a, Num a)
-            =>    a -- ^ Count
-            -> Text -- ^ None
-            -> Text -- ^ Some
-            -> Text
-noneMoreDE num noneText someText
-  | num == 0  = noneText
-  | otherwise = someText
-
-pluralEN :: (Eq a, Num a)
-            =>    a -- ^ Count
-            -> Text -- ^ Singular
-            -> Text -- ^ Plural
-            -> Text
-pluralEN num singularForm pluralForm
-  | num == 1  = singularForm
-  | otherwise = pluralForm
-
-noneOneMoreEN :: (Eq a, Num a)
-            =>    a -- ^ Count
-            -> Text -- ^ None
-            -> Text -- ^ Singular
-            -> Text -- ^ Plural
-            -> Text
-noneOneMoreEN num noneText singularForm pluralForm
-  | num == 0  = noneText
-  | num == 1  = singularForm
-  | otherwise = pluralForm
-
-noneMoreEN :: (Eq a, Num a)
-            =>    a -- ^ Count
-            -> Text -- ^ None
-            -> Text -- ^ Some
-            -> Text
-noneMoreEN num noneText someText
-  | num == 0  = noneText
-  | otherwise = someText
-
-ordinalEN :: ToMessage a
-          => a
-          -> Text
-ordinalEN (toMessage -> numStr) = case lastChar of
-  Just '1' -> [st|#{numStr}st|]
-  Just '2' -> [st|#{numStr}nd|]
-  Just '3' -> [st|#{numStr}rd|]
-  _other   -> [st|#{numStr}th|]
-  where
-    lastChar = last <$> fromNullable numStr 
-
-
--- Convenience Type for Messages, since Yesod messages cannot deal with compound type identifiers
-type IntMaybe  = Maybe Int
-type TextList  = [Text]
-
--- | Convenience function for i18n messages definitions
-maybeToMessage :: ToMessage m => Text -> Maybe m -> Text -> Text
-maybeToMessage _      Nothing  _     = mempty
-maybeToMessage before (Just x) after = before <> (toMessage x) <> after
-
--- Messages creates type UniWorXMessage and RenderMessage UniWorX instance
-mkMessage "UniWorX" "messages/uniworx" "de-de-formal"
-mkMessageVariant "UniWorX" "Campus" "messages/campus" "de"
-mkMessageVariant "UniWorX" "Dummy" "messages/dummy" "de"
-mkMessageVariant "UniWorX" "PWHash" "messages/pw-hash" "de"
-mkMessageVariant "UniWorX" "Button" "messages/button" "de"
-mkMessageVariant "UniWorX" "Frontend" "messages/frontend" "de-de-formal"
-
-instance RenderMessage UniWorX TermIdentifier where
-  renderMessage foundation ls TermIdentifier{..} = case season of
-    Summer -> renderMessage' $ MsgSummerTerm year
-    Winter -> renderMessage' $ MsgWinterTerm year
-    where renderMessage' = renderMessage foundation ls
-
-newtype ShortTermIdentifier = ShortTermIdentifier TermIdentifier
-  deriving (Eq, Ord, Read, Show)
-instance RenderMessage UniWorX ShortTermIdentifier where
-  renderMessage foundation ls (ShortTermIdentifier TermIdentifier{..}) = case season of
-    Summer -> renderMessage' $ MsgSummerTermShort year
-    Winter -> renderMessage' $ MsgWinterTermShort year
-    where renderMessage' = renderMessage foundation ls
-
-instance RenderMessage UniWorX String where
-  renderMessage f ls str = renderMessage f ls $ Text.pack str
-
--- TODO: raw number representation; instead, display e.g. 1000 as 1.000 or 1,000 or ... (language-dependent!)
-instance RenderMessage UniWorX Int where
-  renderMessage f ls = renderMessage f ls . tshow
-instance RenderMessage UniWorX Int64 where
-  renderMessage f ls = renderMessage f ls . tshow
-instance RenderMessage UniWorX Integer where
-  renderMessage f ls = renderMessage f ls . tshow
-instance RenderMessage UniWorX Natural where
-  renderMessage f ls = renderMessage f ls . tshow
-
-instance HasResolution a => RenderMessage UniWorX (Fixed a) where
-  renderMessage f ls = renderMessage f ls . showFixed True
-
-instance RenderMessage UniWorX Load where
-  renderMessage foundation ls = renderMessage foundation ls . \case
-      (Load {byTutorial=Nothing   , byProportion=p}) -> MsgCorByProportionOnly p
-      (Load {byTutorial=Just True , byProportion=p}) -> MsgCorByProportionIncludingTutorial p
-      (Load {byTutorial=Just False, byProportion=p}) -> MsgCorByProportionExcludingTutorial p
-
-newtype MsgLanguage = MsgLanguage Lang
-  deriving (Eq, Ord, Show, Read)
-instance RenderMessage UniWorX MsgLanguage where
-  renderMessage foundation ls (MsgLanguage lang@(map mk . Text.splitOn "-" -> lang'))
-    | ("de" : "DE" : _) <- lang' = mr MsgGermanGermany
-    | ("de" : _)        <- lang' = mr MsgGerman
-    | ("en" : "EU" : _) <- lang' = mr MsgEnglishEurope
-    | ("en" : _)        <- lang' = mr MsgEnglish 
-    | otherwise = lang
-    where
-      mr = renderMessage foundation ls
-
+-- Requires `rendeRoute`, thus cannot currently be moved to Foundation.I18n
 instance RenderMessage UniWorX (UnsupportedAuthPredicate AuthTag (Route UniWorX)) where
   renderMessage f ls (UnsupportedAuthPredicate tag route) = mr . MsgUnsupportedAuthPredicate (mr tag) $ Text.intercalate "/" pieces
     where
@@ -356,142 +182,6 @@ instance RenderMessage UniWorX (UnsupportedAuthPredicate AuthTag (Route UniWorX)
       mr = renderMessage f ls
       (pieces, _) = renderRoute route
 
-embedRenderMessage ''UniWorX ''MessageStatus ("Message" <>)
-embedRenderMessage ''UniWorX ''NotificationTrigger $ ("NotificationTrigger" <>) . concat . drop 1 . splitCamel
-embedRenderMessage ''UniWorX ''StudyFieldType id
-embedRenderMessage ''UniWorX ''SheetFileType id
-embedRenderMessage ''UniWorX ''SubmissionFileType id
-embedRenderMessage ''UniWorX ''CorrectorState id
-embedRenderMessage ''UniWorX ''RatingException id
-embedRenderMessage ''UniWorX ''SubmissionSinkException ("SubmissionSinkException" <>)
-embedRenderMessage ''UniWorX ''SheetGrading ("SheetGrading" <>)
-embedRenderMessage ''UniWorX ''AuthTag $ ("AuthTag" <>) . concat . drop 1 . splitCamel
-embedRenderMessage ''UniWorX ''EncodedSecretBoxException id
-embedRenderMessage ''UniWorX ''LecturerType id
-embedRenderMessage ''UniWorX ''SubmissionModeDescr
-  $ let verbMap [_, _, "None"] = "NoSubmissions"
-        verbMap [_, _, v] = v <> "Submissions"
-        verbMap _ = error "Invalid number of verbs"
-     in verbMap . splitCamel
-embedRenderMessage ''UniWorX ''UploadModeDescr id
-embedRenderMessage ''UniWorX ''SecretJSONFieldException id
-embedRenderMessage ''UniWorX ''AFormMessage $ concat . drop 2 . splitCamel
-embedRenderMessage ''UniWorX ''SchoolFunction id
-embedRenderMessage ''UniWorX ''CsvPreset id
-embedRenderMessage ''UniWorX ''Quoting ("Csv" <>)
-embedRenderMessage ''UniWorX ''FavouriteReason id
-embedRenderMessage ''UniWorX ''Sex id
-
-embedRenderMessage ''UniWorX ''AuthenticationMode id
-
-newtype ShortSex = ShortSex Sex
-embedRenderMessageVariant ''UniWorX ''ShortSex ("Short" <>)
-
-newtype SheetTypeHeader = SheetTypeHeader SheetType
-embedRenderMessageVariant ''UniWorX ''SheetTypeHeader ("SheetType" <>)
-
-instance RenderMessage UniWorX SheetType where
-  renderMessage foundation ls sheetType = case sheetType of
-      NotGraded -> mr $ SheetTypeHeader NotGraded
-      other -> mr (grading other) <> ", " <> mr (SheetTypeHeader other)
-    where
-      mr :: RenderMessage UniWorX msg => msg -> Text
-      mr = renderMessage foundation ls
-
-instance RenderMessage UniWorX StudyDegree where
-  renderMessage _found _ls StudyDegree{..} = fromMaybe (tshow studyDegreeKey) (studyDegreeName <|> studyDegreeShorthand)
-
-newtype ShortStudyDegree = ShortStudyDegree StudyDegree
-
-instance RenderMessage UniWorX ShortStudyDegree where
-  renderMessage _found _ls (ShortStudyDegree StudyDegree{..}) = fromMaybe (tshow studyDegreeKey) studyDegreeShorthand
-
-instance RenderMessage UniWorX StudyTerms where
-  renderMessage _found _ls StudyTerms{..} = fromMaybe (tshow studyTermsKey) (studyTermsName <|> studyTermsShorthand)
-
-newtype ShortStudyTerms = ShortStudyTerms StudyTerms
-
-instance RenderMessage UniWorX ShortStudyTerms where
-  renderMessage _found _ls (ShortStudyTerms StudyTerms{..}) = fromMaybe (tshow studyTermsKey) studyTermsShorthand
-
-data StudyDegreeTerm = StudyDegreeTerm StudyDegree StudyTerms
-
-instance RenderMessage UniWorX StudyDegreeTerm where
-  renderMessage foundation ls (StudyDegreeTerm deg trm) = (mr trm) <> " (" <> (mr $ ShortStudyDegree deg) <> ")"
-    where
-      mr :: RenderMessage UniWorX msg => msg -> Text
-      mr = renderMessage foundation ls
-  
-newtype ShortStudyFieldType = ShortStudyFieldType StudyFieldType
-embedRenderMessageVariant ''UniWorX ''ShortStudyFieldType ("Short" <>)
-
-data StudyDegreeTermType = StudyDegreeTermType StudyDegree StudyTerms StudyFieldType
-
-instance RenderMessage UniWorX StudyDegreeTermType where
-  renderMessage foundation ls (StudyDegreeTermType deg trm typ) = (mr trm) <> " (" <> (mr $ ShortStudyDegree deg) <> ", " <> (mr $ ShortStudyFieldType typ) <> ")"
-    where
-      mr :: RenderMessage UniWorX msg => msg -> Text
-      mr = renderMessage foundation ls
-
-instance RenderMessage UniWorX ExamGrade where
-  renderMessage _ _ = pack . (showFixed False :: Deci -> String) . fromRational . review numberGrade
-
-instance RenderMessage UniWorX ExamPassed where
-  renderMessage foundation ls = \case
-    ExamPassed True  -> mr MsgExamPassed
-    ExamPassed False -> mr MsgExamNotPassed
-    where
-      mr :: RenderMessage UniWorX msg => msg -> Text
-      mr = renderMessage foundation ls
-
-instance RenderMessage UniWorX a => RenderMessage UniWorX (ExamResult' a) where
-  renderMessage foundation ls = \case
-    ExamAttended{..} -> mr examResult
-    ExamNoShow       -> mr MsgExamResultNoShow
-    ExamVoided       -> mr MsgExamResultVoided
-    where
-      mr :: RenderMessage UniWorX msg => msg -> Text
-      mr = renderMessage foundation ls
-
-instance RenderMessage UniWorX (Either ExamPassed ExamGrade) where
-  renderMessage foundation ls = either mr mr
-    where
-      mr :: RenderMessage UniWorX msg => msg -> Text
-      mr = renderMessage foundation ls
-
--- ToMessage instances for converting raw numbers to Text (no internationalization)
-
-instance ToMessage Int where
-  toMessage = tshow
-instance ToMessage Int64 where
-  toMessage = tshow
-instance ToMessage Integer where
-  toMessage = tshow
-instance ToMessage Natural where
-  toMessage = tshow
-
-instance HasResolution a => ToMessage (Fixed a) where
-  toMessage = toMessage . showFixed True
-
--- Do not use toMessage on Rationals and round them automatically. Instead, use rationalToFixed3 (declared in src/Utils.hs) to convert a Rational to Fixed E3!
--- instance ToMessage Rational where
---   toMessage = toMessage . fromRational'
---     where fromRational' = fromRational :: Rational -> Fixed E3
-
-
-newtype ErrorResponseTitle = ErrorResponseTitle ErrorResponse
-embedRenderMessageVariant ''UniWorX ''ErrorResponseTitle ("ErrorResponseTitle" <>)
-
-newtype UniWorXMessages = UniWorXMessages [SomeMessage UniWorX]
-  deriving (Generic, Typeable)
-  deriving newtype (Semigroup, Monoid, IsList)
-
-instance RenderMessage UniWorX UniWorXMessages where
-  renderMessage foundation ls (UniWorXMessages msgs) =
-    intercalate " " $ map (renderMessage foundation ls) msgs
-
-uniworxMessages :: [UniWorXMessage] -> UniWorXMessages
-uniworxMessages = UniWorXMessages . map SomeMessage
 
 -- Menus and Favourites
 data MenuType = NavbarAside | NavbarRight | NavbarSecondary | PageActionPrime | PageActionSecondary | Footer
diff --git a/src/Foundation/I18n.hs b/src/Foundation/I18n.hs
new file mode 100644
index 000000000..99406decd
--- /dev/null
+++ b/src/Foundation/I18n.hs
@@ -0,0 +1,313 @@
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+module Foundation.I18n
+  ( UniWorXMessage(..)
+  , ShortTermIdentifier(..)
+  , MsgLanguage(..)
+  , ShortSex(..)
+  , SheetTypeHeader(..)
+  , ShortStudyDegree(..)
+  , ShortStudyTerms(..)
+  , StudyDegreeTerm(..)
+  , ShortStudyFieldType(..)
+  , StudyDegreeTermType(..)
+  , ErrorResponseTitle(..)
+  , UniWorXMessages(..)
+  , uniworxMessages
+  ) where
+
+import Foundation.Type
+
+
+import Import.NoFoundation
+
+import Auth.LDAP
+import Auth.PWHash
+import Auth.Dummy
+
+import Data.CaseInsensitive (original, mk)
+
+import qualified Data.Text as Text
+
+import Utils.Form
+
+import Text.Shakespeare.Text (st)
+
+import GHC.Exts (IsList(..))
+
+
+pluralDE :: (Eq a, Num a)
+            =>    a -- ^ Count
+            -> Text -- ^ Singular
+            -> Text -- ^ Plural
+            -> Text
+pluralDE num singularForm pluralForm
+  | num == 1  = singularForm
+  | otherwise = pluralForm
+
+noneOneMoreDE :: (Eq a, Num a)
+            =>    a -- ^ Count
+            -> Text -- ^ None
+            -> Text -- ^ Singular
+            -> Text -- ^ Plural
+            -> Text
+noneOneMoreDE num noneText singularForm pluralForm
+  | num == 0  = noneText
+  | num == 1  = singularForm
+  | otherwise = pluralForm
+
+-- noneMoreDE :: (Eq a, Num a)
+--             =>    a -- ^ Count
+--             -> Text -- ^ None
+--             -> Text -- ^ Some
+--             -> Text
+-- noneMoreDE num noneText someText
+--   | num == 0  = noneText
+--   | otherwise = someText
+
+pluralEN :: (Eq a, Num a)
+            =>    a -- ^ Count
+            -> Text -- ^ Singular
+            -> Text -- ^ Plural
+            -> Text
+pluralEN num singularForm pluralForm
+  | num == 1  = singularForm
+  | otherwise = pluralForm
+
+noneOneMoreEN :: (Eq a, Num a)
+            =>    a -- ^ Count
+            -> Text -- ^ None
+            -> Text -- ^ Singular
+            -> Text -- ^ Plural
+            -> Text
+noneOneMoreEN num noneText singularForm pluralForm
+  | num == 0  = noneText
+  | num == 1  = singularForm
+  | otherwise = pluralForm
+
+-- noneMoreEN :: (Eq a, Num a)
+--             =>    a -- ^ Count
+--             -> Text -- ^ None
+--             -> Text -- ^ Some
+--             -> Text
+-- noneMoreEN num noneText someText
+--   | num == 0  = noneText
+--   | otherwise = someText
+
+ordinalEN :: ToMessage a
+          => a
+          -> Text
+ordinalEN (toMessage -> numStr) = case lastChar of
+  Just '1' -> [st|#{numStr}st|]
+  Just '2' -> [st|#{numStr}nd|]
+  Just '3' -> [st|#{numStr}rd|]
+  _other   -> [st|#{numStr}th|]
+  where
+    lastChar = last <$> fromNullable numStr 
+
+
+-- Convenience Type for Messages, since Yesod messages cannot deal with compound type identifiers
+type IntMaybe  = Maybe Int
+
+-- | Convenience function for i18n messages definitions
+maybeToMessage :: ToMessage m => Text -> Maybe m -> Text -> Text
+maybeToMessage _      Nothing  _     = mempty
+maybeToMessage before (Just x) after = before <> toMessage x <> after
+
+-- Messages creates type UniWorXMessage and RenderMessage UniWorX instance
+mkMessage "UniWorX" "messages/uniworx" "de-de-formal"
+mkMessageVariant "UniWorX" "Campus" "messages/campus" "de"
+mkMessageVariant "UniWorX" "Dummy" "messages/dummy" "de"
+mkMessageVariant "UniWorX" "PWHash" "messages/pw-hash" "de"
+mkMessageVariant "UniWorX" "Button" "messages/button" "de"
+mkMessageVariant "UniWorX" "Frontend" "messages/frontend" "de-de-formal"
+
+instance RenderMessage UniWorX TermIdentifier where
+  renderMessage foundation ls TermIdentifier{..} = case season of
+    Summer -> renderMessage' $ MsgSummerTerm year
+    Winter -> renderMessage' $ MsgWinterTerm year
+    where renderMessage' = renderMessage foundation ls
+
+newtype ShortTermIdentifier = ShortTermIdentifier TermIdentifier
+  deriving stock (Eq, Ord, Read, Show)
+instance RenderMessage UniWorX ShortTermIdentifier where
+  renderMessage foundation ls (ShortTermIdentifier TermIdentifier{..}) = case season of
+    Summer -> renderMessage' $ MsgSummerTermShort year
+    Winter -> renderMessage' $ MsgWinterTermShort year
+    where renderMessage' = renderMessage foundation ls
+
+instance RenderMessage UniWorX String where
+  renderMessage f ls str = renderMessage f ls $ Text.pack str
+
+-- TODO: raw number representation; instead, display e.g. 1000 as 1.000 or 1,000 or ... (language-dependent!)
+instance RenderMessage UniWorX Int where
+  renderMessage f ls = renderMessage f ls . tshow
+instance RenderMessage UniWorX Int64 where
+  renderMessage f ls = renderMessage f ls . tshow
+instance RenderMessage UniWorX Integer where
+  renderMessage f ls = renderMessage f ls . tshow
+instance RenderMessage UniWorX Natural where
+  renderMessage f ls = renderMessage f ls . tshow
+
+instance HasResolution a => RenderMessage UniWorX (Fixed a) where
+  renderMessage f ls = renderMessage f ls . showFixed True
+
+instance RenderMessage UniWorX Load where
+  renderMessage foundation ls = renderMessage foundation ls . \case
+    Load { byTutorial = Nothing   , byProportion = p } -> MsgCorByProportionOnly p
+    Load { byTutorial = Just True , byProportion = p } -> MsgCorByProportionIncludingTutorial p
+    Load { byTutorial = Just False, byProportion = p } -> MsgCorByProportionExcludingTutorial p
+
+newtype MsgLanguage = MsgLanguage Lang
+  deriving stock (Eq, Ord, Show, Read)
+instance RenderMessage UniWorX MsgLanguage where
+  renderMessage foundation ls (MsgLanguage lang@(map mk . Text.splitOn "-" -> lang'))
+    | ("de" : "DE" : _) <- lang' = mr MsgGermanGermany
+    | ("de" : _)        <- lang' = mr MsgGerman
+    | ("en" : "EU" : _) <- lang' = mr MsgEnglishEurope
+    | ("en" : _)        <- lang' = mr MsgEnglish 
+    | otherwise = lang
+    where
+      mr = renderMessage foundation ls
+
+embedRenderMessage ''UniWorX ''MessageStatus ("Message" <>)
+embedRenderMessage ''UniWorX ''NotificationTrigger $ ("NotificationTrigger" <>) . concat . drop 1 . splitCamel
+embedRenderMessage ''UniWorX ''StudyFieldType id
+embedRenderMessage ''UniWorX ''SheetFileType id
+embedRenderMessage ''UniWorX ''SubmissionFileType id
+embedRenderMessage ''UniWorX ''CorrectorState id
+embedRenderMessage ''UniWorX ''RatingException id
+embedRenderMessage ''UniWorX ''SubmissionSinkException ("SubmissionSinkException" <>)
+embedRenderMessage ''UniWorX ''SheetGrading ("SheetGrading" <>)
+embedRenderMessage ''UniWorX ''AuthTag $ ("AuthTag" <>) . concat . drop 1 . splitCamel
+embedRenderMessage ''UniWorX ''EncodedSecretBoxException id
+embedRenderMessage ''UniWorX ''LecturerType id
+embedRenderMessage ''UniWorX ''SubmissionModeDescr
+  $ let verbMap [_, _, "None"] = "NoSubmissions"
+        verbMap [_, _, v] = v <> "Submissions"
+        verbMap _ = error "Invalid number of verbs"
+     in verbMap . splitCamel
+embedRenderMessage ''UniWorX ''UploadModeDescr id
+embedRenderMessage ''UniWorX ''SecretJSONFieldException id
+embedRenderMessage ''UniWorX ''AFormMessage $ concat . drop 2 . splitCamel
+embedRenderMessage ''UniWorX ''SchoolFunction id
+embedRenderMessage ''UniWorX ''CsvPreset id
+embedRenderMessage ''UniWorX ''Quoting ("Csv" <>)
+embedRenderMessage ''UniWorX ''FavouriteReason id
+embedRenderMessage ''UniWorX ''Sex id
+
+embedRenderMessage ''UniWorX ''AuthenticationMode id
+
+newtype ShortSex = ShortSex Sex
+embedRenderMessageVariant ''UniWorX ''ShortSex ("Short" <>)
+
+newtype SheetTypeHeader = SheetTypeHeader SheetType
+embedRenderMessageVariant ''UniWorX ''SheetTypeHeader ("SheetType" <>)
+
+instance RenderMessage UniWorX SheetType where
+  renderMessage foundation ls sheetType = case sheetType of
+      NotGraded -> mr $ SheetTypeHeader NotGraded
+      other -> mr (grading other) <> ", " <> mr (SheetTypeHeader other)
+    where
+      mr :: RenderMessage UniWorX msg => msg -> Text
+      mr = renderMessage foundation ls
+
+instance RenderMessage UniWorX StudyDegree where
+  renderMessage _found _ls StudyDegree{..} = fromMaybe (tshow studyDegreeKey) (studyDegreeName <|> studyDegreeShorthand)
+
+newtype ShortStudyDegree = ShortStudyDegree StudyDegree
+
+instance RenderMessage UniWorX ShortStudyDegree where
+  renderMessage _found _ls (ShortStudyDegree StudyDegree{..}) = fromMaybe (tshow studyDegreeKey) studyDegreeShorthand
+
+instance RenderMessage UniWorX StudyTerms where
+  renderMessage _found _ls StudyTerms{..} = fromMaybe (tshow studyTermsKey) (studyTermsName <|> studyTermsShorthand)
+
+newtype ShortStudyTerms = ShortStudyTerms StudyTerms
+
+instance RenderMessage UniWorX ShortStudyTerms where
+  renderMessage _found _ls (ShortStudyTerms StudyTerms{..}) = fromMaybe (tshow studyTermsKey) studyTermsShorthand
+
+data StudyDegreeTerm = StudyDegreeTerm StudyDegree StudyTerms
+
+instance RenderMessage UniWorX StudyDegreeTerm where
+  renderMessage foundation ls (StudyDegreeTerm deg trm) = mr trm <> " (" <> mr (ShortStudyDegree deg) <> ")"
+    where
+      mr :: RenderMessage UniWorX msg => msg -> Text
+      mr = renderMessage foundation ls
+  
+newtype ShortStudyFieldType = ShortStudyFieldType StudyFieldType
+embedRenderMessageVariant ''UniWorX ''ShortStudyFieldType ("Short" <>)
+
+data StudyDegreeTermType = StudyDegreeTermType StudyDegree StudyTerms StudyFieldType
+
+instance RenderMessage UniWorX StudyDegreeTermType where
+  renderMessage foundation ls (StudyDegreeTermType deg trm typ) = mr trm <> " (" <> mr (ShortStudyDegree deg) <> ", " <> mr (ShortStudyFieldType typ) <> ")"
+    where
+      mr :: RenderMessage UniWorX msg => msg -> Text
+      mr = renderMessage foundation ls
+
+instance RenderMessage UniWorX ExamGrade where
+  renderMessage _ _ = pack . (showFixed False :: Deci -> String) . fromRational . review numberGrade
+
+instance RenderMessage UniWorX ExamPassed where
+  renderMessage foundation ls = \case
+    ExamPassed True  -> mr MsgExamPassed
+    ExamPassed False -> mr MsgExamNotPassed
+    where
+      mr :: RenderMessage UniWorX msg => msg -> Text
+      mr = renderMessage foundation ls
+
+instance RenderMessage UniWorX a => RenderMessage UniWorX (ExamResult' a) where
+  renderMessage foundation ls = \case
+    ExamAttended{..} -> mr examResult
+    ExamNoShow       -> mr MsgExamResultNoShow
+    ExamVoided       -> mr MsgExamResultVoided
+    where
+      mr :: RenderMessage UniWorX msg => msg -> Text
+      mr = renderMessage foundation ls
+
+instance RenderMessage UniWorX (Either ExamPassed ExamGrade) where
+  renderMessage foundation ls = either mr mr
+    where
+      mr :: RenderMessage UniWorX msg => msg -> Text
+      mr = renderMessage foundation ls
+
+-- ToMessage instances for converting raw numbers to Text (no internationalization)
+
+instance ToMessage Int where
+  toMessage = tshow
+instance ToMessage Int64 where
+  toMessage = tshow
+instance ToMessage Integer where
+  toMessage = tshow
+instance ToMessage Natural where
+  toMessage = tshow
+
+instance HasResolution a => ToMessage (Fixed a) where
+  toMessage = toMessage . showFixed True
+
+-- Do not use toMessage on Rationals and round them automatically. Instead, use rationalToFixed3 (declared in src/Utils.hs) to convert a Rational to Fixed E3!
+-- instance ToMessage Rational where
+--   toMessage = toMessage . fromRational'
+--     where fromRational' = fromRational :: Rational -> Fixed E3
+
+
+newtype ErrorResponseTitle = ErrorResponseTitle ErrorResponse
+embedRenderMessageVariant ''UniWorX ''ErrorResponseTitle ("ErrorResponseTitle" <>)
+
+newtype UniWorXMessages = UniWorXMessages [SomeMessage UniWorX]
+  deriving stock (Generic, Typeable)
+  deriving newtype (Semigroup, Monoid)
+
+instance IsList UniWorXMessages where
+  type Item UniWorXMessages = SomeMessage UniWorX
+  fromList = UniWorXMessages
+  toList (UniWorXMessages msgs) = msgs
+
+instance RenderMessage UniWorX UniWorXMessages where
+  renderMessage foundation ls (UniWorXMessages msgs) =
+    Text.unwords $ map (renderMessage foundation ls) msgs
+
+uniworxMessages :: [UniWorXMessage] -> UniWorXMessages
+uniworxMessages = UniWorXMessages . map SomeMessage
diff --git a/src/Foundation/Type.hs b/src/Foundation/Type.hs
new file mode 100644
index 000000000..5b63b9080
--- /dev/null
+++ b/src/Foundation/Type.hs
@@ -0,0 +1,58 @@
+module Foundation.Type
+  ( UniWorX(..)
+  , SMTPPool
+  , _appSettings', _appStatic, _appConnPool, _appSmtpPool, _appLdapPool, _appWidgetMemcached, _appHttpManager, _appLogger, _appLogSettings, _appCryptoIDKey, _appClusterID, _appInstanceID, _appJobState, _appSessionKey, _appSecretBoxKey, _appJSONWebKeySet, _appHealthReport
+  ) where
+
+import Import.NoFoundation
+import Database.Persist.Sql (ConnectionPool)
+
+import qualified Web.ClientSession as ClientSession
+
+import Jobs.Types
+
+import Yesod.Core.Types (Logger)
+
+import Data.Set (Set)
+
+import qualified Crypto.Saltine.Core.SecretBox as SecretBox
+import qualified Jose.Jwk as Jose
+
+import qualified Database.Memcached.Binary.IO as Memcached
+
+
+type SMTPPool = Pool SMTPConnection
+
+-- | The foundation datatype for your application. This can be a good place to
+-- keep settings and values requiring initialization before your application
+-- starts running, such as database connections. Every handler will have
+-- access to the data present here.
+data UniWorX = UniWorX
+    { appSettings'       :: AppSettings
+    , appStatic          :: EmbeddedStatic -- ^ Settings for static file serving.
+    , appConnPool        :: ConnectionPool -- ^ Database connection pool.
+    , appSmtpPool        :: Maybe SMTPPool
+    , appLdapPool        :: Maybe LdapPool
+    , appWidgetMemcached :: Maybe Memcached.Connection -- ^ Actually a proper pool
+    , appHttpManager     :: Manager
+    , appLogger          :: (ReleaseKey, TVar Logger)
+    , appLogSettings     :: TVar LogSettings
+    , appCryptoIDKey     :: CryptoIDKey
+    , appClusterID       :: ClusterId
+    , appInstanceID      :: InstanceId
+    , appJobState        :: TMVar JobState
+    , appSessionKey      :: ClientSession.Key
+    , appSecretBoxKey    :: SecretBox.Key
+    , appJSONWebKeySet   :: Jose.JwkSet
+    , appHealthReport    :: TVar (Set (UTCTime, HealthReport))
+    }
+
+makeLenses_ ''UniWorX
+instance HasInstanceID UniWorX InstanceId where
+  instanceID = _appInstanceID
+instance HasJSONWebKeySet UniWorX Jose.JwkSet where
+  jsonWebKeySet = _appJSONWebKeySet
+instance HasHttpManager UniWorX Manager where
+  httpManager = _appHttpManager
+instance HasAppSettings UniWorX where
+  appSettings = _appSettings'

From 8efd660d7b628ec5c555387fed1d8e40671fcd37 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 14 Nov 2019 13:36:09 +0100
Subject: [PATCH 102/126] chore(gitlab-ci): deploy to uniworx3

---
 .gitlab-ci.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 19ba3fb20..9057a6839 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -212,10 +212,10 @@ yesod:test:
       - $CI_COMMIT_REF_NAME =~ /^v[0-9].*/
   retry: 2
 
-deploy:uniworx4:
+deploy:uniworx3:
   stage: deploy
   script:
-    - ssh -i ~/.ssh/id root@uniworx4.ifi.lmu.de <bin/uniworx
+    - ssh -i ~/.ssh/id root@uniworx3.ifi.lmu.de <bin/uniworx
   needs:
     - yesod:build
     - yesod:test # For sanity
@@ -225,13 +225,10 @@ deploy:uniworx4:
     - apt-get install -y --no-install-recommends openssh-client
     - install -m 0700 -d ~/.ssh
     - install -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts
-    - install -m 0400 ${SSH_PRIVATE_KEY_UNIWORX4} ~/.ssh/id
+    - install -m 0400 ${SSH_PRIVATE_KEY_UNIWORX3} ~/.ssh/id
   dependencies:
     - yesod:build
         
   only:
     variables:
       - $CI_COMMIT_REF_NAME =~ /^v[0-9].*/
-
-  when: manual
-  retry: 2

From cf0bb54cb4e0ffac48abe50f6d042808015d54a8 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 14 Nov 2019 14:40:11 +0100
Subject: [PATCH 103/126] chore(release): 7.22.1

---
 CHANGELOG.md      | 4 ++++
 package-lock.json | 2 +-
 package.json      | 2 +-
 package.yaml      | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c77475fdd..4e540ab75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [7.22.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.22.0...v7.22.1) (2019-11-14)
+
+
+
 ## [7.22.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.21.5...v7.22.0) (2019-11-14)
 
 
diff --git a/package-lock.json b/package-lock.json
index 5beb67181..3eada9a4b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.22.0",
+  "version": "7.22.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 49cf620a0..789af6f59 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.22.0",
+  "version": "7.22.1",
   "description": "",
   "keywords": [],
   "author": "",
diff --git a/package.yaml b/package.yaml
index 04a6230e4..04954ad7f 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name:    uniworx
-version: 7.22.0
+version: 7.22.1
 
 dependencies:
   - base >=4.9.1.0 && <5

From 434c0daa239dc6d502f55be39783edd75c96703e Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Thu, 14 Nov 2019 15:24:45 +0100
Subject: [PATCH 104/126] fix(datepicker): partial focusout and click fix

---
 frontend/src/utils/form/datepicker.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/frontend/src/utils/form/datepicker.js b/frontend/src/utils/form/datepicker.js
index d0f6123b2..c9cba1a8b 100644
--- a/frontend/src/utils/form/datepicker.js
+++ b/frontend/src/utils/form/datepicker.js
@@ -180,20 +180,22 @@ export class Datepicker {
     // change the selected date in the tail.datetime instance if the value of the input element is changed
     this._element.addEventListener('change', setDatepickerDate, { once: true });
 
-    // close the instance on focusout of any element if the target is outside of the instance
+    // close the instance on focusout of any element if another input is focussed that is neither the timepicker nor _element
     window.addEventListener('focusout', event => {
-      const targetIsOutside       = !this.datepickerInstance.dt.contains(event.explicitOriginalTarget);
-      const targetIsNotTimepicker = !this.datepickerInstance.dt.contains(event.relatedTarget);
-      if (targetIsOutside && targetIsNotTimepicker)
+      const hasFocus                = event.relatedTarget !== null;
+      const focussedIsNotTimepicker = !this.datepickerInstance.dt.contains(event.relatedTarget);
+      const focussedIsNotElement    = event.relatedTarget !== this._element;
+      if (hasFocus && focussedIsNotTimepicker && focussedIsNotElement)
         this.datepickerInstance.close();
     });
     
     // close the instance on click on any element outside of the datepicker (except the input element itself)
     window.addEventListener('click', event => {
-      const targetIsOutside    = !this.datepickerInstance.dt.contains(event.target);
+      const targetIsOutside    = !this.datepickerInstance.dt.contains(event.target)
+                                 && event.target !== this.datepickerInstance.dt;
       const targetIsInDocument = window.document.contains(event.target);
-      const targetIsNotInput   = event.target !== this._element;
-      if (targetIsOutside && targetIsInDocument && targetIsNotInput)
+      const targetIsNotElement = event.target !== this._element;
+      if (targetIsOutside && targetIsInDocument && targetIsNotElement)
         this.datepickerInstance.close();
     });
 

From ee0edc7d21393e217f88486be56a9d79f542a510 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Thu, 14 Nov 2019 15:31:51 +0100
Subject: [PATCH 105/126] fix(datepicker): close on focusout of elements in
 document only

---
 frontend/src/utils/form/datepicker.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/utils/form/datepicker.js b/frontend/src/utils/form/datepicker.js
index c9cba1a8b..2c3ad9f61 100644
--- a/frontend/src/utils/form/datepicker.js
+++ b/frontend/src/utils/form/datepicker.js
@@ -185,7 +185,8 @@ export class Datepicker {
       const hasFocus                = event.relatedTarget !== null;
       const focussedIsNotTimepicker = !this.datepickerInstance.dt.contains(event.relatedTarget);
       const focussedIsNotElement    = event.relatedTarget !== this._element;
-      if (hasFocus && focussedIsNotTimepicker && focussedIsNotElement)
+      const focussedIsInDocument    = window.document.contains(event.relatedTarget);
+      if (hasFocus && focussedIsNotTimepicker && focussedIsNotElement && focussedIsInDocument)
         this.datepickerInstance.close();
     });
     

From 069d15abcd4cb811a0aeb07ef1cb55ced97729c1 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Fri, 15 Nov 2019 09:39:47 +0100
Subject: [PATCH 106/126] fix(info-lecturer): translate german headline

---
 templates/i18n/info-lecturer/en-eu.hamlet | 2 +-
 templates/i18n/info-lecturer/en.hamlet    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/i18n/info-lecturer/en-eu.hamlet b/templates/i18n/info-lecturer/en-eu.hamlet
index dfaffdb6a..72221d0f1 100644
--- a/templates/i18n/info-lecturer/en-eu.hamlet
+++ b/templates/i18n/info-lecturer/en-eu.hamlet
@@ -33,7 +33,7 @@ $newline text
         The course description can be composed in Html and
         <em>should contain the module description!
 
-    <dt .deflist__dt> Unterstützung für verschiedene Institute
+    <dt .deflist__dt> Support for Multiple Departments
     <dd .deflist__dd>
       <p>
         ^{newU2WFeat} Uni2work supports managing multiple departments; prefixing course titles with e.g. "[MATH]" are not necessary anymore.
diff --git a/templates/i18n/info-lecturer/en.hamlet b/templates/i18n/info-lecturer/en.hamlet
index 5a6afc414..3ed3b9d02 100644
--- a/templates/i18n/info-lecturer/en.hamlet
+++ b/templates/i18n/info-lecturer/en.hamlet
@@ -33,7 +33,7 @@ $newline text
         The course description can be composed in Html and
         <em>should contain the module description!
 
-    <dt .deflist__dt> Unterstützung für verschiedene Institute
+    <dt .deflist__dt> Support for Multiple Departments
     <dd .deflist__dd>
       <p>
         ^{newU2WFeat} Uni2work supports managing multiple departments; prefixing course titles with e.g. "[MATH]" are not necessary anymore.

From 77f4680749fc7e9dc7248d3b7ab54f7a023b1324 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 15 Nov 2019 14:07:26 +0100
Subject: [PATCH 107/126] chore(changelog): adjust changelog URLs

---
 CHANGELOG.md | 1038 +++++++++++++++++++++++++-------------------------
 package.json |    8 +-
 2 files changed, 523 insertions(+), 523 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e540ab75..bed12c5b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,683 +2,683 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-### [7.22.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.22.0...v7.22.1) (2019-11-14)
+### [7.22.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.22.0...v7.22.1) (2019-11-14)
 
 
 
-## [7.22.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.21.5...v7.22.0) (2019-11-14)
+## [7.22.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.21.5...v7.22.0) (2019-11-14)
 
 
 ### Bug Fixes
 
-* **corrections-grade:** fix inFix ([2c2dd8d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/2c2dd8d))
+* **corrections-grade:** fix inFix ([2c2dd8d](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2c2dd8d))
 
 
 ### Features
 
-* **corrections:** added missing titles; small message fixes ([018082e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/018082e))
-* **corrections-grade:** additional column for sheetType ([4cb2d4f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/4cb2d4f))
-* **corrections-grade:** basic filter UI with pseudonyms ([d03fd4b](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d03fd4b))
-* **corrections-grade:** sorting by sheetType ([702fb1d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/702fb1d))
-* **corrections-grade:** working additional filters ([c4eb2c0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/c4eb2c0))
+* **corrections:** added missing titles; small message fixes ([018082e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/018082e))
+* **corrections-grade:** additional column for sheetType ([4cb2d4f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/4cb2d4f))
+* **corrections-grade:** basic filter UI with pseudonyms ([d03fd4b](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d03fd4b))
+* **corrections-grade:** sorting by sheetType ([702fb1d](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/702fb1d))
+* **corrections-grade:** working additional filters ([c4eb2c0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c4eb2c0))
 
 
 
-### [7.21.5](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.21.4...v7.21.5) (2019-11-13)
+### [7.21.5](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.21.4...v7.21.5) (2019-11-13)
 
 
 
-### [7.21.4](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.21.3...v7.21.4) (2019-11-13)
+### [7.21.4](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.21.3...v7.21.4) (2019-11-13)
 
 
 
-### [7.21.3](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.21.2...v7.21.3) (2019-11-13)
+### [7.21.3](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.21.2...v7.21.3) (2019-11-13)
 
 
 
-### [7.21.2](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.21.1...v7.21.2) (2019-11-12)
+### [7.21.2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.21.1...v7.21.2) (2019-11-12)
 
 
 
-### [7.21.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.21.0...v7.21.1) (2019-11-11)
+### [7.21.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.21.0...v7.21.1) (2019-11-11)
 
 
 
-## [7.21.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.20.0...v7.21.0) (2019-11-08)
+## [7.21.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.20.0...v7.21.0) (2019-11-08)
 
 
 ### Bug Fixes
 
-* build ([5684213](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/5684213))
-* **sheets:** integrate corrector interface into SheetEdit ([acfd312](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/acfd312))
-* improve explanation of multiUserField invitations ([954bb78](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/954bb78))
-* **rating files:** better descriptions & tests ([5f04593](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/5f04593))
-* **submission:** ignore extension case within zips ([f8442cf](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/f8442cf))
+* build ([5684213](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/5684213))
+* **sheets:** integrate corrector interface into SheetEdit ([acfd312](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/acfd312))
+* improve explanation of multiUserField invitations ([954bb78](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/954bb78))
+* **rating files:** better descriptions & tests ([5f04593](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/5f04593))
+* **submission:** ignore extension case within zips ([f8442cf](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f8442cf))
 
 
 ### Features
 
-* better explain behaviour of submittorForm ([b973495](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/b973495))
-* pruning of unreferenced files ([ff161b2](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/ff161b2))
+* better explain behaviour of submittorForm ([b973495](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/b973495))
+* pruning of unreferenced files ([ff161b2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ff161b2))
 
 
 
-## [7.20.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.19.1...v7.20.0) (2019-10-31)
+## [7.20.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.19.1...v7.20.0) (2019-10-31)
 
 
 ### Bug Fixes
 
-* **datepicker:** fix for empty or browser-filled inputs ([3c24e5f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3c24e5f))
-* **fe-i18n-spec:** fix tests ([339fa39](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/339fa39))
-* **i18n:** custom language inference ([205d768](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/205d768))
-* **i18n:** fix typos ([8af256e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/8af256e))
-* **i18n:** get started on i18n-breadcrumbs ([268d9e0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/268d9e0))
-* **i18n:** i18n for all widgets ([3fe278e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3fe278e))
-* **i18n:** i18n in various places ([155ed1d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/155ed1d))
-* **tests:** explicit post parameter name for dummy login ([2ccd50f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/2ccd50f))
-* **tests:** i18n changes ([9ba0e27](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/9ba0e27))
-* fix i18n widget files ([e517a8e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/e517a8e))
-* typos ([b9c284c](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/b9c284c))
-* **i18n:** prepare translation file for en-eu ([281c98f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/281c98f))
-* **i18n:** rename i18nWidgetFiles to proper language code ([33ddbfb](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/33ddbfb))
-* **mail:** use only RFC822-timezones ([59b8bb9](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/59b8bb9))
+* **datepicker:** fix for empty or browser-filled inputs ([3c24e5f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3c24e5f))
+* **fe-i18n-spec:** fix tests ([339fa39](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/339fa39))
+* **i18n:** custom language inference ([205d768](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/205d768))
+* **i18n:** fix typos ([8af256e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/8af256e))
+* **i18n:** get started on i18n-breadcrumbs ([268d9e0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/268d9e0))
+* **i18n:** i18n for all widgets ([3fe278e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3fe278e))
+* **i18n:** i18n in various places ([155ed1d](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/155ed1d))
+* **tests:** explicit post parameter name for dummy login ([2ccd50f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2ccd50f))
+* **tests:** i18n changes ([9ba0e27](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9ba0e27))
+* fix i18n widget files ([e517a8e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e517a8e))
+* typos ([b9c284c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/b9c284c))
+* **i18n:** prepare translation file for en-eu ([281c98f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/281c98f))
+* **i18n:** rename i18nWidgetFiles to proper language code ([33ddbfb](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/33ddbfb))
+* **mail:** use only RFC822-timezones ([59b8bb9](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/59b8bb9))
 
 
 ### Features
 
-* **changelog:** bump ([3d1636f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3d1636f))
-* **glossary:** english glossary ([237c586](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/237c586))
-* **glossary:** more de-de-formal ([7daa42d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/7daa42d))
-* **glossary:** most glossary entries in de-de-formal ([ba7c60e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/ba7c60e))
-* **i18n:** 12h-clock for english locales ([331ba1f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/331ba1f))
-* **i18n:** additional en-eu ([83a458d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/83a458d))
-* **i18n:** basic language switching ([352bdba](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/352bdba))
-* **i18n:** close language select on click anywhere ([97a29ec](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/97a29ec))
-* **i18n:** english imprint ([7b3ed79](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/7b3ed79))
-* **i18n:** english versions of imprint and data-protection ([4ee3ad0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/4ee3ad0))
-* **i18n:** get started on en-eu ([75677dc](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/75677dc))
-* **i18n:** missing message translations; small fixes ([aec4b21](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/aec4b21))
-* **i18n:** more en-eu ([67e40fd](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/67e40fd))
-* **i18n:** more en-eu ([3058737](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3058737))
-* **i18n:** more en-eu ([7c8dbc9](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/7c8dbc9))
-* **i18n:** populate frontend datetime locale from backend settings ([498d616](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/498d616))
-* more en-eu translations; minor fixes in de-de-formal ([870f1df](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/870f1df))
-* **i18n:** store language in user account ([f0f9411](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/f0f9411))
-* **info:** start glossary ([73b0546](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/73b0546))
-* **info-lecturer:** add english translation; minor fixes in german ([a4fc555](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/a4fc555))
+* **changelog:** bump ([3d1636f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3d1636f))
+* **glossary:** english glossary ([237c586](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/237c586))
+* **glossary:** more de-de-formal ([7daa42d](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/7daa42d))
+* **glossary:** most glossary entries in de-de-formal ([ba7c60e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ba7c60e))
+* **i18n:** 12h-clock for english locales ([331ba1f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/331ba1f))
+* **i18n:** additional en-eu ([83a458d](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/83a458d))
+* **i18n:** basic language switching ([352bdba](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/352bdba))
+* **i18n:** close language select on click anywhere ([97a29ec](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/97a29ec))
+* **i18n:** english imprint ([7b3ed79](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/7b3ed79))
+* **i18n:** english versions of imprint and data-protection ([4ee3ad0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/4ee3ad0))
+* **i18n:** get started on en-eu ([75677dc](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/75677dc))
+* **i18n:** missing message translations; small fixes ([aec4b21](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/aec4b21))
+* **i18n:** more en-eu ([67e40fd](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/67e40fd))
+* **i18n:** more en-eu ([3058737](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3058737))
+* **i18n:** more en-eu ([7c8dbc9](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/7c8dbc9))
+* **i18n:** populate frontend datetime locale from backend settings ([498d616](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/498d616))
+* more en-eu translations; minor fixes in de-de-formal ([870f1df](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/870f1df))
+* **i18n:** store language in user account ([f0f9411](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f0f9411))
+* **info:** start glossary ([73b0546](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/73b0546))
+* **info-lecturer:** add english translation; minor fixes in german ([a4fc555](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a4fc555))
 
 
 
-### [7.19.2](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.19.1...v7.19.2) (2019-10-28)
+### [7.19.2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.19.1...v7.19.2) (2019-10-28)
 
 
 ### Bug Fixes
 
-* **datepicker:** fix for empty or browser-filled inputs ([3c24e5f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3c24e5f))
+* **datepicker:** fix for empty or browser-filled inputs ([3c24e5f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3c24e5f))
 
 
 
-### [7.19.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.19.0...v7.19.1) (2019-10-25)
+### [7.19.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.19.0...v7.19.1) (2019-10-25)
 
 
 ### Bug Fixes
 
-* **datepicker:** workaround for new Date(..) inconsistency ([d24ebf8](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d24ebf8))
+* **datepicker:** workaround for new Date(..) inconsistency ([d24ebf8](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d24ebf8))
 
 
 
-## [7.19.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.18.3...v7.19.0) (2019-10-24)
+## [7.19.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.18.3...v7.19.0) (2019-10-24)
 
 
 ### Bug Fixes
 
-* **datepicker:** handle output format when reformatting ([09622bd](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/09622bd))
+* **datepicker:** handle output format when reformatting ([09622bd](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/09622bd))
 
 
 ### Features
 
-* **csv:** encoding ([81415e1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/81415e1))
+* **csv:** encoding ([81415e1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/81415e1))
 
 
 
-### [7.18.3](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.18.2...v7.18.3) (2019-10-23)
+### [7.18.3](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.18.2...v7.18.3) (2019-10-23)
 
 
 ### Bug Fixes
 
-* **submission-form:** fix display of all courseParticipants ([b67819d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/b67819d))
+* **submission-form:** fix display of all courseParticipants ([b67819d](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/b67819d))
 
 
 
-### [7.18.2](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.18.1...v7.18.2) (2019-10-20)
+### [7.18.2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.18.1...v7.18.2) (2019-10-20)
 
 
 
-### [7.18.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.18.0...v7.18.1) (2019-10-20)
+### [7.18.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.18.0...v7.18.1) (2019-10-20)
 
 
 ### Bug Fixes
 
-* **assign-submissions:** avoid division by zero ([640326c](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/640326c))
+* **assign-submissions:** avoid division by zero ([640326c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/640326c))
 
 
 
-## [7.18.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.17.14...v7.18.0) (2019-10-17)
+## [7.18.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.17.14...v7.18.0) (2019-10-17)
 
 
 ### Bug Fixes
 
-* **file-upload-form:** don't check case of file extensions ([6c49c50](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/6c49c50))
-* **user-deregister:** remove tutorial participation ([cfcb28d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/cfcb28d))
+* **file-upload-form:** don't check case of file extensions ([6c49c50](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/6c49c50))
+* **user-deregister:** remove tutorial participation ([cfcb28d](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/cfcb28d))
 
 
 ### Features
 
-* **course-show:** show "not registered" ([96e1a30](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/96e1a30))
+* **course-show:** show "not registered" ([96e1a30](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/96e1a30))
 
 
 
-### [7.17.14](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.17.13...v7.17.14) (2019-10-17)
+### [7.17.14](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.17.13...v7.17.14) (2019-10-17)
 
 
 ### Bug Fixes
 
-* **course-show:** show display-email for correctors & tutors ([a2e3699](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/a2e3699))
+* **course-show:** show display-email for correctors & tutors ([a2e3699](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a2e3699))
 
 
 
-### [7.17.13](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.17.12...v7.17.13) (2019-10-17)
+### [7.17.13](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.17.12...v7.17.13) (2019-10-17)
 
 
 ### Bug Fixes
 
-* **favourites:** clear old favourites when changing max number ([92fb6f2](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/92fb6f2))
+* **favourites:** clear old favourites when changing max number ([92fb6f2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/92fb6f2))
 
 
 
-### [7.17.12](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.17.11...v7.17.12) (2019-10-17)
+### [7.17.12](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.17.11...v7.17.12) (2019-10-17)
 
 
 
-### [7.17.11](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.17.10...v7.17.11) (2019-10-16)
+### [7.17.11](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.17.10...v7.17.11) (2019-10-16)
 
 
 ### Bug Fixes
 
-* **test:** build ([443b871](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/443b871))
+* **test:** build ([443b871](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/443b871))
 
 
 
-### [7.17.10](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.17.9...v7.17.10) (2019-10-16)
+### [7.17.10](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.17.9...v7.17.10) (2019-10-16)
 
 
 ### Bug Fixes
 
-* **tutorials:** improve creation interface ([bc248d0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/bc248d0))
+* **tutorials:** improve creation interface ([bc248d0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/bc248d0))
 
 
 
-### [7.17.9](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.17.8...v7.17.9) (2019-10-16)
+### [7.17.9](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.17.8...v7.17.9) (2019-10-16)
 
 
 ### Bug Fixes
 
-* **rights:** split applicant off participant ([9d709ca](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/9d709ca))
+* **rights:** split applicant off participant ([9d709ca](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9d709ca))
 
 
 
-### [7.17.8](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.17.7...v7.17.8) (2019-10-16)
+### [7.17.8](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.17.7...v7.17.8) (2019-10-16)
 
 
 ### Bug Fixes
 
-* **users:** fix broken email fallback ([f4e9f2c](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/f4e9f2c))
+* **users:** fix broken email fallback ([f4e9f2c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f4e9f2c))
 
 
 
-### [7.17.7](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.17.6...v7.17.7) (2019-10-15)
+### [7.17.7](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.17.6...v7.17.7) (2019-10-15)
 
 
 ### Bug Fixes
 
-* **users:** fallback email to name ([7bf018c](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/7bf018c))
+* **users:** fallback email to name ([7bf018c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/7bf018c))
 
 
 
-### [7.17.6](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.17.5...v7.17.6) (2019-10-15)
+### [7.17.6](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.17.5...v7.17.6) (2019-10-15)
 
 
 ### Bug Fixes
 
-* fallback for determining user email ([6a1a256](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/6a1a256))
+* fallback for determining user email ([6a1a256](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/6a1a256))
 
 
 
-### [7.17.5](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.17.4...v7.17.5) (2019-10-15)
+### [7.17.5](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.17.4...v7.17.5) (2019-10-15)
 
 
 ### Bug Fixes
 
-* occurence exception end times not shown correctly ([725468b](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/725468b))
+* occurence exception end times not shown correctly ([725468b](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/725468b))
 
 
 
-### [7.17.4](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.17.3...v7.17.4) (2019-10-15)
+### [7.17.4](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.17.3...v7.17.4) (2019-10-15)
 
 
 ### Bug Fixes
 
-* **allocations:** fix result notifications ([bb6703d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/bb6703d))
+* **allocations:** fix result notifications ([bb6703d](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/bb6703d))
 
 
 
-### [7.17.3](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.17.2...v7.17.3) (2019-10-14)
+### [7.17.3](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.17.2...v7.17.3) (2019-10-14)
 
 
 
-### [7.17.2](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.17.1...v7.17.2) (2019-10-14)
+### [7.17.2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.17.1...v7.17.2) (2019-10-14)
 
 
 ### Bug Fixes
 
-* **users:** synchronise sex ([25912e0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/25912e0))
+* **users:** synchronise sex ([25912e0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/25912e0))
 
 
 
-### [7.17.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.17.0...v7.17.1) (2019-10-14)
+### [7.17.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.17.0...v7.17.1) (2019-10-14)
 
 
 ### Bug Fixes
 
-* build ([f92e555](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/f92e555))
-* **implementation:** spaces ([53471d1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/53471d1))
+* build ([f92e555](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f92e555))
+* **implementation:** spaces ([53471d1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/53471d1))
 
 
 
-## [7.17.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.16.0...v7.17.0) (2019-10-14)
+## [7.17.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.16.0...v7.17.0) (2019-10-14)
 
 
 ### Features
 
-* **static pages:** touch ups ([d2c0043](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d2c0043))
-* **users:** sex ([c2a8381](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/c2a8381))
+* **static pages:** touch ups ([d2c0043](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d2c0043))
+* **users:** sex ([c2a8381](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c2a8381))
 
 
 
-## [7.16.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.15.0...v7.16.0) (2019-10-14)
+## [7.16.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.15.0...v7.16.0) (2019-10-14)
 
 
 ### Features
 
-* **tutorials:** delegate control to tutors ([261f3ed](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/261f3ed))
+* **tutorials:** delegate control to tutors ([261f3ed](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/261f3ed))
 
 
 
-## [7.15.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.14.1...v7.15.0) (2019-10-13)
+## [7.15.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.14.1...v7.15.0) (2019-10-13)
 
 
 ### Features
 
-* **allocations:** allow additional notifications ([cc20559](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/cc20559))
+* **allocations:** allow additional notifications ([cc20559](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/cc20559))
 
 
 
-### [7.14.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.14.0...v7.14.1) (2019-10-13)
+### [7.14.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.14.0...v7.14.1) (2019-10-13)
 
 
 ### Bug Fixes
 
-* typo ([23f4eb3](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/23f4eb3))
+* typo ([23f4eb3](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/23f4eb3))
 
 
 
-## [7.14.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.13.0...v7.14.0) (2019-10-10)
+## [7.14.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.13.0...v7.14.0) (2019-10-10)
 
 
 ### Features
 
-* **course-users:** allow registering tutorial users manually ([d507d9b](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d507d9b))
-* **course-users:** include tutorial in csv-export ([1d5ddd1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/1d5ddd1))
+* **course-users:** allow registering tutorial users manually ([d507d9b](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d507d9b))
+* **course-users:** include tutorial in csv-export ([1d5ddd1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/1d5ddd1))
 
 
 
-## [7.13.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.12.0...v7.13.0) (2019-10-09)
+## [7.13.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.12.0...v7.13.0) (2019-10-09)
 
 
 ### Features
 
-* bump changelog ([bc674af](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/bc674af))
-* **course:** allow csv-export of all features-of-study ([e60f1b2](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/e60f1b2))
+* bump changelog ([bc674af](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/bc674af))
+* **course:** allow csv-export of all features-of-study ([e60f1b2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e60f1b2))
 
 
 
-## [7.12.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.11.0...v7.12.0) (2019-10-09)
+## [7.12.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.11.0...v7.12.0) (2019-10-09)
 
 
 ### Features
 
-* document CourseEvents ([db224cf](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/db224cf))
+* document CourseEvents ([db224cf](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/db224cf))
 
 
 
-## [7.11.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.10.0...v7.11.0) (2019-10-09)
+## [7.11.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.10.0...v7.11.0) (2019-10-09)
 
 
 ### Bug Fixes
 
-* hlint ([b0b92b4](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/b0b92b4))
-* **async-table:** fix condition for uw-async-table class ([9a87730](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/9a87730))
-* **async-table:** uw-async-table instead of .uw-async-table ([a5d9bfc](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/a5d9bfc))
-* do not add async-table class to empty tables ([b8e2911](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/b8e2911))
-* **datepicker:** insert datepicker after the form ([b590995](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/b590995))
-* **datepicker:** manually add scroll offset based on scroll target ([3ecf834](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3ecf834))
-* **datepicker:** no manual positioning; update tail.datetime ([3cd71d6](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3cd71d6))
+* hlint ([b0b92b4](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/b0b92b4))
+* **async-table:** fix condition for uw-async-table class ([9a87730](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9a87730))
+* **async-table:** uw-async-table instead of .uw-async-table ([a5d9bfc](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a5d9bfc))
+* do not add async-table class to empty tables ([b8e2911](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/b8e2911))
+* **datepicker:** insert datepicker after the form ([b590995](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/b590995))
+* **datepicker:** manually add scroll offset based on scroll target ([3ecf834](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3ecf834))
+* **datepicker:** no manual positioning; update tail.datetime ([3cd71d6](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3cd71d6))
 
 
 ### Features
 
-* **changelog:** bump ([a684b90](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/a684b90))
-* **courses:** course events ([fa7f771](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/fa7f771))
+* **changelog:** bump ([a684b90](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a684b90))
+* **courses:** course events ([fa7f771](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/fa7f771))
 
 
 
-## [7.10.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.9.1...v7.10.0) (2019-10-09)
+## [7.10.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.9.1...v7.10.0) (2019-10-09)
 
 
 ### Bug Fixes
 
-* hlint ([c19f427](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/c19f427))
-* **tooltips:** add dark variants of theme independent colors ([e5c7aa0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/e5c7aa0))
+* hlint ([c19f427](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c19f427))
+* **tooltips:** add dark variants of theme independent colors ([e5c7aa0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e5c7aa0))
 
 
 ### Features
 
-* **course:** csv export of course participants ([9a28dc8](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/9a28dc8))
-* **courses:** add NotificationCourseRegistered ([3750da8](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3750da8))
-* **info-lecturer:** add expiry time for newFeat ([fa9e6b5](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/fa9e6b5))
-* **info-lecturer:** add inline newU2W icons ([5a49feb](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/5a49feb))
-* **info-lecturer:** add newU2W icons on info page ([9f02ef0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/9f02ef0))
-* **info-lecturer:** minor adjustments ([64b391a](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/64b391a))
-* **info-lecturer:** more bullhorns ([4a5e7d9](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/4a5e7d9))
-* **info-lecturer:** remove "news" section ([cb1e3a6](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/cb1e3a6))
-* **lecturer-info:** add planned features icon; update info ([a4068b4](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/a4068b4))
-* **lecturer-info:** fix typos, add info (adding tutorial participants) ([5139825](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/5139825))
-* **lecturer-info:** replaced icons with icon-tooltips; edited text ([2ca7085](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/2ca7085))
-* **tooltip:** added test warning to admin test page ([885efd3](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/885efd3))
-* **tooltips:** add auto unzip and multiFileField tooltips ([276dcb6](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/276dcb6))
-* **tooltips:** add option for inline tooltips ([0b2e931](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/0b2e931))
-* **tooltips:** replace tooltips ([3b0e1d5](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3b0e1d5))
-* **tooltips:** tooltips from messages ([f85ab69](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/f85ab69))
+* **course:** csv export of course participants ([9a28dc8](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9a28dc8))
+* **courses:** add NotificationCourseRegistered ([3750da8](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3750da8))
+* **info-lecturer:** add expiry time for newFeat ([fa9e6b5](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/fa9e6b5))
+* **info-lecturer:** add inline newU2W icons ([5a49feb](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/5a49feb))
+* **info-lecturer:** add newU2W icons on info page ([9f02ef0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9f02ef0))
+* **info-lecturer:** minor adjustments ([64b391a](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/64b391a))
+* **info-lecturer:** more bullhorns ([4a5e7d9](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/4a5e7d9))
+* **info-lecturer:** remove "news" section ([cb1e3a6](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/cb1e3a6))
+* **lecturer-info:** add planned features icon; update info ([a4068b4](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a4068b4))
+* **lecturer-info:** fix typos, add info (adding tutorial participants) ([5139825](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/5139825))
+* **lecturer-info:** replaced icons with icon-tooltips; edited text ([2ca7085](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2ca7085))
+* **tooltip:** added test warning to admin test page ([885efd3](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/885efd3))
+* **tooltips:** add auto unzip and multiFileField tooltips ([276dcb6](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/276dcb6))
+* **tooltips:** add option for inline tooltips ([0b2e931](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/0b2e931))
+* **tooltips:** replace tooltips ([3b0e1d5](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3b0e1d5))
+* **tooltips:** tooltips from messages ([f85ab69](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f85ab69))
 
 
 
-### [7.9.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.9.0...v7.9.1) (2019-10-07)
+### [7.9.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.9.0...v7.9.1) (2019-10-07)
 
 
 ### Bug Fixes
 
-* allow deregistering from full courses ([d7e1e67](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d7e1e67))
+* allow deregistering from full courses ([d7e1e67](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d7e1e67))
 
 
 
-## [7.9.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.8.5...v7.9.0) (2019-10-05)
+## [7.9.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.8.5...v7.9.0) (2019-10-05)
 
 
 ### Features
 
-* **allocations:** show more information ([b7c54df](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/b7c54df))
+* **allocations:** show more information ([b7c54df](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/b7c54df))
 
 
 
-### [7.8.5](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.8.4...v7.8.5) (2019-10-05)
+### [7.8.5](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.8.4...v7.8.5) (2019-10-05)
 
 
 ### Bug Fixes
 
-* fix form-notification styling ([0226593](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/0226593))
+* fix form-notification styling ([0226593](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/0226593))
 
 
 
-### [7.8.4](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.8.3...v7.8.4) (2019-10-05)
+### [7.8.4](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.8.3...v7.8.4) (2019-10-05)
 
 
 ### Bug Fixes
 
-* **course-user:** handle allocations when deregistering single users ([ef5bb70](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/ef5bb70))
+* **course-user:** handle allocations when deregistering single users ([ef5bb70](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ef5bb70))
 
 
 
-### [7.8.3](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.8.2...v7.8.3) (2019-10-05)
+### [7.8.3](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.8.2...v7.8.3) (2019-10-05)
 
 
 ### Bug Fixes
 
-* typo ([a6e40f1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/a6e40f1))
+* typo ([a6e40f1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a6e40f1))
 
 
 
-### [7.8.2](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.8.1...v7.8.2) (2019-10-04)
+### [7.8.2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.8.1...v7.8.2) (2019-10-04)
 
 
 ### Bug Fixes
 
-* **favourites:** always move current course up ([56d89d7](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/56d89d7))
+* **favourites:** always move current course up ([56d89d7](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/56d89d7))
 
 
 
-### [7.8.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.8.0...v7.8.1) (2019-10-04)
+### [7.8.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.8.0...v7.8.1) (2019-10-04)
 
 
 ### Bug Fixes
 
-* **allocation:** fix allocation-results notifications ([ed700a3](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/ed700a3))
+* **allocation:** fix allocation-results notifications ([ed700a3](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ed700a3))
 
 
 
-## [7.8.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.7.0...v7.8.0) (2019-10-04)
+## [7.8.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.7.0...v7.8.0) (2019-10-04)
 
 
 ### Bug Fixes
 
-* ordinalPriorities ([d4ab6f6](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d4ab6f6))
+* ordinalPriorities ([d4ab6f6](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d4ab6f6))
 
 
 ### Features
 
-* **course:** show direct registration dates ([8f284ac](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/8f284ac))
+* **course:** show direct registration dates ([8f284ac](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/8f284ac))
 
 
 
-## [7.7.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.6.0...v7.7.0) (2019-10-04)
+## [7.7.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.6.0...v7.7.0) (2019-10-04)
 
 
 ### Features
 
-* **allocations:** fingerprints & ordinal ratings ([60603cb](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/60603cb))
+* **allocations:** fingerprints & ordinal ratings ([60603cb](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/60603cb))
 
 
 
-## [7.6.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.5.0...v7.6.0) (2019-10-04)
+## [7.6.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.5.0...v7.6.0) (2019-10-04)
 
 
 ### Features
 
-* **allocations:** notification about finished allocation ([9323220](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/9323220))
-* **allocations:** properly save allocation-relevant course-deregs ([7a759b1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/7a759b1))
-* **favourites:** usability improvements ([fccc2ea](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/fccc2ea))
+* **allocations:** notification about finished allocation ([9323220](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9323220))
+* **allocations:** properly save allocation-relevant course-deregs ([7a759b1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/7a759b1))
+* **favourites:** usability improvements ([fccc2ea](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/fccc2ea))
 
 
 
-## [7.5.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.4.2...v7.5.0) (2019-10-03)
+## [7.5.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.4.2...v7.5.0) (2019-10-03)
 
 
 ### Features
 
-* **allocations:** auxilliaries for allocation-algo ([47bfd8d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/47bfd8d))
-* **allocations:** prototype assignment-algorithm ([0fcf48c](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/0fcf48c))
+* **allocations:** auxilliaries for allocation-algo ([47bfd8d](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/47bfd8d))
+* **allocations:** prototype assignment-algorithm ([0fcf48c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/0fcf48c))
 
 
 
-### [7.4.2](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.4.1...v7.4.2) (2019-10-01)
+### [7.4.2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.4.1...v7.4.2) (2019-10-01)
 
 
 ### Bug Fixes
 
-* **course-news:** prevent display of edit-functions unless auth'ed ([89cc9ad](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/89cc9ad))
+* **course-news:** prevent display of edit-functions unless auth'ed ([89cc9ad](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/89cc9ad))
 
 
 
-### [7.4.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.4.0...v7.4.1) (2019-10-01)
+### [7.4.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.4.0...v7.4.1) (2019-10-01)
 
 
 ### Bug Fixes
 
-* **course-news:** fix permissions ([9e5fde9](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/9e5fde9))
+* **course-news:** fix permissions ([9e5fde9](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9e5fde9))
 
 
 
-## [7.4.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.3.2...v7.4.0) (2019-10-01)
+## [7.4.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.3.2...v7.4.0) (2019-10-01)
 
 
 ### Features
 
-* **course:** introduce CourseNews ([aa93b75](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/aa93b75))
+* **course:** introduce CourseNews ([aa93b75](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/aa93b75))
 
 
 
-### [7.3.2](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.3.1...v7.3.2) (2019-10-01)
+### [7.3.2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.3.1...v7.3.2) (2019-10-01)
 
 
 ### Bug Fixes
 
-* **exam-users:** make csv import much more lenient ([2ddb566](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/2ddb566))
-* **mail:** honor userCsvOptions and userDisplayEmail ([89adf7f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/89adf7f))
+* **exam-users:** make csv import much more lenient ([2ddb566](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2ddb566))
+* **mail:** honor userCsvOptions and userDisplayEmail ([89adf7f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/89adf7f))
 
 
 
-### [7.3.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.3.0...v7.3.1) (2019-09-30)
+### [7.3.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.3.0...v7.3.1) (2019-09-30)
 
 
 ### Bug Fixes
 
-* **course-edit:** edit courses without being school-wide lecturer ([d7d1f27](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d7d1f27)), closes [#464](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/464)
+* **course-edit:** edit courses without being school-wide lecturer ([d7d1f27](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d7d1f27)), closes [#464](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/464)
 
 
 
-## [7.3.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.2.2...v7.3.0) (2019-09-30)
+## [7.3.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.2.2...v7.3.0) (2019-09-30)
 
 
 ### Bug Fixes
 
-* **course-application:** better display of priorities ([64f7715](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/64f7715))
+* **course-application:** better display of priorities ([64f7715](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/64f7715))
 
 
 ### Features
 
-* **csv:** allow customisation of csv-export-options ([95ceedd](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/95ceedd))
+* **csv:** allow customisation of csv-export-options ([95ceedd](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/95ceedd))
 
 
 
-### [7.2.2](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.2.1...v7.2.2) (2019-09-30)
+### [7.2.2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.2.1...v7.2.2) (2019-09-30)
 
 
 ### Bug Fixes
 
-* **authorisation:** keep showing allocations (ro) to lecturers ([c8e1d51](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/c8e1d51))
+* **authorisation:** keep showing allocations (ro) to lecturers ([c8e1d51](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c8e1d51))
 
 
 
-### [7.2.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.2.0...v7.2.1) (2019-09-28)
+### [7.2.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.2.0...v7.2.1) (2019-09-28)
 
 
 ### Bug Fixes
 
-* fix build ([69f4a80](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/69f4a80))
-* fix tutorial registration group applying globally ([d2ba173](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d2ba173))
+* fix build ([69f4a80](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/69f4a80))
+* fix tutorial registration group applying globally ([d2ba173](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d2ba173))
 
 
 
-## [7.2.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.1.2...v7.2.0) (2019-09-27)
+## [7.2.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.1.2...v7.2.0) (2019-09-27)
 
 
 ### Bug Fixes
 
-* bump changelog ([60a7bb2](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/60a7bb2))
-* don't treat ExamBonusManual as override ([16abcd2](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/16abcd2))
+* bump changelog ([60a7bb2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/60a7bb2))
+* don't treat ExamBonusManual as override ([16abcd2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/16abcd2))
 
 
 ### Features
 
-* **course-applications:** automatic acceptance of direct applicants ([620950d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/620950d))
+* **course-applications:** automatic acceptance of direct applicants ([620950d](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/620950d))
 
 
 
-### [7.1.2](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.1.1...v7.1.2) (2019-09-26)
+### [7.1.2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.1.1...v7.1.2) (2019-09-26)
 
 
 ### Bug Fixes
 
-* **exams:** include bonus points in sum for exam participants ([2bc6894](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/2bc6894))
+* **exams:** include bonus points in sum for exam participants ([2bc6894](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2bc6894))
 
 
 
-### [7.1.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.1.0...v7.1.1) (2019-09-26)
+### [7.1.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.1.0...v7.1.1) (2019-09-26)
 
 
 ### Bug Fixes
 
-* fix build ([d13ace4](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d13ace4))
+* fix build ([d13ace4](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d13ace4))
 
 
 
-## [7.1.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.0.0...v7.1.0) (2019-09-26)
+## [7.1.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.0.0...v7.1.0) (2019-09-26)
 
 
 ### Bug Fixes
 
-* **datepicker:** select time from preselected date on edit ([d3375bb](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d3375bb))
-* **jobs:** cleaner shutdown of job-pool-manager ([adc8d46](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/adc8d46))
+* **datepicker:** select time from preselected date on edit ([d3375bb](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d3375bb))
+* **jobs:** cleaner shutdown of job-pool-manager ([adc8d46](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/adc8d46))
 
 
 ### Features
 
-* **exams:** re-introduce ExamBonusManual ([54e94a6](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/54e94a6))
+* **exams:** re-introduce ExamBonusManual ([54e94a6](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/54e94a6))
 
 
 
-## [7.0.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v6.11.1...v7.0.0) (2019-09-25)
+## [7.0.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v6.11.1...v7.0.0) (2019-09-25)
 
 
 ### Bug Fixes
 
-* fix startup on unix-socket ([39f1295](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/39f1295))
-* improve async behaviour ([cc7a528](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/cc7a528))
-* make migration idempotent again ([9778404](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/9778404))
-* restore behaviour of waiting asynchronously for job-management ([5ebcd89](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/5ebcd89))
-* **communication:** make communication form more intuitive ([7a2b972](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/7a2b972)), closes [#387](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/387)
-* fix migration ([d2478a3](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d2478a3))
-* fix migration & tests ([e05ea8e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/e05ea8e))
-* migration ([4383eb1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/4383eb1))
-* syntax ([7afd569](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/7afd569))
-* **migration:** drop more tables in w.a. for inconsistent 21→22 ([d79dca6](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d79dca6))
-* typo ([fb1e42d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/fb1e42d))
+* fix startup on unix-socket ([39f1295](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/39f1295))
+* improve async behaviour ([cc7a528](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/cc7a528))
+* make migration idempotent again ([9778404](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9778404))
+* restore behaviour of waiting asynchronously for job-management ([5ebcd89](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/5ebcd89))
+* **communication:** make communication form more intuitive ([7a2b972](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/7a2b972)), closes [#387](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/387)
+* fix migration ([d2478a3](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d2478a3))
+* fix migration & tests ([e05ea8e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e05ea8e))
+* migration ([4383eb1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/4383eb1))
+* syntax ([7afd569](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/7afd569))
+* **migration:** drop more tables in w.a. for inconsistent 21→22 ([d79dca6](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d79dca6))
+* typo ([fb1e42d](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/fb1e42d))
 
 
 ### chore
 
-* bump versions ([67e3b38](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/67e3b38))
+* bump versions ([67e3b38](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/67e3b38))
 
 
 ### Features
 
-* **course:** additional crosslinking ([5eaba78](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/5eaba78))
-* **exam-users:** document part-* family of columns ([fe07a22](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/fe07a22))
-* **exams:** accept/reset computed results ([72342f1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/72342f1))
-* **exams:** automatically compute examResults ([ea5a398](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/ea5a398))
-* **exams:** better display exam-result-information ([0ebda4d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/0ebda4d))
-* **exams:** csv-import of ExamPartResults ([29f4e28](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/29f4e28))
-* **exams:** implement rounding of exambonus ([e97cd56](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/e97cd56))
-* **exams:** refine exam form ([014a17a](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/014a17a))
+* **course:** additional crosslinking ([5eaba78](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/5eaba78))
+* **exam-users:** document part-* family of columns ([fe07a22](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/fe07a22))
+* **exams:** accept/reset computed results ([72342f1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/72342f1))
+* **exams:** automatically compute examResults ([ea5a398](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ea5a398))
+* **exams:** better display exam-result-information ([0ebda4d](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/0ebda4d))
+* **exams:** csv-import of ExamPartResults ([29f4e28](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/29f4e28))
+* **exams:** implement rounding of exambonus ([e97cd56](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e97cd56))
+* **exams:** refine exam form ([014a17a](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/014a17a))
 
 
 ### BREAKING CHANGES
@@ -689,230 +689,230 @@ All notable changes to this project will be documented in this file. See [standa
 
 
 
-### [6.11.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v6.11.0...v6.11.1) (2019-09-17)
+### [6.11.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v6.11.0...v6.11.1) (2019-09-17)
 
 
 ### Bug Fixes
 
-* **changelog:** update changelog ([fa5358a](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/fa5358a))
+* **changelog:** update changelog ([fa5358a](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/fa5358a))
 
 
 
-## [6.11.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v6.10.0...v6.11.0) (2019-09-16)
+## [6.11.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v6.10.0...v6.11.0) (2019-09-16)
 
 
 ### Bug Fixes
 
-* **course:** add links between users & applications ([edaca1b](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/edaca1b))
-* **exam-office:** better logic for isSynced ([cb9ff32](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/cb9ff32))
-* **exams:** make examClosed a button ([530a8c6](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/530a8c6))
+* **course:** add links between users & applications ([edaca1b](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/edaca1b))
+* **exam-office:** better logic for isSynced ([cb9ff32](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/cb9ff32))
+* **exams:** make examClosed a button ([530a8c6](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/530a8c6))
 
 
 ### Features
 
-* **exam-office:** course/user opt-outs ([484fa1c](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/484fa1c))
-* **exam-office:** exam-office permissions by courseSchool ([5841a7b](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/5841a7b))
-* **exam-office:** exams list ([651f0bc](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/651f0bc))
-* **exam-office:** grade export ([72a7f6e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/72a7f6e))
-* **exam-office:** notifications ([52e1844](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/52e1844))
-* **exam-office:** show exam(Occurrence) end-time ([b638783](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/b638783))
-* **exam-office:** subscription management for users & fields ([f75cc64](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/f75cc64))
-* **exam-office:** user invitations ([123970a](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/123970a))
+* **exam-office:** course/user opt-outs ([484fa1c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/484fa1c))
+* **exam-office:** exam-office permissions by courseSchool ([5841a7b](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/5841a7b))
+* **exam-office:** exams list ([651f0bc](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/651f0bc))
+* **exam-office:** grade export ([72a7f6e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/72a7f6e))
+* **exam-office:** notifications ([52e1844](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/52e1844))
+* **exam-office:** show exam(Occurrence) end-time ([b638783](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/b638783))
+* **exam-office:** subscription management for users & fields ([f75cc64](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f75cc64))
+* **exam-office:** user invitations ([123970a](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/123970a))
 
 
 
-## [6.10.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v6.9.0...v6.10.0) (2019-09-13)
+## [6.10.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v6.9.0...v6.10.0) (2019-09-13)
 
 
 ### Features
 
-* **exams:** notifications wrt. registration ([ae27ff0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/ae27ff0))
+* **exams:** notifications wrt. registration ([ae27ff0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ae27ff0))
 
 
 
-## [6.9.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v6.8.0...v6.9.0) (2019-09-12)
+## [6.9.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v6.8.0...v6.9.0) (2019-09-12)
 
 
 ### Features
 
-* **users:** allow customisation of displayed email address ([2f38278](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/2f38278)), closes [#459](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/459)
-* **users:** allow customisation of userDisplayName ([a85f317](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/a85f317)), closes [#346](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/346)
+* **users:** allow customisation of displayed email address ([2f38278](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2f38278)), closes [#459](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/459)
+* **users:** allow customisation of userDisplayName ([a85f317](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a85f317)), closes [#346](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/346)
 
 
 
-## [6.8.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v6.7.0...v6.8.0) (2019-09-12)
+## [6.8.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v6.7.0...v6.8.0) (2019-09-12)
 
 
 ### Bug Fixes
 
-* **allocations:** better explain capped allocation bounds ([a890e34](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/a890e34))
+* **allocations:** better explain capped allocation bounds ([a890e34](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a890e34))
 
 
 ### Features
 
-* **allocations:** allow changing course capacity during allocation ([83e1c94](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/83e1c94))
-* **allocations:** show bounds on assignments due to allocation ([91b249e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/91b249e))
+* **allocations:** allow changing course capacity during allocation ([83e1c94](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/83e1c94))
+* **allocations:** show bounds on assignments due to allocation ([91b249e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/91b249e))
 
 
 
-## [6.7.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v6.6.0...v6.7.0) (2019-09-12)
+## [6.7.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v6.6.0...v6.7.0) (2019-09-12)
 
 
 ### Bug Fixes
 
-* **datepicker:** increase datepicker z-index in modals ([593a6a7](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/593a6a7))
-* **datepicker:** quickfix to fix datepicker position in modals ([3f9454a](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3f9454a))
-* **submission-users:** properly delete old invitations ([91c926b](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/91c926b))
+* **datepicker:** increase datepicker z-index in modals ([593a6a7](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/593a6a7))
+* **datepicker:** quickfix to fix datepicker position in modals ([3f9454a](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3f9454a))
+* **submission-users:** properly delete old invitations ([91c926b](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/91c926b))
 
 
 ### Features
 
-* **admin-users:** allow adding users ([67f1201](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/67f1201))
-* **health:** timeout all health checks ([33338cd](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/33338cd))
-* **invitations:** additional explanation for new users ([bb9c34f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/bb9c34f))
+* **admin-users:** allow adding users ([67f1201](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/67f1201))
+* **health:** timeout all health checks ([33338cd](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/33338cd))
+* **invitations:** additional explanation for new users ([bb9c34f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/bb9c34f))
 
 
 
-## [6.6.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v6.5.0...v6.6.0) (2019-09-09)
+## [6.6.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v6.5.0...v6.6.0) (2019-09-09)
 
 
 ### Bug Fixes
 
-* **audit:** add missing submission edit ([537e66e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/537e66e))
-* **campus-login:** add i18n for ident placeholder ([692e533](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/692e533)), closes [#417](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/417)
-* **course-edit:** improve instructions ([9d53730](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/9d53730))
-* fix tests ([a671937](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/a671937))
-* inherit authorization of CAddUserR in more places ([3391904](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3391904))
-* typo ([fc5ffb7](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/fc5ffb7))
-* **file-upload:** fix inverted logic for when upload is required ([3868e8f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3868e8f))
+* **audit:** add missing submission edit ([537e66e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/537e66e))
+* **campus-login:** add i18n for ident placeholder ([692e533](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/692e533)), closes [#417](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/417)
+* **course-edit:** improve instructions ([9d53730](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9d53730))
+* fix tests ([a671937](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a671937))
+* inherit authorization of CAddUserR in more places ([3391904](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3391904))
+* typo ([fc5ffb7](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/fc5ffb7))
+* **file-upload:** fix inverted logic for when upload is required ([3868e8f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3868e8f))
 
 
 ### Features
 
-* **course-edit:** warn about long shorthands ([80cb16a](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/80cb16a))
-* **forms:** allow customisation of user-facing datalist values ([412ce98](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/412ce98))
-* **forms:** show studyFeaturesField in studyFeaturesFieldFor ([b7496f9](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/b7496f9)), closes [#451](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/451)
+* **course-edit:** warn about long shorthands ([80cb16a](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/80cb16a))
+* **forms:** allow customisation of user-facing datalist values ([412ce98](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/412ce98))
+* **forms:** show studyFeaturesField in studyFeaturesFieldFor ([b7496f9](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/b7496f9)), closes [#451](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/451)
 
 
 
-## [6.5.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v6.4.0...v6.5.0) (2019-09-05)
+## [6.5.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v6.4.0...v6.5.0) (2019-09-05)
 
 
 ### Bug Fixes
 
-* **course-edit:** expand rights of allocation admins ([7f2dd78](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/7f2dd78))
-* **jobs:** implement job priorities ([e29f042](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/e29f042))
+* **course-edit:** expand rights of allocation admins ([7f2dd78](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/7f2dd78))
+* **jobs:** implement job priorities ([e29f042](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e29f042))
 
 
 ### Features
 
-* **allocation-list:** show numbers of avail. and applied-to courses ([a3f236c](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/a3f236c))
+* **allocation-list:** show numbers of avail. and applied-to courses ([a3f236c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a3f236c))
 
 
 
-## [6.4.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v6.3.0...v6.4.0) (2019-09-05)
+## [6.4.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v6.3.0...v6.4.0) (2019-09-05)
 
 
 ### Bug Fixes
 
-* **allocations:** don't show all allocation information to lecturers ([ad6c503](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/ad6c503))
+* **allocations:** don't show all allocation information to lecturers ([ad6c503](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ad6c503))
 
 
 ### Features
 
-* **changelog:** prettify date formatting ([2b3aef7](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/2b3aef7))
+* **changelog:** prettify date formatting ([2b3aef7](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2b3aef7))
 
 
 
-## [6.3.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v6.2.1...v6.3.0) (2019-09-05)
+## [6.3.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v6.2.1...v6.3.0) (2019-09-05)
 
 
 ### Bug Fixes
 
-* fix build ([1a66716](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/1a66716))
+* fix build ([1a66716](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/1a66716))
 
 
 ### Features
 
-* **allocations:** notifications ([6d52ed5](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/6d52ed5))
+* **allocations:** notifications ([6d52ed5](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/6d52ed5))
 
 
 
-### [6.2.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v6.2.0...v6.2.1) (2019-09-04)
+### [6.2.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v6.2.0...v6.2.1) (2019-09-04)
 
 
 ### Bug Fixes
 
-* **course-edit:** show old allocation ([fc53497](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/fc53497)), closes [#450](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/450)
+* **course-edit:** show old allocation ([fc53497](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/fc53497)), closes [#450](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/450)
 
 
 
-## [6.2.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v6.1.0...v6.2.0) (2019-09-02)
+## [6.2.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v6.1.0...v6.2.0) (2019-09-02)
 
 
 ### Bug Fixes
 
-* **datepicker:** removes idle cancel and submit buttons ([805676f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/805676f))
+* **datepicker:** removes idle cancel and submit buttons ([805676f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/805676f))
 
 
 ### Features
 
-* **users:** ldap-synchronise arbitrary subsets of users ([0789536](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/0789536))
+* **users:** ldap-synchronise arbitrary subsets of users ([0789536](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/0789536))
 
 
 
-## [6.1.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v6.0.0...v6.1.0) (2019-08-30)
+## [6.1.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v6.0.0...v6.1.0) (2019-08-30)
 
 
 ### Bug Fixes
 
-* **async-table:** update legacy call to datepicker ([d56e12d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d56e12d))
+* **async-table:** update legacy call to datepicker ([d56e12d](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d56e12d))
 
 
 ### Features
 
-* **ldap:** manually trigger ldap sync ([83afb6f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/83afb6f))
+* **ldap:** manually trigger ldap sync ([83afb6f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/83afb6f))
 
 
 
-## [6.0.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v5.5.0...v6.0.0) (2019-08-30)
+## [6.0.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v5.5.0...v6.0.0) (2019-08-30)
 
 
 ### Bug Fixes
 
-* **datepicker:** fix selecting date from manual input in internal format ([8bdcc92](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/8bdcc92))
-* **datepicker:** format time on copy paste as well ([99d9efa](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/99d9efa))
+* **datepicker:** fix selecting date from manual input in internal format ([8bdcc92](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/8bdcc92))
+* **datepicker:** format time on copy paste as well ([99d9efa](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/99d9efa))
 
 
 ### Features
 
-* **allocations:** additional info and explanation for participants ([38949cf](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/38949cf))
-* **crontab:** cronjob for pruning expired invitations ([a9c5276](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/a9c5276))
-* **datepicker:** add option to change the position of the datepicker ([85f46ef](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/85f46ef))
-* **datepicker:** also parse manual input in internal format ([8a3ac72](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/8a3ac72))
-* **datepicker:** close datepicker on click outside ([88a6b85](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/88a6b85))
-* **datepicker:** close datepicker on escape keydown ([0e5707a](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/0e5707a))
-* **datepicker:** currently broken version using tail.datetime instead ([4282554](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/4282554))
-* **datepicker:** define instance collection singleton ([f5636b8](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/f5636b8))
-* **datepicker:** display datepicker on the right ([cbb7e95](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/cbb7e95))
-* **datepicker:** do not replace value if input is no valid date ([ecab0ac](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/ecab0ac))
-* **datepicker:** format according to input type; position datepicker ([db345ee](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/db345ee))
-* **datepicker:** format any dates before submission ([1eccb0e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/1eccb0e))
-* **datepicker:** format time on submit ([9f8749c](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/9f8749c))
-* **datepicker:** formatting dates for mass-inputs ([b9fd4d7](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/b9fd4d7))
-* **datepicker:** helper functions and updated tail.datetime fork ([2512d69](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/2512d69))
-* **datepicker:** more sane datetime config ([5a44263](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/5a44263))
-* **datepicker:** new approach stub for formatting dates in formdata ([9ea7b2e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/9ea7b2e))
-* **datepicker:** only update datepicker date if date is valid ([d857af3](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d857af3))
-* **datepicker:** switch to tail.datetime fork to fix time selection ([863971f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/863971f))
-* **datepicker:** update dependencies ([427ffbf](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/427ffbf))
-* **invitations:** save expiresAt to DB ([1c2f2b7](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/1c2f2b7))
-* **ldap:** automatically synchronise user data from ldap ([b39ba8b](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/b39ba8b))
-* **navigate-away-prompt:** prompt on actual value change only ([293ab6d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/293ab6d))
-* **schools:** implement cru ([18ae28a](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/18ae28a))
-* **user-schools:** allow users to override automatic school assoc' ([7d927fd](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/7d927fd))
-* **user-schools:** automatically assign users to schools ([12067de](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/12067de))
-* **users:** generalise UserLecturer and UserAdmin to UserFunction ([76f8da5](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/76f8da5)), closes [#320](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/320)
+* **allocations:** additional info and explanation for participants ([38949cf](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/38949cf))
+* **crontab:** cronjob for pruning expired invitations ([a9c5276](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a9c5276))
+* **datepicker:** add option to change the position of the datepicker ([85f46ef](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/85f46ef))
+* **datepicker:** also parse manual input in internal format ([8a3ac72](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/8a3ac72))
+* **datepicker:** close datepicker on click outside ([88a6b85](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/88a6b85))
+* **datepicker:** close datepicker on escape keydown ([0e5707a](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/0e5707a))
+* **datepicker:** currently broken version using tail.datetime instead ([4282554](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/4282554))
+* **datepicker:** define instance collection singleton ([f5636b8](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f5636b8))
+* **datepicker:** display datepicker on the right ([cbb7e95](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/cbb7e95))
+* **datepicker:** do not replace value if input is no valid date ([ecab0ac](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ecab0ac))
+* **datepicker:** format according to input type; position datepicker ([db345ee](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/db345ee))
+* **datepicker:** format any dates before submission ([1eccb0e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/1eccb0e))
+* **datepicker:** format time on submit ([9f8749c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9f8749c))
+* **datepicker:** formatting dates for mass-inputs ([b9fd4d7](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/b9fd4d7))
+* **datepicker:** helper functions and updated tail.datetime fork ([2512d69](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2512d69))
+* **datepicker:** more sane datetime config ([5a44263](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/5a44263))
+* **datepicker:** new approach stub for formatting dates in formdata ([9ea7b2e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9ea7b2e))
+* **datepicker:** only update datepicker date if date is valid ([d857af3](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d857af3))
+* **datepicker:** switch to tail.datetime fork to fix time selection ([863971f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/863971f))
+* **datepicker:** update dependencies ([427ffbf](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/427ffbf))
+* **invitations:** save expiresAt to DB ([1c2f2b7](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/1c2f2b7))
+* **ldap:** automatically synchronise user data from ldap ([b39ba8b](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/b39ba8b))
+* **navigate-away-prompt:** prompt on actual value change only ([293ab6d](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/293ab6d))
+* **schools:** implement cru ([18ae28a](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/18ae28a))
+* **user-schools:** allow users to override automatic school assoc' ([7d927fd](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/7d927fd))
+* **user-schools:** automatically assign users to schools ([12067de](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/12067de))
+* **users:** generalise UserLecturer and UserAdmin to UserFunction ([76f8da5](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/76f8da5)), closes [#320](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/320)
 
 
 ### BREAKING CHANGES
@@ -921,155 +921,155 @@ All notable changes to this project will be documented in this file. See [standa
 
 
 
-## [5.5.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v5.4.0...v5.5.0) (2019-08-27)
+## [5.5.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v5.4.0...v5.5.0) (2019-08-27)
 
 
 ### Bug Fixes
 
-* **changelog:** add date ([52a88f8](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/52a88f8))
-* **course-applications-csv:** record rating time ([c2c6974](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/c2c6974))
+* **changelog:** add date ([52a88f8](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/52a88f8))
+* **course-applications-csv:** record rating time ([c2c6974](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c2c6974))
 
 
 ### Features
 
-* optional ribbon ([c2e13cf](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/c2e13cf))
+* optional ribbon ([c2e13cf](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c2e13cf))
 
 
 
-## [5.4.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v5.3.0...v5.4.0) (2019-08-27)
+## [5.4.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v5.3.0...v5.4.0) (2019-08-27)
 
 
 ### Bug Fixes
 
-* **course-edit:** only show allocation error message when relevant ([00a6ca8](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/00a6ca8))
+* **course-edit:** only show allocation error message when relevant ([00a6ca8](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/00a6ca8))
 
 
 ### Features
 
-* **allocations:** serve archive of all application files by course ([5e393c5](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/5e393c5))
-* allow editing of course applications outside of allocation ([e816a30](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/e816a30))
-* **course-applications:** csv transport ([cf0ec1a](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/cf0ec1a))
+* **allocations:** serve archive of all application files by course ([5e393c5](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/5e393c5))
+* allow editing of course applications outside of allocation ([e816a30](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e816a30))
+* **course-applications:** csv transport ([cf0ec1a](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/cf0ec1a))
 
 
 
-## [5.3.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v5.2.3...v5.3.0) (2019-08-22)
+## [5.3.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v5.2.3...v5.3.0) (2019-08-22)
 
 
 ### Bug Fixes
 
-* **allocations:** fix behaviour of "active" dbTable-filter ([b694a09](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/b694a09))
-* **course list:** show complete registration span ([754d6ca](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/754d6ca)), closes [#446](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/446)
-* **home:** fix hlint and other minor bugs ([839251e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/839251e))
+* **allocations:** fix behaviour of "active" dbTable-filter ([b694a09](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/b694a09))
+* **course list:** show complete registration span ([754d6ca](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/754d6ca)), closes [#446](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/446)
+* **home:** fix hlint and other minor bugs ([839251e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/839251e))
 
 
 ### Features
 
-* **allocations:** add info page for allocations ([689b85a](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/689b85a))
-* **allocations:** show table of all allocations ([d621e61](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d621e61))
-* **allocations:** show table of course applications ([f5da3be](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/f5da3be))
-* **home:** allow users to define exam warning time ([d23e222](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d23e222)), closes [#445](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/445)
-* **home:** clean up homepage ([a6e2f64](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/a6e2f64))
+* **allocations:** add info page for allocations ([689b85a](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/689b85a))
+* **allocations:** show table of all allocations ([d621e61](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d621e61))
+* **allocations:** show table of course applications ([f5da3be](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f5da3be))
+* **home:** allow users to define exam warning time ([d23e222](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d23e222)), closes [#445](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/445)
+* **home:** clean up homepage ([a6e2f64](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a6e2f64))
 
 
 
-### [5.2.3](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v5.2.2...v5.2.3) (2019-08-22)
+### [5.2.3](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v5.2.2...v5.2.3) (2019-08-22)
 
 
 ### Bug Fixes
 
-* **csv exam import:** ignore unchanged noshow and voided ([a346524](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/a346524))
+* **csv exam import:** ignore unchanged noshow and voided ([a346524](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a346524))
 
 
 
-### [5.2.2](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v5.2.1...v5.2.2) (2019-08-22)
+### [5.2.2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v5.2.1...v5.2.2) (2019-08-22)
 
 
 
-### [5.2.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v5.2.0...v5.2.1) (2019-08-21)
+### [5.2.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v5.2.0...v5.2.1) (2019-08-21)
 
 
 ### Bug Fixes
 
-* **csv upload exams:** allow ambiguous harmless study fields ([7d2937c](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/7d2937c))
+* **csv upload exams:** allow ambiguous harmless study fields ([7d2937c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/7d2937c))
 
 
 
-## [5.2.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v5.1.0...v5.2.0) (2019-08-21)
+## [5.2.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v5.1.0...v5.2.0) (2019-08-21)
 
 
 ### Bug Fixes
 
-* **csv import:** csv import preview help text adjusted ([b7321df](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/b7321df))
-* **csv import:** fix spelling and expand help text ([2c57a77](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/2c57a77))
-* **exam import:** inactive registered features may be selected ([3c4172c](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3c4172c))
-* **routes:** change ex to sheet ([9d9ead9](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/9d9ead9))
-* **sheet list:** do not show icons for inaccessible items ([0bb9a0f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/0bb9a0f)), closes [#421](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/421)
+* **csv import:** csv import preview help text adjusted ([b7321df](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/b7321df))
+* **csv import:** fix spelling and expand help text ([2c57a77](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2c57a77))
+* **exam import:** inactive registered features may be selected ([3c4172c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3c4172c))
+* **routes:** change ex to sheet ([9d9ead9](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9d9ead9))
+* **sheet list:** do not show icons for inaccessible items ([0bb9a0f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/0bb9a0f)), closes [#421](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/421)
 
 
 ### Features
 
-* **csv import:** add explanation text ([6d0a4c1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/6d0a4c1))
+* **csv import:** add explanation text ([6d0a4c1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/6d0a4c1))
 
 
 
-## [5.1.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v5.0.2...v5.1.0) (2019-08-19)
+## [5.1.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v5.0.2...v5.1.0) (2019-08-19)
 
 
 ### Features
 
-* **allocations:** add application form(s) ([ef625cd](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/ef625cd))
-* **allocations:** add registration form ([c5b18fc](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/c5b18fc))
-* **allocations:** implement application interface ([4dcc82a](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/4dcc82a))
-* **allocations:** link allocations from home ([c759364](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/c759364))
-* **allocations:** set up routes ([c2df01c](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/c2df01c))
+* **allocations:** add application form(s) ([ef625cd](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ef625cd))
+* **allocations:** add registration form ([c5b18fc](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c5b18fc))
+* **allocations:** implement application interface ([4dcc82a](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/4dcc82a))
+* **allocations:** link allocations from home ([c759364](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c759364))
+* **allocations:** set up routes ([c2df01c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c2df01c))
 
 
 
-### [5.0.2](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v5.0.1...v5.0.2) (2019-08-13)
+### [5.0.2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v5.0.1...v5.0.2) (2019-08-13)
 
 
 ### Bug Fixes
 
-* **course-deregister:** only delete relevant users exam results ([3997857](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3997857))
+* **course-deregister:** only delete relevant users exam results ([3997857](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3997857))
 
 
 
-### [5.0.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v5.0.0...v5.0.1) (2019-08-12)
+### [5.0.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v5.0.0...v5.0.1) (2019-08-12)
 
 
 
-## [5.0.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v4.14.0...v5.0.0) (2019-08-12)
+## [5.0.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v4.14.0...v5.0.0) (2019-08-12)
 
 
 ### Bug Fixes
 
-* removed duplicated code from merge ([9fb9540](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/9fb9540))
-* **course-teaser:** don't collapse unless chevron is clicked ([fca99be](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/fca99be))
-* **course-teaser-css:** class name fixes ([8a92985](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/8a92985))
+* removed duplicated code from merge ([9fb9540](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9fb9540))
+* **course-teaser:** don't collapse unless chevron is clicked ([fca99be](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/fca99be))
+* **course-teaser-css:** class name fixes ([8a92985](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/8a92985))
 
 
 ### Features
 
-* **course-registration:** allow independent course application ([a00698e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/a00698e))
-* **course-teaser:** checkbox field for open registration filter ([e4f150d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/e4f150d))
-* **course-teaser:** display sorting "pills" for course teasers ([d964e1f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d964e1f))
-* **course-teaser:** filter by open registration ([c2c12b9](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/c2c12b9))
-* **course-teaser:** final version of course-teaser for course list ([66b97d6](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/66b97d6))
-* **course-teaser:** hide lecturer entry if empty ([f7fb3c1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/f7fb3c1))
-* **course-teaser:** incomplete course teaser for course list ([9a97925](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/9a97925))
-* **course-teaser:** moved course teaser functionality to util ([c99a3c7](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/c99a3c7))
-* **course-teaser:** no display of chevron without description ([5c88c13](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/5c88c13))
-* **course-teaser:** no page reload on sorting ([68b8d24](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/68b8d24))
-* **course-teaser:** only true lecturers without assistants ([7926f29](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/7926f29))
-* **course-teaser:** redirecting to course/ ([aa20389](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/aa20389))
-* **course-teaser:** reintroduced courseId and course-teaser.julius ([3b6e700](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3b6e700))
-* **course-teaser:** show openCourses also to logged in users ([8cca548](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/8cca548))
-* **course-teaser:** unpolished version of course-teaser for course list ([ea5d54b](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/ea5d54b))
-* **course-teaser:** working link to course pages ([8a49979](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/8a49979))
-* **course-teaser-css:** removed description label ([a25efb3](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/a25efb3))
-* **course-teaser-filter:** filter for lecturers ([e96e17f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/e96e17f))
-* **course-teaser-filter:** working filters for semester and institute ([3b419b3](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3b419b3))
-* **courses:** rework couse registration ([79d4ae2](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/79d4ae2))
+* **course-registration:** allow independent course application ([a00698e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a00698e))
+* **course-teaser:** checkbox field for open registration filter ([e4f150d](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e4f150d))
+* **course-teaser:** display sorting "pills" for course teasers ([d964e1f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d964e1f))
+* **course-teaser:** filter by open registration ([c2c12b9](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c2c12b9))
+* **course-teaser:** final version of course-teaser for course list ([66b97d6](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/66b97d6))
+* **course-teaser:** hide lecturer entry if empty ([f7fb3c1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f7fb3c1))
+* **course-teaser:** incomplete course teaser for course list ([9a97925](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9a97925))
+* **course-teaser:** moved course teaser functionality to util ([c99a3c7](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c99a3c7))
+* **course-teaser:** no display of chevron without description ([5c88c13](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/5c88c13))
+* **course-teaser:** no page reload on sorting ([68b8d24](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/68b8d24))
+* **course-teaser:** only true lecturers without assistants ([7926f29](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/7926f29))
+* **course-teaser:** redirecting to course/ ([aa20389](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/aa20389))
+* **course-teaser:** reintroduced courseId and course-teaser.julius ([3b6e700](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3b6e700))
+* **course-teaser:** show openCourses also to logged in users ([8cca548](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/8cca548))
+* **course-teaser:** unpolished version of course-teaser for course list ([ea5d54b](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ea5d54b))
+* **course-teaser:** working link to course pages ([8a49979](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/8a49979))
+* **course-teaser-css:** removed description label ([a25efb3](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a25efb3))
+* **course-teaser-filter:** filter for lecturers ([e96e17f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e96e17f))
+* **course-teaser-filter:** working filters for semester and institute ([3b419b3](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3b419b3))
+* **courses:** rework couse registration ([79d4ae2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/79d4ae2))
 
 
 ### BREAKING CHANGES
@@ -1080,250 +1080,250 @@ them together now)
 
 
 
-## [4.14.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v4.13.1...v4.14.0) (2019-08-07)
+## [4.14.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v4.13.1...v4.14.0) (2019-08-07)
 
 
 ### Bug Fixes
 
-* **exam:** fix warning message ([60869fd](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/60869fd))
-* **info:** minor whitespace correction ([0ce4dd1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/0ce4dd1))
+* **exam:** fix warning message ([60869fd](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/60869fd))
+* **info:** minor whitespace correction ([0ce4dd1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/0ce4dd1))
 
 
 ### Features
 
-* **info:** info seiten überarbeitet ([7459fc3](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/7459fc3))
+* **info:** info seiten überarbeitet ([7459fc3](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/7459fc3))
 
 
 
-### [4.13.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v4.13.0...v4.13.1) (2019-08-07)
+### [4.13.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v4.13.0...v4.13.1) (2019-08-07)
 
 
 ### Bug Fixes
 
-* fix collision with keyword "none" ([203dbd3](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/203dbd3))
+* fix collision with keyword "none" ([203dbd3](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/203dbd3))
 
 
 
-## [4.13.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v4.12.1...v4.13.0) (2019-08-06)
+## [4.13.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v4.12.1...v4.13.0) (2019-08-06)
 
 
 ### Features
 
-* **course-show:** show allocation name ([3c80235](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3c80235))
-* **homepage:** add convenience links to term and school ([83445c4](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/83445c4))
-* **homepage:** add prime action new course to homepage ([2208368](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/2208368))
+* **course-show:** show allocation name ([3c80235](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3c80235))
+* **homepage:** add convenience links to term and school ([83445c4](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/83445c4))
+* **homepage:** add prime action new course to homepage ([2208368](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2208368))
 
 
 
-### [4.12.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v4.12.0...v4.12.1) (2019-08-06)
+### [4.12.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v4.12.0...v4.12.1) (2019-08-06)
 
 
 ### Bug Fixes
 
-* **exams:** allow occurrences after exam end ([3d63b35](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3d63b35))
+* **exams:** allow occurrences after exam end ([3d63b35](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3d63b35))
 
 
 
-## [4.12.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v4.11.0...v4.12.0) (2019-08-06)
+## [4.12.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v4.11.0...v4.12.0) (2019-08-06)
 
 
 ### Features
 
-* **exams:** improve immediate exam table on home page ([93e718f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/93e718f))
+* **exams:** improve immediate exam table on home page ([93e718f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/93e718f))
 
 
 
-## [4.11.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v4.10.0...v4.11.0) (2019-08-06)
+## [4.11.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v4.10.0...v4.11.0) (2019-08-06)
 
 
 ### Bug Fixes
 
-* **course-edit:** additional permission checks wrt allocations ([fca5caa](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/fca5caa))
+* **course-edit:** additional permission checks wrt allocations ([fca5caa](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/fca5caa))
 
 
 ### Features
 
-* **audit:** automatic transaction log truncation ([248482b](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/248482b))
-* **audit:** introduce id-based format ([f602b79](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/f602b79))
-* **audit:** take IP from header ([fb027de](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/fb027de))
-* **exams:** show occurrenceRule in exam overview ([06673e0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/06673e0))
+* **audit:** automatic transaction log truncation ([248482b](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/248482b))
+* **audit:** introduce id-based format ([f602b79](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f602b79))
+* **audit:** take IP from header ([fb027de](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/fb027de))
+* **exams:** show occurrenceRule in exam overview ([06673e0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/06673e0))
 
 
 
-## [4.10.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v4.9.0...v4.10.0) (2019-08-05)
+## [4.10.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v4.9.0...v4.10.0) (2019-08-05)
 
 
 ### Bug Fixes
 
-* **jobs:** only write CronLastExec after job has executed ([67eda82](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/67eda82))
+* **jobs:** only write CronLastExec after job has executed ([67eda82](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/67eda82))
 
 
 ### Features
 
-* **notifications:** add NotificationExamResult ([a7e2921](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/a7e2921))
+* **notifications:** add NotificationExamResult ([a7e2921](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a7e2921))
 
 
 
-## [4.9.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v4.8.0...v4.9.0) (2019-08-05)
+## [4.9.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v4.8.0...v4.9.0) (2019-08-05)
 
 
 ### Features
 
-* **allocations:** add courses to allocations ([14a9a45](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/14a9a45))
-* **allocations:** create model for allocations ([82e3bf9](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/82e3bf9))
-* **allocations:** prevent course (de)registrations ([94a1208](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/94a1208))
-* **allocations:** refine model for allocations ([069eb1e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/069eb1e))
-* **csv-import:** automagically determine csv delimiters ([3555322](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3555322))
+* **allocations:** add courses to allocations ([14a9a45](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/14a9a45))
+* **allocations:** create model for allocations ([82e3bf9](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/82e3bf9))
+* **allocations:** prevent course (de)registrations ([94a1208](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/94a1208))
+* **allocations:** refine model for allocations ([069eb1e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/069eb1e))
+* **csv-import:** automagically determine csv delimiters ([3555322](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3555322))
 
 
 
-## [4.8.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v4.7.0...v4.8.0) (2019-07-31)
+## [4.8.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v4.7.0...v4.8.0) (2019-07-31)
 
 
 ### Bug Fixes
 
-* **exam add users:** correctly differentiate and fix messages ([a473599](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/a473599))
+* **exam add users:** correctly differentiate and fix messages ([a473599](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a473599))
 
 
 ### Features
 
-* **exams:** better explain "enlist directly" ([f07eb3d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/f07eb3d))
+* **exams:** better explain "enlist directly" ([f07eb3d](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f07eb3d))
 
 
 
-## [4.7.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v4.6.0...v4.7.0) (2019-07-30)
+## [4.7.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v4.6.0...v4.7.0) (2019-07-30)
 
 
 ### Features
 
-* **exam users:** course notes ([1e756be](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/1e756be))
-* **notification triggers:** redesign interface ([84c12b5](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/84c12b5)), closes [#410](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/410)
-* **users:** lecturer invitations ([e6c3be4](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/e6c3be4))
-* **users:** switching between AuthModes & password changing ([0d610cc](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/0d610cc))
+* **exam users:** course notes ([1e756be](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/1e756be))
+* **notification triggers:** redesign interface ([84c12b5](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/84c12b5)), closes [#410](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/410)
+* **users:** lecturer invitations ([e6c3be4](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e6c3be4))
+* **users:** switching between AuthModes & password changing ([0d610cc](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/0d610cc))
 
 
 
-## [4.6.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v4.5.0...v4.6.0) (2019-07-26)
+## [4.6.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v4.5.0...v4.6.0) (2019-07-26)
 
 
 ### Features
 
-* **exam-users:** allow missing columns in csv import ([e242013](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/e242013))
+* **exam-users:** allow missing columns in csv import ([e242013](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e242013))
 
 
 
-## [4.5.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v4.4.0...v4.5.0) (2019-07-26)
+## [4.5.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v4.4.0...v4.5.0) (2019-07-26)
 
 
 ### Bug Fixes
 
-* fix merge ([38afa90](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/38afa90))
-* **csv-import:** fix incorrect map merge ([0d283fd](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/0d283fd))
-* **dbtable-ui:** fix position of submit button for pagesize ([cf35118](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/cf35118))
-* **merge:** fix build ([0bd0260](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/0bd0260))
+* fix merge ([38afa90](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/38afa90))
+* **csv-import:** fix incorrect map merge ([0d283fd](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/0d283fd))
+* **dbtable-ui:** fix position of submit button for pagesize ([cf35118](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/cf35118))
+* **merge:** fix build ([0bd0260](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/0bd0260))
 
 
 ### Features
 
-* **alert-icons:** add custom icons for alerts ([bc67500](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/bc67500))
-* **alerticons:** allow alerts to have custom icons ([d70a958](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d70a958))
-* **alerts js:** support custom icons in Alerts HTTP-Header ([8833cb5](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/8833cb5))
-* **corrections assignment:** add convenience to table header ([56c2fcc](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/56c2fcc))
-* **course enrolement:** show proper icons in alerts ([b2b3895](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/b2b3895))
-* **exam-users:** provide better table defaults ([a689d19](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/a689d19))
-* **exams:** csv-based grade upload ([932145c](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/932145c))
-* **exams:** show exam results ([b8b308d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/b8b308d))
-* **users:** store first names and titles ([ceed070](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/ceed070))
+* **alert-icons:** add custom icons for alerts ([bc67500](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/bc67500))
+* **alerticons:** allow alerts to have custom icons ([d70a958](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d70a958))
+* **alerts js:** support custom icons in Alerts HTTP-Header ([8833cb5](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/8833cb5))
+* **corrections assignment:** add convenience to table header ([56c2fcc](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/56c2fcc))
+* **course enrolement:** show proper icons in alerts ([b2b3895](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/b2b3895))
+* **exam-users:** provide better table defaults ([a689d19](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a689d19))
+* **exams:** csv-based grade upload ([932145c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/932145c))
+* **exams:** show exam results ([b8b308d](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/b8b308d))
+* **users:** store first names and titles ([ceed070](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ceed070))
 
 
 
-## [4.4.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v4.3.0...v4.4.0) (2019-07-24)
+## [4.4.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v4.3.0...v4.4.0) (2019-07-24)
 
 
 ### Bug Fixes
 
-* **exam-csv:** audit registrations/deregistrations ([a278cc5](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/a278cc5))
-* **js:** fix i18n not loading ([a3ee6f6](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/a3ee6f6))
+* **exam-csv:** audit registrations/deregistrations ([a278cc5](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a278cc5))
+* **js:** fix i18n not loading ([a3ee6f6](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a3ee6f6))
 
 
 ### Features
 
-* **exams:** implement exam registration invitations ([dd90fd0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/dd90fd0))
+* **exams:** implement exam registration invitations ([dd90fd0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/dd90fd0))
 
 
 
-## [4.3.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v4.2.0...v4.3.0) (2019-07-24)
+## [4.3.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v4.2.0...v4.3.0) (2019-07-24)
 
 
 ### Features
 
-* **health:** check for active job workers ([d1abe53](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d1abe53))
+* **health:** check for active job workers ([d1abe53](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d1abe53))
 
 
 
-## [4.2.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v4.1.2...v4.2.0) (2019-07-23)
+## [4.2.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v4.1.2...v4.2.0) (2019-07-23)
 
 
 ### Bug Fixes
 
-* **exam registration:** icons added to exam register message ([ce61528](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/ce61528))
-* **exams:** change heading to rooms if no occurrence times are shown ([5cb9404](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/5cb9404))
-* fix build ([caf4092](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/caf4092))
+* **exam registration:** icons added to exam register message ([ce61528](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ce61528))
+* **exams:** change heading to rooms if no occurrence times are shown ([5cb9404](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/5cb9404))
+* fix build ([caf4092](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/caf4092))
 
 
 ### Features
 
-* **csv:** finish implementing csv import ([e35fed6](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/e35fed6))
-* **csv:** implement csv import ([996bc2a](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/996bc2a))
-* **exams:** allow assigning exam participants to occurrences ([e1996ac](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/e1996ac))
+* **csv:** finish implementing csv import ([e35fed6](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e35fed6))
+* **csv:** implement csv import ([996bc2a](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/996bc2a))
+* **exams:** allow assigning exam participants to occurrences ([e1996ac](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e1996ac))
 
 
 
-### [4.1.2](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v4.1.1...v4.1.2) (2019-07-17)
+### [4.1.2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v4.1.1...v4.1.2) (2019-07-17)
 
 
 ### Bug Fixes
 
-* **corrections:** properly link corrector emails ([9385595](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/9385595))
+* **corrections:** properly link corrector emails ([9385595](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9385595))
 
 
 
-### [4.1.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v4.1.0...v4.1.1) (2019-07-17)
+### [4.1.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v4.1.0...v4.1.1) (2019-07-17)
 
 
 ### Bug Fixes
 
-* **aform:** show info about required fields in all aforms ([63f6d01](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/63f6d01)), closes [#418](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/418)
-* **submissions:** only notify submittors if rating changes doneness ([4f1162c](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/4f1162c))
-* **submissions:** only notify submittors if rating is done ([8e0c379](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/8e0c379))
-* **submissions:** submitting produces an success alert now ([bf20d6f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/bf20d6f)), closes [#286](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/286)
+* **aform:** show info about required fields in all aforms ([63f6d01](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/63f6d01)), closes [#418](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/418)
+* **submissions:** only notify submittors if rating changes doneness ([4f1162c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/4f1162c))
+* **submissions:** only notify submittors if rating is done ([8e0c379](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/8e0c379))
+* **submissions:** submitting produces an success alert now ([bf20d6f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/bf20d6f)), closes [#286](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/286)
 
 
 
-## [4.1.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v4.0.1...v4.1.0) (2019-07-17)
+## [4.1.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v4.0.1...v4.1.0) (2019-07-17)
 
 
 ### Features
 
-* **exams:** allow forced deregistration ([1b532c4](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/1b532c4))
+* **exams:** allow forced deregistration ([1b532c4](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/1b532c4))
 
 
 
-### [4.0.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v4.0.0...v4.0.1) (2019-07-16)
+### [4.0.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v4.0.0...v4.0.1) (2019-07-16)
 
 
 ### Bug Fixes
 
-* **exams:** fix caculation of maximum exercise points ([a9e74ca](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/a9e74ca))
+* **exams:** fix caculation of maximum exercise points ([a9e74ca](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a9e74ca))
 
 
 
-## [4.0.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v3.0.0...v4.0.0) (2019-07-16)
+## [4.0.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v3.0.0...v4.0.0) (2019-07-16)
 
 
 ### Features
 
-* **csv:** add column explanations ([c8dca94](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/c8dca94))
+* **csv:** add column explanations ([c8dca94](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c8dca94))
 
 
 ### BREAKING CHANGES
@@ -1332,24 +1332,24 @@ them together now)
 
 
 
-## [3.0.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v2.1.1...v3.0.0) (2019-07-16)
+## [3.0.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v2.1.1...v3.0.0) (2019-07-16)
 
 
 ### Bug Fixes
 
-* **course and exam registration:** distinguish registrations buttons ([ad825b6](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/ad825b6)), closes [#416](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/416)
-* **exam participant download:** fix icon not being shown ([a075b16](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/a075b16))
-* **exams:** cleanup exam interface ([05e7b52](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/05e7b52))
-* **sheet type info:** give better tooltips and name to sheet types ([9dbef1f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/9dbef1f)), closes [#402](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/402)
+* **course and exam registration:** distinguish registrations buttons ([ad825b6](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ad825b6)), closes [#416](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/416)
+* **exam participant download:** fix icon not being shown ([a075b16](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a075b16))
+* **exams:** cleanup exam interface ([05e7b52](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/05e7b52))
+* **sheet type info:** give better tooltips and name to sheet types ([9dbef1f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9dbef1f)), closes [#402](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/402)
 
 
 ### Features
 
-* **exams:** csv-export exercise data ([2218103](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/2218103))
-* **exams:** filter on occurrence ([cf040ce](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/cf040ce))
-* **exams:** introduce examOccurrenceName ([379a7ed](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/379a7ed))
-* **exams:** show exam bonus in webinterface ([2b23600](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/2b23600))
-* **sheetlist:** sort sheet file types in db by haskell Ord ([643cc41](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/643cc41))
+* **exams:** csv-export exercise data ([2218103](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2218103))
+* **exams:** filter on occurrence ([cf040ce](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/cf040ce))
+* **exams:** introduce examOccurrenceName ([379a7ed](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/379a7ed))
+* **exams:** show exam bonus in webinterface ([2b23600](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2b23600))
+* **sheetlist:** sort sheet file types in db by haskell Ord ([643cc41](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/643cc41))
 
 
 ### BREAKING CHANGES
@@ -1359,45 +1359,45 @@ them together now)
 
 
 
-### [2.1.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v2.1.0...v2.1.1) (2019-07-10)
+### [2.1.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v2.1.0...v2.1.1) (2019-07-10)
 
 
 ### Bug Fixes
 
-* **assign correctors:** also show names of unenlisted correctors ([de49a77](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/de49a77))
-* **build:** fix build ([49dc413](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/49dc413))
+* **assign correctors:** also show names of unenlisted correctors ([de49a77](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/de49a77))
+* **build:** fix build ([49dc413](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/49dc413))
 
 
 
-## [2.1.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v2.0.0...v2.1.0) (2019-07-10)
+## [2.1.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v2.0.0...v2.1.0) (2019-07-10)
 
 
 ### Bug Fixes
 
-* **corrector handling:** show correctors by a consistent order ([9c5ed5f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/9c5ed5f))
-* **translation:** fix typos in translations; add bug to known bugs ([ac3f7bb](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/ac3f7bb))
+* **corrector handling:** show correctors by a consistent order ([9c5ed5f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9c5ed5f))
+* **translation:** fix typos in translations; add bug to known bugs ([ac3f7bb](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ac3f7bb))
 
 
 ### Features
 
-* **csv:** introduce csv export ([631bbef](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/631bbef))
+* **csv:** introduce csv export ([631bbef](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/631bbef))
 
 
 
-## [2.0.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v1.4.1...v2.0.0) (2019-07-10)
+## [2.0.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v1.4.1...v2.0.0) (2019-07-10)
 
 
 ### Bug Fixes
 
-* **correction:** comment column made wide in online correction form ([d83b1f6](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d83b1f6)), closes [#373](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/373)
-* **number-input-fields:** number inputs made HTML5 compatible ([6098215](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/6098215)), closes [#412](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/412)
-* **ratings:** disallow ratings for graded sheets without point value ([c0b90c4](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/c0b90c4))
-* **tooltips:** fixes font-color when used in tableheaders ([f4bb70e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/f4bb70e))
+* **correction:** comment column made wide in online correction form ([d83b1f6](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d83b1f6)), closes [#373](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/373)
+* **number-input-fields:** number inputs made HTML5 compatible ([6098215](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/6098215)), closes [#412](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/412)
+* **ratings:** disallow ratings for graded sheets without point value ([c0b90c4](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c0b90c4))
+* **tooltips:** fixes font-color when used in tableheaders ([f4bb70e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f4bb70e))
 
 
 ### Features
 
-* **exams:** show study features of registered users ([04bea76](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/04bea76))
+* **exams:** show study features of registered users ([04bea76](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/04bea76))
 
 
 ### BREAKING CHANGES
@@ -1406,46 +1406,46 @@ them together now)
 
 
 
-### [1.4.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v1.4.0...v1.4.1) (2019-07-04)
+### [1.4.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v1.4.0...v1.4.1) (2019-07-04)
 
 
 
-## [1.4.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v1.3.0...v1.4.0) (2019-07-03)
+## [1.4.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v1.3.0...v1.4.0) (2019-07-03)
 
 
 ### Bug Fixes
 
-* **home:** fix build ([551c4cb](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/551c4cb))
-* **massinput:** properly render massInputList ([7c28448](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/7c28448))
+* **home:** fix build ([551c4cb](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/551c4cb))
+* **massinput:** properly render massInputList ([7c28448](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/7c28448))
 
 
 ### Features
 
-* **exam:** audit exam registrations ([31931e7](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/31931e7))
-* **exam:** save registration timestamp ([78e4369](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/78e4369))
+* **exam:** audit exam registrations ([31931e7](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/31931e7))
+* **exam:** save registration timestamp ([78e4369](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/78e4369))
 
 
 
-## [1.3.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v1.1.0...v1.3.0) (2019-07-03)
+## [1.3.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v1.1.0...v1.3.0) (2019-07-03)
 
 
 ### Features
 
-* **home:** show immediate exams on home page ([242cff3](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/242cff3))
+* **home:** show immediate exams on home page ([242cff3](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/242cff3))
 
 
 
-## [1.1.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v1.0.0...v1.1.0) (2019-07-03)
+## [1.1.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v1.0.0...v1.1.0) (2019-07-03)
 
 
 ### Bug Fixes
 
-* **displayable:** fixed faulty display of db keys (SchoolId, TermId) ([c7312e8](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/c7312e8))
+* **displayable:** fixed faulty display of db keys (SchoolId, TermId) ([c7312e8](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c7312e8))
 
 
 ### Features
 
-* **exams:** add extremely rudimentary registration table ([31e6b72](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/31e6b72))
+* **exams:** add extremely rudimentary registration table ([31e6b72](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/31e6b72))
 
 
 
@@ -1454,45 +1454,45 @@ them together now)
 
 ### Bug Fixes
 
-* **sheet corrector assigment:** minor bugfix ([749cd2f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/749cd2f))
-* async table js util now knows current random css prefix ([cc90faf](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/cc90faf))
-* **correction assignment:** correcting lecturer's names are shown now ([16c556b](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/16c556b))
-* **corrector assignment:** sheet tabel mixed up columns sorted ([d07f53e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d07f53e))
-* **datepicker:** hide number input spinners in datepicker ([2073130](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/2073130))
-* **exam grading keys:** Fix spacing ([24aacef](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/24aacef))
-* **exams:** Fix registration ([1684da0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/1684da0))
-* **fe:** style notifications acceptably for now ([fc80f08](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/fc80f08))
-* **fe-async-table:** Emulate no-js behaviour when handling pagesize ([28dcc8d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/28dcc8d))
-* **fe-check-all:** use arrow fn to keep scope in event listeners ([09e681e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/09e681e))
-* **fe-deflist:** avoid horizontal scroll on pages with deflist ([16d422d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/16d422d))
-* **Help Widget, Corrector Assignment:** Modal Form closes in place; assign alerts ([89d5364](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/89d5364)), closes [#195](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/195)
-* **info-lecturer:** Touch ups ([e1e26ab](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/e1e26ab))
-* **many occurrences throughout the project:** Fix typo: occurence -> occurrence everywhere ([96387cb](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/96387cb))
-* filter submission by not having corrector ([3bded50](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3bded50))
-* minor heat correction for correction overview ([5546849](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/5546849))
-* **ratings:** disallow ratings for graded sheets without point value ([463b2b7](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/463b2b7))
-* **standard-version:** properly reset staging area before release ([5aa906e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/5aa906e))
+* **sheet corrector assigment:** minor bugfix ([749cd2f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/749cd2f))
+* async table js util now knows current random css prefix ([cc90faf](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/cc90faf))
+* **correction assignment:** correcting lecturer's names are shown now ([16c556b](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/16c556b))
+* **corrector assignment:** sheet tabel mixed up columns sorted ([d07f53e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d07f53e))
+* **datepicker:** hide number input spinners in datepicker ([2073130](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2073130))
+* **exam grading keys:** Fix spacing ([24aacef](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/24aacef))
+* **exams:** Fix registration ([1684da0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/1684da0))
+* **fe:** style notifications acceptably for now ([fc80f08](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/fc80f08))
+* **fe-async-table:** Emulate no-js behaviour when handling pagesize ([28dcc8d](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/28dcc8d))
+* **fe-check-all:** use arrow fn to keep scope in event listeners ([09e681e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/09e681e))
+* **fe-deflist:** avoid horizontal scroll on pages with deflist ([16d422d](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/16d422d))
+* **Help Widget, Corrector Assignment:** Modal Form closes in place; assign alerts ([89d5364](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/89d5364)), closes [#195](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/195)
+* **info-lecturer:** Touch ups ([e1e26ab](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e1e26ab))
+* **many occurrences throughout the project:** Fix typo: occurence -> occurrence everywhere ([96387cb](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/96387cb))
+* filter submission by not having corrector ([3bded50](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3bded50))
+* minor heat correction for correction overview ([5546849](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/5546849))
+* **ratings:** disallow ratings for graded sheets without point value ([463b2b7](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/463b2b7))
+* **standard-version:** properly reset staging area before release ([5aa906e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/5aa906e))
 
 
 ### Features
 
-* **corrector-assignment:** show load/submission percentages ([228cd50](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/228cd50))
-* make pagesize changes load async ([6486120](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/6486120))
-* **development:** add commitlint to ensure proper commit msgs ([dd528c1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/dd528c1))
-* **development:** add standard-version for automatic changelog generation ([c495ef5](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/c495ef5))
-* **exams:** CRU (no D) for exams ([67a50c9](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/67a50c9))
-* **exams:** exam registration ([99184ff](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/99184ff))
-* **exams:** Form validation ([6fb1399](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/6fb1399))
-* **fe-heatmap:** add css class heated for heatmap elements ([b09b876](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/b09b876)), closes [#405](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/405)
-* **forms:** Introduce more convenient form validation ([f8d0b02](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/f8d0b02))
-* **standard-version:** allow adding additional changes to release ([7ed6fe4](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/7ed6fe4))
-* **standard-version:** complete release workflow ([605e62f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/605e62f))
+* **corrector-assignment:** show load/submission percentages ([228cd50](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/228cd50))
+* make pagesize changes load async ([6486120](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/6486120))
+* **development:** add commitlint to ensure proper commit msgs ([dd528c1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/dd528c1))
+* **development:** add standard-version for automatic changelog generation ([c495ef5](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c495ef5))
+* **exams:** CRU (no D) for exams ([67a50c9](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/67a50c9))
+* **exams:** exam registration ([99184ff](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/99184ff))
+* **exams:** Form validation ([6fb1399](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/6fb1399))
+* **fe-heatmap:** add css class heated for heatmap elements ([b09b876](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/b09b876)), closes [#405](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/405)
+* **forms:** Introduce more convenient form validation ([f8d0b02](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f8d0b02))
+* **standard-version:** allow adding additional changes to release ([7ed6fe4](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/7ed6fe4))
+* **standard-version:** complete release workflow ([605e62f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/605e62f))
 
 
 ### Tests
 
-* Does ist build with everything except for `makeClassy ''Entity`? Probably the functional dependency is to blame?! ([bb552c4](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/bb552c4))
-* removing makeCLassyFor maybe build works then? ([2550f74](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/2550f74))
+* Does ist build with everything except for `makeClassy ''Entity`? Probably the functional dependency is to blame?! ([bb552c4](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/bb552c4))
+* removing makeCLassyFor maybe build works then? ([2550f74](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2550f74))
 
 
 ### BREAKING CHANGES
diff --git a/package.json b/package.json
index 789af6f59..2b21ad3f5 100644
--- a/package.json
+++ b/package.json
@@ -42,10 +42,10 @@
     "scripts": {
       "postbump": "./sync-versions.hs && git add -- package.yaml"
     },
-    "commitUrlFormat": "https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/{{hash}}",
-    "compareUrlFormat": "https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/{{previousTag}}...{{currentTag}}",
-    "issueUrlFormat": "https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/{{id}}",
-    "userUrlFormat": "https://gitlab.cip.ifi.lmu.de/{{user}}"
+    "commitUrlFormat": "https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/{{hash}}",
+    "compareUrlFormat": "https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/{{previousTag}}...{{currentTag}}",
+    "issueUrlFormat": "https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/{{id}}",
+    "userUrlFormat": "https://gitlab2.rz.ifi.lmu.de/{{user}}"
   },
   "browserslist": [
     "defaults"

From c5ef6bb5a5430a5f9b4dd4b2a5635332d1edfed7 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 18 Nov 2019 11:05:10 +0100
Subject: [PATCH 108/126] feat: log sent notifications for analysis

See #535
---
 models/jobs.model                    | 7 +++++++
 src/Jobs/Handler/SendNotification.hs | 8 +++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/models/jobs.model b/models/jobs.model
index 06be9fbeb..49a21a6e1 100644
--- a/models/jobs.model
+++ b/models/jobs.model
@@ -16,3 +16,10 @@ CronLastExec
     time                UTCTime -- When was the job executed
     instance            InstanceId -- Which uni2work-instance did the work
     UniqueCronLastExec job
+
+
+SentNotification
+    content             Value
+    user                UserId
+    time                UTCTime
+    instance            InstanceId
\ No newline at end of file
diff --git a/src/Jobs/Handler/SendNotification.hs b/src/Jobs/Handler/SendNotification.hs
index ef98df834..d31833fbd 100644
--- a/src/Jobs/Handler/SendNotification.hs
+++ b/src/Jobs/Handler/SendNotification.hs
@@ -22,4 +22,10 @@ import Jobs.Handler.SendNotification.CourseRegistered
 
 
 dispatchJobSendNotification :: UserId -> Notification -> Handler ()
-dispatchJobSendNotification jRecipient jNotification = $(dispatchTH ''Notification) jNotification jRecipient
+dispatchJobSendNotification jRecipient jNotification = do
+  $(dispatchTH ''Notification) jNotification jRecipient
+
+  instanceID' <- getsYesod $ view instanceID
+  now <- liftIO getCurrentTime
+
+  runDB . insert_ $ SentNotification (toJSON jNotification) jRecipient now instanceID'

From 52d634a2694a34ad4f47f10550b8b36861e3869b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 18 Nov 2019 11:13:36 +0100
Subject: [PATCH 109/126] chore(release): 7.23.0

---
 CHANGELOG.md      | 18 ++++++++++++++++++
 package-lock.json |  2 +-
 package.json      |  2 +-
 package.yaml      |  2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bed12c5b7..f3990a32e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [7.23.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.22.1...v7.23.0) (2019-11-18)
+
+
+### Bug Fixes
+
+* **datepicker:** close datepickers on focus loss ([3f9ca5e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3f9ca5e))
+* **datepicker:** close datepickers on focusout or click outside ([7fa0124](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/7fa0124))
+* **datepicker:** close on focusout of elements in document only ([ee0edc7](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ee0edc7))
+* **datepicker:** partial focusout and click fix ([434c0da](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/434c0da))
+* **info-lecturer:** translate german headline ([069d15a](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/069d15a))
+
+
+### Features
+
+* log sent notifications for analysis ([c5ef6bb](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c5ef6bb)), closes [#535](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/535)
+
+
+
 ### [7.22.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.22.0...v7.22.1) (2019-11-14)
 
 
diff --git a/package-lock.json b/package-lock.json
index 3eada9a4b..8291e90a4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.22.1",
+  "version": "7.23.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2b21ad3f5..b1b28204c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.22.1",
+  "version": "7.23.0",
   "description": "",
   "keywords": [],
   "author": "",
diff --git a/package.yaml b/package.yaml
index 04954ad7f..a349c7729 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name:    uniworx
-version: 7.22.1
+version: 7.23.0
 
 dependencies:
   - base >=4.9.1.0 && <5

From 4ded04b80df94a4655af52b64cbcd156394286fd Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 19 Nov 2019 10:30:08 +0100
Subject: [PATCH 110/126] fix(cron): consider scheduling precision in all time
 comparisons

---
 src/Cron.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Cron.hs b/src/Cron.hs
index 5017e71d1..fe78ac694 100644
--- a/src/Cron.hs
+++ b/src/Cron.hs
@@ -207,13 +207,13 @@ nextCronMatch tz mPrev prec now c@Cron{..} = case notAfter of
 
     execRef ref wasExecd cronAbsolute = case execRef' ref wasExecd cronAbsolute of
       MatchAt t
-        | t <= ref -> MatchAsap
+        | t <= addUTCTime prec ref -> MatchAsap
       other -> other
 
     execRef' ref wasExecd cronAbsolute = case cronAbsolute of
       CronAsap -> MatchAt ref
       CronTimestamp{ cronTimestamp = localTimeToUTCTZ tz -> ts }
-        | ref <= ts || not wasExecd -> MatchAt ts
+        | ref <= addUTCTime prec ts || not wasExecd -> MatchAt ts
         | otherwise -> MatchNone
       CronCalendar{..} -> listToMatch $ do
         let
@@ -341,7 +341,7 @@ nextCronMatch tz mPrev prec now c@Cron{..} = case notAfter of
         let localTimeOfDay = TimeOfDay (fromIntegral mCronHour) (fromIntegral mCronMinute) (fromIntegral mCronSecond)
             res = localTimeToUTCTZ tz LocalTime{..}
 
-        guard $ res >= ref
+        guard $ addUTCTime prec res >= ref
 
         return res
       CronNotScheduled -> MatchNone

From dc0e72929b9fdb4e768e4f544e2fe88c4d09b7b1 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 19 Nov 2019 11:01:46 +0100
Subject: [PATCH 111/126] chore(release): 7.23.1

---
 CHANGELOG.md      | 9 +++++++++
 package-lock.json | 2 +-
 package.json      | 2 +-
 package.yaml      | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3990a32e..01e3b1251 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [7.23.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.23.0...v7.23.1) (2019-11-19)
+
+
+### Bug Fixes
+
+* **cron:** consider scheduling precision in all time comparisons ([4ded04b](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/4ded04b))
+
+
+
 ## [7.23.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.22.1...v7.23.0) (2019-11-18)
 
 
diff --git a/package-lock.json b/package-lock.json
index 8291e90a4..b8f4e0d05 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.23.0",
+  "version": "7.23.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b1b28204c..f3e14cd69 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.23.0",
+  "version": "7.23.1",
   "description": "",
   "keywords": [],
   "author": "",
diff --git a/package.yaml b/package.yaml
index a349c7729..594542815 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name:    uniworx
-version: 7.23.0
+version: 7.23.1
 
 dependencies:
   - base >=4.9.1.0 && <5

From d4907cd776467dcd863ea761f9c0c88408e7248a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 19 Nov 2019 11:54:14 +0100
Subject: [PATCH 112/126] fix(sheet list): only show corrections after they are
 finished

Fixes #533
---
 src/Handler/Sheet.hs | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 661744614..bfbbdccaa 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -250,26 +250,34 @@ getSheetListR tid ssh csh = do
                       return $ CSubmissionR tid ssh csh sheetName cid' SubShowR
                 in anchorCellM mkRoute (mkCid >>= \cid2 -> [whamlet|#{cid2}|])
       , sortable (Just "rating") (i18nCell MsgRating)
-          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, mbSub,_)} ->
+          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, mbSub,_)} -> 
             let stats = sheetTypeSum sheetType in -- for statistics over all shown rows
             case mbSub of
               Nothing -> cellTell mempty $ stats Nothing
               (Just (Entity sid sub@Submission{..})) ->
-                let mkCid = encrypt sid
-                    mkRoute = do
-                      cid' <- mkCid
+                let
+                    mkRoute :: (MonadHandler m, HandlerSite m ~ UniWorX) => m (Route UniWorX)
+                    mkRoute = liftHandler $ do
+                      cid' <- encrypt sid
                       return $ CSubmissionR tid ssh csh sheetName cid' CorrectionR
                     mTuple mA mB = (,) <$> mA <*> mB -- Hamlet does not support enough haskell-syntax for this
                     acell = anchorCellM mkRoute $(widgetFile "widgets/rating/rating")
-                in cellTell acell $ stats submissionRatingPoints
+                    tellStats = do
+                      r <- mkRoute
+                      showRating <- hasReadAccessTo r
+                      tell . stats $ bool Nothing submissionRatingPoints showRating
+                in acell & cellContents %~ (<* tellStats)
 
       , sortable Nothing -- (Just "percent")
                         (i18nCell MsgRatingPercent)
-          $ \DBRow{dbrOutput=(Entity _ Sheet{sheetType=sType}, _, mbSub,_)} -> case mbSub of
-              (Just (Entity _ Submission{submissionRatingPoints=Just sPoints})) ->
+          $ \DBRow{dbrOutput=(Entity _ Sheet{sheetType=sType, sheetName}, _, mbSub,_)} -> case mbSub of
+              (Just (Entity sid Submission{submissionRatingPoints=Just sPoints})) ->
                 case preview (_grading . _maxPoints) sType of
                   Just maxPoints
-                    | maxPoints /= 0 -> textCell $ textPercent sPoints maxPoints
+                    | maxPoints /= 0 -> cell $ do
+                        cID <- encrypt sid
+                        showRating <- hasReadAccessTo $ CSubmissionR tid ssh csh sheetName cID CorrectionR
+                        bool (return ()) (toWidget . toMessage $ textPercent sPoints maxPoints) showRating
                   _other -> mempty
               _other -> mempty
       ]

From 413e436c615b9bb3b8eb18dd8546b258d208f22d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 19 Nov 2019 15:35:43 +0100
Subject: [PATCH 113/126] Revert "fix(cron): consider scheduling precision in
 all time comparisons"

This reverts commit 4ded04b80df94a4655af52b64cbcd156394286fd.
---
 src/Cron.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Cron.hs b/src/Cron.hs
index fe78ac694..5017e71d1 100644
--- a/src/Cron.hs
+++ b/src/Cron.hs
@@ -207,13 +207,13 @@ nextCronMatch tz mPrev prec now c@Cron{..} = case notAfter of
 
     execRef ref wasExecd cronAbsolute = case execRef' ref wasExecd cronAbsolute of
       MatchAt t
-        | t <= addUTCTime prec ref -> MatchAsap
+        | t <= ref -> MatchAsap
       other -> other
 
     execRef' ref wasExecd cronAbsolute = case cronAbsolute of
       CronAsap -> MatchAt ref
       CronTimestamp{ cronTimestamp = localTimeToUTCTZ tz -> ts }
-        | ref <= addUTCTime prec ts || not wasExecd -> MatchAt ts
+        | ref <= ts || not wasExecd -> MatchAt ts
         | otherwise -> MatchNone
       CronCalendar{..} -> listToMatch $ do
         let
@@ -341,7 +341,7 @@ nextCronMatch tz mPrev prec now c@Cron{..} = case notAfter of
         let localTimeOfDay = TimeOfDay (fromIntegral mCronHour) (fromIntegral mCronMinute) (fromIntegral mCronSecond)
             res = localTimeToUTCTZ tz LocalTime{..}
 
-        guard $ addUTCTime prec res >= ref
+        guard $ res >= ref
 
         return res
       CronNotScheduled -> MatchNone

From bc74c9ef10d8d5e115679f9b1ac43ea69030dd8e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 19 Nov 2019 15:51:20 +0100
Subject: [PATCH 114/126] fix(cron): disallow jobs executing twice within
 scheduling precision

---
 src/Cron.hs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Cron.hs b/src/Cron.hs
index 5017e71d1..36a063321 100644
--- a/src/Cron.hs
+++ b/src/Cron.hs
@@ -155,7 +155,7 @@ nextCronMatch :: TZ -- ^ Timezone of the `Cron`-Entry
               -> UTCTime -- ^ Current time, used only for `CronCalendar`
               -> Cron
               -> CronNextMatch UTCTime
-nextCronMatch tz mPrev prec now c@Cron{..} = case notAfter of
+nextCronMatch tz mPrev prec now c@Cron{..} = onlyOnceWithinPrec $ case notAfter of
   MatchAsap -> MatchNone
   MatchAt ts
     | MatchAt ts' <- nextMatch
@@ -165,6 +165,16 @@ nextCronMatch tz mPrev prec now c@Cron{..} = case notAfter of
     | otherwise -> MatchNone
   MatchNone -> nextMatch
   where
+    onlyOnceWithinPrec sched = case mPrev of
+      Nothing -> sched
+      Just prevT -> case sched of
+        MatchAsap
+          | now >= addUTCTime prec prevT -> MatchAsap
+          | otherwise -> MatchAt $ addUTCTime prec prevT
+        MatchAt ts -> let ts' = max ts $ addUTCTime prec prevT
+                       in if | ts' <= addUTCTime prec now -> MatchAsap
+                             | otherwise -> MatchAt ts'
+        MatchNone  -> MatchNone
     notAfter
       | Right c' <- cronNotAfter
       , Just ref <- notAfterRef

From 6b10299345db3d50fd350a6aa491aeb08f5948d4 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 19 Nov 2019 16:02:52 +0100
Subject: [PATCH 115/126] chore(release): 7.23.2

---
 CHANGELOG.md      | 10 ++++++++++
 package-lock.json |  2 +-
 package.json      |  2 +-
 package.yaml      |  2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01e3b1251..6abde7e5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [7.23.2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.23.1...v7.23.2) (2019-11-19)
+
+
+### Bug Fixes
+
+* **cron:** disallow jobs executing twice within scheduling precision ([bc74c9e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/bc74c9e))
+* **sheet list:** only show corrections after they are finished ([d4907cd](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d4907cd)), closes [#533](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/533)
+
+
+
 ### [7.23.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.23.0...v7.23.1) (2019-11-19)
 
 
diff --git a/package-lock.json b/package-lock.json
index b8f4e0d05..b36b043ef 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.23.1",
+  "version": "7.23.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f3e14cd69..e1ff22914 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.23.1",
+  "version": "7.23.2",
   "description": "",
   "keywords": [],
   "author": "",
diff --git a/package.yaml b/package.yaml
index 594542815..178fc67f7 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name:    uniworx
-version: 7.23.1
+version: 7.23.2
 
 dependencies:
   - base >=4.9.1.0 && <5

From 43833db3e110cad1224ee9599992cec64f24b8a4 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 19 Nov 2019 17:09:49 +0100
Subject: [PATCH 116/126] fix(cron-exec): consider lastExec before executing
 job

---
 src/Jobs.hs | 61 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 35 insertions(+), 26 deletions(-)

diff --git a/src/Jobs.hs b/src/Jobs.hs
index 98ebf0209..88e66b146 100644
--- a/src/Jobs.hs
+++ b/src/Jobs.hs
@@ -251,23 +251,26 @@ execCrontab :: RWST JobContext () (HashMap JobCtl (Max UTCTime)) (HandlerFor Uni
 -- ^ Keeping a `HashMap` of the latest execution times of `JobCtl`s we have
 --   seen, wait for the time of the next job and fire it
 execCrontab = do
-  mapRWST (liftHandler . runDB . setSerializable) $ do
-    let
-      mergeLastExec (Entity _leId CronLastExec{..})
-        | Just job <- Aeson.parseMaybe parseJSON cronLastExecJob
-        = State.modify $ HashMap.insertWith (<>) (JobCtlQueue job) (Max cronLastExecTime)
-        | otherwise = return ()
+  let
+    mergeState :: MonadResource m => RWST _ () _ (ReaderT SqlBackend m) ()
+    mergeState = do
+      let
+        mergeLastExec (Entity _leId CronLastExec{..})
+          | Just job <- Aeson.parseMaybe parseJSON cronLastExecJob
+          = State.modify $ HashMap.insertWith (<>) (JobCtlQueue job) (Max cronLastExecTime)
+          | otherwise = return ()
 
-      mergeQueued (Entity _qjId QueuedJob{..})
-        | Just job <- Aeson.parseMaybe parseJSON queuedJobContent
-        = State.modify $ HashMap.insertWith (<>) (JobCtlQueue job) (Max queuedJobCreationTime)
-        | otherwise = return ()
-    runConduit $ transPipe lift (selectSource [] []) .| C.mapM_ mergeLastExec
-    runConduit $ transPipe lift (selectSource [] []) .| C.mapM_ mergeQueued
+        mergeQueued (Entity _qjId QueuedJob{..})
+          | Just job <- Aeson.parseMaybe parseJSON queuedJobContent
+          = State.modify $ HashMap.insertWith (<>) (JobCtlQueue job) (Max queuedJobCreationTime)
+          | otherwise = return ()
+      runConduit $ transPipe lift (selectSource [] []) .| C.mapM_ mergeLastExec
+      runConduit $ transPipe lift (selectSource [] []) .| C.mapM_ mergeQueued
+  mapRWST (liftHandler . runDB . setSerializable) $ mergeState
 
   refT <- liftIO getCurrentTime
   settings <- getsYesod appSettings'
-  (currentCrontab, (jobCtl, nextMatch)) <- mapRWST (liftIO . atomically) $ do
+  (currentCrontab, (jobCtl, nextMatch), currentState) <- mapRWST (liftIO . atomically) $ do
     crontab <- liftBase . readTVar =<< asks jobCrontab
 
     State.modify . HashMap.filterWithKey $ \k _ -> HashMap.member k crontab
@@ -275,7 +278,7 @@ execCrontab = do
     case earliestJob settings prevExec crontab refT of
       Nothing -> liftBase retry
       Just (_, MatchNone) -> liftBase retry
-      Just x -> return (crontab, x)
+      Just x -> return (crontab, x, prevExec)
 
   do
     lastTimes <- State.get
@@ -284,18 +287,24 @@ execCrontab = do
 
   let doJob = mapRWST (liftHandler . runDBJobs . setSerializable) $ do
           newCrontab <- lift . hoist lift $ determineCrontab'
-          if
-            | ((==) `on` HashMap.lookup jobCtl) newCrontab currentCrontab
-              -> do
-                now <- liftIO $ getCurrentTime
-                foundation <- getYesod
-                State.modify $ HashMap.alter (Just . ($ Max now) . maybe id (<>)) jobCtl
-                case jobCtl of
-                  JobCtlQueue job -> lift $ queueDBJobCron job
-                  other -> runReaderT ?? foundation $ writeJobCtl other
-            | otherwise
-              -> mapRWST (liftIO . atomically) $
-                   liftBase . void . flip swapTVar newCrontab =<< asks jobCrontab
+          when (newCrontab /= currentCrontab) $ 
+            mapRWST (liftIO . atomically) $
+              liftBase . void . flip swapTVar newCrontab =<< asks jobCrontab
+
+          mergeState
+          newState <- State.get
+
+          let upToDate = and
+                [ ((==) `on` HashMap.lookup jobCtl) newCrontab currentCrontab
+                , ((==) `on` HashMap.lookup jobCtl) newState   currentState
+                ]
+          when upToDate $ do
+            now <- liftIO $ getCurrentTime
+            foundation <- getYesod
+            State.modify $ HashMap.alter (Just . ($ Max now) . maybe id (<>)) jobCtl
+            case jobCtl of
+              JobCtlQueue job -> lift $ queueDBJobCron job
+              other -> runReaderT ?? foundation $ writeJobCtl other
 
   case nextMatch of
     MatchAsap -> doJob

From b8f41ef0b36c092f734f9ee901b2f438ea21aab8 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 21 Nov 2019 10:50:27 +0100
Subject: [PATCH 117/126] feat(metrics): basic collection & export of metrics

---
 messages/uniworx/de-de-formal.msg |  7 ++++
 messages/uniworx/en-eu.msg        |  7 ++++
 package.yaml                      |  3 ++
 routes                            |  3 +-
 src/Application.hs                | 60 +++++++++++++++++++++++++++++--
 src/Foundation.hs                 | 12 ++++---
 src/Foundation/Routes.hs          | 10 ++++++
 src/Handler/Common.hs             |  5 ++-
 src/Handler/Metrics.hs            | 37 +++++++++++++++++++
 src/Handler/Utils/Routes.hs       | 11 ++++++
 src/Import/NoModel.hs             |  1 +
 src/Prometheus/Instances.hs       | 29 +++++++++++++++
 src/Utils/TH/Routes.hs            | 25 +++++++++++++
 stack.yaml                        |  3 ++
 templates/default-layout.lucius   |  2 +-
 templates/metrics.hamlet          | 41 +++++++++++++++++++++
 16 files changed, 246 insertions(+), 10 deletions(-)
 create mode 100644 src/Foundation/Routes.hs
 create mode 100644 src/Handler/Metrics.hs
 create mode 100644 src/Handler/Utils/Routes.hs
 create mode 100644 src/Prometheus/Instances.hs
 create mode 100644 src/Utils/TH/Routes.hs
 create mode 100644 templates/metrics.hamlet

diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index d5615c318..ac34ebfd6 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -1169,6 +1169,7 @@ BreadcrumbUser: Benutzer
 BreadcrumbStatic: Statische Resource
 BreadcrumbFavicon: Favicon
 BreadcrumbRobots: robots.txt
+BreadcrumbMetrics: Metriken
 BreadcrumbLecturerInvite: Einladung zum Kursverwalter
 BreadcrumbExamOfficeUserInvite: Einladung bzgl. Prüfungsleistungen
 BreadcrumbFunctionaryInvite: Einladung zum Instituts-Funktionär
@@ -1198,6 +1199,8 @@ BreadcrumbApplicationFiles: Bewerbungsdateien
 BreadcrumbCourseNewsArchive: Archiv
 BreadcrumbCourseNewsFile: Datei
 
+TitleMetrics: Metriken
+
 AuthPredsInfo: Um eigene Veranstaltungen aus Sicht der Teilnehmer anzusehen, können Veranstalter und Korrektoren hier die Prüfung ihrer erweiterten Berechtigungen temporär deaktivieren. Abgewählte Prädikate schlagen immer fehl. Abgewählte Prädikate werden also nicht geprüft um Zugriffe zu gewähren, welche andernfalls nicht erlaubt wären. Diese Einstellungen gelten nur temporär bis Ihre Sitzung abgelaufen ist, d.h. bis ihr Browser-Cookie abgelaufen ist. Durch Abwahl von Prädikaten kann man sich höchstens temporär aussperren.
 AuthPredsActive: Aktive Authorisierungsprädikate
 AuthPredsActiveChanged: Authorisierungseinstellungen für aktuelle Sitzung gespeichert
@@ -2129,3 +2132,7 @@ CommCourse: Kursmitteilung
 CommTutorial: Tutorium-Mitteilung
 Clone: Klonen
 Deficit: Defizit
+
+MetricNoSamples: Keine Messwerte
+MetricName: Name
+MetricValue: Wert
\ No newline at end of file
diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index 99313f48a..8f56e6a86 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -1165,6 +1165,7 @@ BreadcrumbUser: User
 BreadcrumbStatic: Static resource
 BreadcrumbFavicon: Favicon
 BreadcrumbRobots: robots.txt
+BreadcrumbMetrics: Metrics
 BreadcrumbLecturerInvite: Invitation to be a course administrator
 BreadcrumbExamOfficeUserInvite: Invitation regarding exam achievements
 BreadcrumbFunctionaryInvite: Invitation to be a department functionary
@@ -1194,6 +1195,8 @@ BreadcrumbApplicationFiles: Application files
 BreadcrumbCourseNewsArchive: Archive
 BreadcrumbCourseNewsFile: File
 
+TitleMetrics: Metrics
+
 AuthPredsInfo: To view their own courses like a participant would, administrators and correctors can deactivate the checking of their credentials temporarily. Disabled authorisation predicates always fail. This means that deactivated predicates are not checked to grant access where it would otherwise not be permitted. These settings are only temporary, until your session expires i.e. your browser-cookie does. By deactivating predicates you can lock yourself out temporarily, at most.
 AuthPredsActive: Active authorisation predicates
 AuthPredsActiveChanged: Authorisation settings saved for the current session
@@ -2125,3 +2128,7 @@ CommCourse: Course message
 CommTutorial: Tutorial message
 Clone: Cloning
 Deficit: Deficit
+
+MetricNoSamples: No samples
+MetricName: Name
+MetricValue: Value
\ No newline at end of file
diff --git a/package.yaml b/package.yaml
index 178fc67f7..b914b4d2d 100644
--- a/package.yaml
+++ b/package.yaml
@@ -141,6 +141,9 @@ dependencies:
   - generic-lens
   - array
   - cookie
+  - prometheus-client
+  - prometheus-metrics-ghc
+  - wai-middleware-prometheus
 
 other-extensions:
   - GeneralizedNewtypeDeriving
diff --git a/routes b/routes
index af3ba9fc1..469ec0297 100644
--- a/routes
+++ b/routes
@@ -40,7 +40,8 @@
 /auth   AuthR   Auth   getAuth                                !free
 
 /favicon.ico FaviconR GET                                     !free
-/robots.txt RobotsR GET                                       !free
+/robots.txt  RobotsR  GET                                     !free
+/metrics     MetricsR GET
 
 /                             HomeR            GET            !free
 /users                        UsersR           GET POST       -- no tags, i.e. admins only
diff --git a/src/Application.hs b/src/Application.hs
index 41ca6fed4..b1f13b800 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -22,6 +22,8 @@ import Database.Persist.Postgresql          (createPostgresqlPool, pgConnStr,
 import Import                        hiding (cancel)
 import Language.Haskell.TH.Syntax           (qLocation)
 import Network.Wai (Middleware)
+import qualified Network.Wai as Wai
+import qualified Network.HTTP.Types as HTTP
 import Network.Wai.Handler.Warp             (Settings, defaultSettings,
                                              defaultShouldDisplayException,
                                              runSettings, runSettingsSocket, setHost,
@@ -48,6 +50,7 @@ import System.Directory
 import Jobs
 
 import qualified Data.Text.Encoding as Text
+
 import Yesod.Auth.Util.PasswordStore
 
 import qualified Data.ByteString.Lazy as LBS
@@ -88,6 +91,15 @@ import qualified Data.Set as Set
 
 import Data.Semigroup (Max(..), Min(..))
 
+import qualified Prometheus.Metric.GHC as Prometheus
+import qualified Prometheus
+
+import Data.Time.Clock.POSIX
+
+import Handler.Utils.Routes (classifyHandler)
+
+import Data.List (cycle)
+
 -- Import all relevant handler modules here.
 -- (HPack takes care to add new modules to our cabal file nowadays.)
 import Handler.Common
@@ -111,6 +123,7 @@ import Handler.Health
 import Handler.Exam
 import Handler.Allocation
 import Handler.ExamOffice
+import Handler.Metrics
 
 
 -- This line actually creates our YesodDispatch instance. It is the second half
@@ -124,6 +137,8 @@ mkYesodDispatch "UniWorX" resourcesUniWorX
 -- migrations handled by Yesod.
 makeFoundation :: (MonadResource m, MonadUnliftIO m) => AppSettings -> m UniWorX
 makeFoundation appSettings'@AppSettings{..} = do
+    void $ Prometheus.register Prometheus.ghcMetrics
+  
     -- Some basic initializations: HTTP connection manager, logger, and static
     -- subsite.
     appHttpManager <- newManager
@@ -290,7 +305,39 @@ makeApplication foundation = liftIO $ do
     logWare <- makeLogWare foundation
     -- Create the WAI application and apply middlewares
     appPlain <- toWaiAppPlain foundation
-    return $ logWare $ defaultMiddlewaresNoLogging appPlain
+    return . prometheusMiddleware . logWare $ defaultMiddlewaresNoLogging appPlain
+  where
+    prometheusMiddleware :: Middleware
+    prometheusMiddleware app req respond' = do
+      start <- getPOSIXTime
+      app req $ \res -> do
+        end <- getPOSIXTime
+        let method  = decodeUtf8 $ Wai.requestMethod req
+            status  = tshow . HTTP.statusCode $ Wai.responseStatus res
+            route :: Maybe (Route UniWorX)
+            route   = parseRoute ( Wai.pathInfo req
+                                 , over (mapped . _2) (fromMaybe "") . HTTP.queryToQueryText $ Wai.queryString req
+                                 )
+            handler' = pack . classifyHandler <$> route
+
+            labels :: Prometheus.Label3
+            labels = (fromMaybe "n/a" handler', method, status)
+        Prometheus.withLabel requestLatency labels . flip Prometheus.observe . realToFrac $ end - start
+
+        respond' res
+
+{-# NOINLINE requestLatency #-}
+requestLatency :: Prometheus.Vector Prometheus.Label3 Prometheus.Histogram
+requestLatency = Prometheus.unsafeRegister
+               $ Prometheus.vector ("handler", "method", "status")
+               $ Prometheus.histogram info buckets
+  where info = Prometheus.Info "http_request_duration_seconds"
+                               "HTTP request latency"
+        buckets = map fromRational . takeWhile (<= 500) . go 50e-6 $ cycle [2, 2, 2.5]
+          where
+            go n []     = [n]
+            go n (f:fs) = n : go (f * n) fs
+
 
 makeLogWare :: MonadIO m => UniWorX -> m Middleware
 makeLogWare app = do
@@ -320,13 +367,22 @@ makeLogWare app = do
     logWare <- either mkLogWare return lookupRes
     logWare wai req fin
 
+data ReadySince = MkReadySince
+
 -- | Warp settings for the given foundation value.
 warpSettings :: UniWorX -> Settings
 warpSettings foundation = defaultSettings
     & setBeforeMainLoop (runAppLoggingT foundation $ do
                             let notifyReady = do
                                   $logInfoS "setup" "Ready"
-                                  void $ liftIO Systemd.notifyReady
+                                  void . liftIO $ do
+                                    void . Prometheus.register . readyMetric =<< getCurrentTime
+                                    Systemd.notifyReady
+                                readyMetric ts = Prometheus.Metric $ return (MkReadySince, collectReadySince)
+                                  where
+                                    collectReadySince = return $ [Prometheus.SampleGroup info Prometheus.GaugeType [Prometheus.Sample "ready_time" [] sample]]
+                                    info = Prometheus.Info "ready_time" "POSIXTime this Uni2work-instance became ready"
+                                    sample = encodeUtf8 . tshow . (realToFrac :: POSIXTime -> Nano) $ utcTimeToPOSIXSeconds ts
                             if
                               | foundation ^. _appHealthCheckDelayNotify
                                 -> void . forkIO $ do
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 2470d2088..4ac262136 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -8,6 +8,7 @@ module Foundation
 
 import Foundation.Type as Foundation
 import Foundation.I18n as Foundation
+import Foundation.Routes as Foundation
 
 
 import Import.NoFoundation hiding (embedFile)
@@ -107,7 +108,7 @@ import UnliftIO.Pool
 -- This function also generates the following type synonyms:
 -- type Handler x = HandlerT UniWorX IO x
 -- type Widget    = WidgetT  UniWorX IO ()
-mkYesodData "UniWorX" $(parseRoutesFile "routes")
+mkYesodData "UniWorX" uniworxRoutes
 
 deriving instance Generic CourseR
 deriving instance Generic SheetR
@@ -1680,10 +1681,11 @@ i18nCrumb msg mbR = do
 -- i.e. information might be leaked by not performing permission checks if the
 -- breadcrumb value depends on sensitive content (like an user's name).
 instance YesodBreadcrumbs UniWorX where
-  breadcrumb (AuthR _)        = i18nCrumb MsgMenuLogin   $ Just HomeR
-  breadcrumb (StaticR _)      = i18nCrumb MsgBreadcrumbStatic Nothing
-  breadcrumb FaviconR         = i18nCrumb MsgBreadcrumbFavicon Nothing
-  breadcrumb RobotsR          = i18nCrumb MsgBreadcrumbRobots Nothing
+  breadcrumb (AuthR _)        = i18nCrumb MsgMenuLogin         $ Just HomeR
+  breadcrumb (StaticR _)      = i18nCrumb MsgBreadcrumbStatic    Nothing
+  breadcrumb FaviconR         = i18nCrumb MsgBreadcrumbFavicon   Nothing
+  breadcrumb RobotsR          = i18nCrumb MsgBreadcrumbRobots    Nothing
+  breadcrumb MetricsR         = i18nCrumb MsgBreadcrumbMetrics   Nothing
 
   breadcrumb HomeR            = i18nCrumb MsgMenuHome      Nothing
   breadcrumb UsersR           = i18nCrumb MsgMenuUsers   $ Just AdminR
diff --git a/src/Foundation/Routes.hs b/src/Foundation/Routes.hs
new file mode 100644
index 000000000..614bdea6d
--- /dev/null
+++ b/src/Foundation/Routes.hs
@@ -0,0 +1,10 @@
+module Foundation.Routes
+  ( uniworxRoutes
+  ) where
+
+import ClassyPrelude.Yesod
+import Yesod.Routes.TH.Types (ResourceTree)
+
+
+uniworxRoutes :: [ResourceTree String]
+uniworxRoutes = $(parseRoutesFile "routes")
diff --git a/src/Handler/Common.hs b/src/Handler/Common.hs
index f11a76cfb..da1330be9 100644
--- a/src/Handler/Common.hs
+++ b/src/Handler/Common.hs
@@ -1,5 +1,8 @@
 -- | Common handler functions.
-module Handler.Common where
+module Handler.Common
+  ( getFaviconR
+  , getRobotsR
+  ) where
 
 import Data.FileEmbed (embedFile)
 import Import hiding (embedFile)
diff --git a/src/Handler/Metrics.hs b/src/Handler/Metrics.hs
new file mode 100644
index 000000000..72ebd06a3
--- /dev/null
+++ b/src/Handler/Metrics.hs
@@ -0,0 +1,37 @@
+module Handler.Metrics
+  ( getMetricsR
+  ) where
+
+import Import hiding (Info)
+
+import Prometheus
+import qualified Network.Wai.Middleware.Prometheus as Prometheus
+
+import qualified Data.Text as Text
+
+
+getMetricsR :: Handler TypedContent
+getMetricsR = selectRep $ do
+  provideRep (sendWaiApplication Prometheus.metricsApp :: Handler Text)
+  provideRep metricsHtml
+  provideRep $ collectMetrics >>= returnJson
+  where
+    metricsHtml :: Handler Html
+    metricsHtml = do
+      samples <- collectMetrics
+      defaultLayout $ do
+        setTitleI MsgTitleMetrics
+        $(widgetFile "metrics")
+
+    metricBasename base sName
+      | Just suffix <- Text.stripPrefix base sName
+      = if | Just suffix' <- Text.stripPrefix "_" suffix
+             -> suffix'
+           | otherwise
+             -> suffix
+      | otherwise
+      = sName
+    getLabels = nub . concatMap (\(Sample _ lPairs _) -> lPairs ^.. folded . _1)
+    singleSample base [Sample sName lPairs sValue]
+      | sName == base = Just (lPairs, sValue)
+    singleSample _ _ = Nothing
diff --git a/src/Handler/Utils/Routes.hs b/src/Handler/Utils/Routes.hs
new file mode 100644
index 000000000..52a93dfed
--- /dev/null
+++ b/src/Handler/Utils/Routes.hs
@@ -0,0 +1,11 @@
+module Handler.Utils.Routes
+  ( classifyHandler
+  ) where
+
+import Import
+
+import Utils.TH.Routes
+
+
+classifyHandler :: Route UniWorX -> String
+classifyHandler = $(classifyHandler' uniworxRoutes)
diff --git a/src/Import/NoModel.hs b/src/Import/NoModel.hs
index 13d03d064..8b0082217 100644
--- a/src/Import/NoModel.hs
+++ b/src/Import/NoModel.hs
@@ -152,6 +152,7 @@ import Crypto.Hash.Instances as Import ()
 import Colonnade.Instances as Import ()
 import Data.Bool.Instances as Import ()
 import Data.Encoding.Instances as Import ()
+import Prometheus.Instances as Import ()
 
 import Crypto.Hash as Import (Digest, SHA3_256)
 
diff --git a/src/Prometheus/Instances.hs b/src/Prometheus/Instances.hs
new file mode 100644
index 000000000..ba217324b
--- /dev/null
+++ b/src/Prometheus/Instances.hs
@@ -0,0 +1,29 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Prometheus.Instances
+  () where
+
+import ClassyPrelude
+import Prometheus
+import Data.Aeson
+
+import qualified Data.Map.Strict as Map
+
+
+instance ToJSON SampleType where
+  toJSON = String . tshow
+
+instance ToJSON SampleGroup where
+  toJSON (SampleGroup Info{..} sgType samples) = object
+    [ "name" .= metricName
+    , "help" .= metricHelp
+    , "type" .= sgType
+    , "metrics" .= samples
+    ]
+
+instance ToJSON Sample where
+  toJSON (Sample sName sLabels sValue) = object
+    [ "name" .= sName
+    , "labels" .= Map.fromList sLabels
+    , "value" .= decodeUtf8 sValue
+    ]
diff --git a/src/Utils/TH/Routes.hs b/src/Utils/TH/Routes.hs
new file mode 100644
index 000000000..18f8a7805
--- /dev/null
+++ b/src/Utils/TH/Routes.hs
@@ -0,0 +1,25 @@
+module Utils.TH.Routes
+  ( classifyHandler'
+  ) where
+
+import ClassyPrelude
+import Yesod.Routes.TH.Types (ResourceTree, FlatResource(..), Piece(..), Dispatch(..), flatten)
+
+import Language.Haskell.TH
+
+
+classifyHandler' :: [ResourceTree String] -> ExpQ
+classifyHandler' = lamCaseE . map toMatch . flatten
+  where
+    toMatch FlatResource{..} = match (toPattern frDispatch $ frParentPieces ++ [(frName, frPieces)]) (normalB . litE $ stringL frName) []
+    toPattern _ [] = error "Empty hierarchy in toPattern"
+    toPattern dp [(mkName -> con, dynPieces -> pieces)] = conP con $ replicate pieces wildP ++ dispatchPattern dp
+    toPattern dp ( (mkName -> con, dynPieces -> pieces) : xs) = conP con $ replicate pieces wildP ++ [ toPattern dp xs ]
+    dispatchPattern (Methods Nothing _) = []
+    dispatchPattern (Methods (Just _) _) = [wildP]
+    dispatchPattern (Subsite _ _) = [wildP]
+
+    dynPieces = length . mapMaybe onlyDyn
+      where
+        onlyDyn (Static _) = Nothing
+        onlyDyn p@(Dynamic _) = Just p
diff --git a/stack.yaml b/stack.yaml
index f83be73a7..a5abb45dd 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -60,5 +60,8 @@ extra-deps:
 
   - generic-lens-1.2.0.0
 
+  - prometheus-metrics-ghc-1.0.0
+  - wai-middleware-prometheus-1.0.0
+
 resolver: lts-13.21
 allow-newer: true
diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius
index b6fc07906..11355082b 100644
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@@ -558,7 +558,7 @@ ul.list--inline {
 @media (min-width: 768px) {
 
   .deflist {
-    grid-template-columns: max-content minmax(0, max-content);
+    grid-template-columns: fit-content(25vw) 1fr;
 
     .deflist {
       margin-top: -10px;
diff --git a/templates/metrics.hamlet b/templates/metrics.hamlet
new file mode 100644
index 000000000..9f4a780a3
--- /dev/null
+++ b/templates/metrics.hamlet
@@ -0,0 +1,41 @@
+$newline never
+<dl .deflist>
+  $forall SampleGroup Info{..} _ mSamples <- samples
+    <dt .deflist__dt>
+      <div>#{metricName}
+      <p style="font-weight: 600; color: var(--color-fontsec); font-size: 0.9rem; margin-top: 7px">
+        #{metricHelp}
+    <dd .deflist__dd style="overflow: auto; max-height: 50vh">
+      $case mSamples
+        $of []
+          <p style="font-style: italic">_{MsgMetricNoSamples}
+        $of _
+          $maybe (lPairs, sValue) <- singleSample metricName mSamples
+            <p>
+              #{decodeUtf8 sValue}
+            $case lPairs
+              $of []
+              $of _
+                <ul .list-inline .list--comma-separated>
+                  $forall (lName, lValue) <- lPairs
+                    <li>#{lName}=#{lValue}
+          $nothing
+            $with allLabels <- getLabels mSamples
+              <table .table .table--striped .table--hover>
+                <thead>
+                  <tr .table__row .table__row--head>
+                    <th .table__th>_{MsgMetricName}
+                    $forall l <- allLabels
+                      <th .table__th style="font-family: monospace">#{l}
+                    <th .table__th>_{MsgMetricValue}
+                <tbody>
+                  $forall Sample sName lPairs sValue <- mSamples
+                    <tr .table__row>
+                      <td .table__td title=#{sName}>
+                        #{metricBasename metricName sName}
+                      $forall l <- allLabels
+                        <td .table__td>
+                          $maybe lValue <- lookup l lPairs
+                            #{lValue}
+                      <td .table__td>
+                        #{decodeUtf8 sValue}

From 97f62b92c1cc8a68682f6df3b104bd20e0e035b7 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 21 Nov 2019 12:06:59 +0100
Subject: [PATCH 118/126] fix: typos

---
 src/Utils/Sql.hs | 2 +-
 start.sh         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Utils/Sql.hs b/src/Utils/Sql.hs
index 9726b5222..97805b159 100644
--- a/src/Utils/Sql.hs
+++ b/src/Utils/Sql.hs
@@ -28,7 +28,7 @@ setSerializable act = recovering policy [logRetries suggestRetry logRetry] act'
              -> SqlError
              -> RetryStatus
              -> ReaderT SqlBackend m ()
-    logRetry shouldRetry err status = $logDebugS "Sql" . pack $ defaultLogMsg shouldRetry err status
+    logRetry shouldRetry err status = $logDebugS "SQL" . pack $ defaultLogMsg shouldRetry err status
 
     act' :: RetryStatus -> ReaderT SqlBackend m a
     act' RetryStatus{..}
diff --git a/start.sh b/start.sh
index 40da9eb05..49f9e79f3 100755
--- a/start.sh
+++ b/start.sh
@@ -6,7 +6,7 @@ set -e
 
 __HOST=${HOST:-$(hostname -s | awk '{ print $0; }')}
 
-export DETAILED_LOGGING=${DETAILED_LOGGIN:-true}
+export DETAILED_LOGGING=${DETAILED_LOGGING:-true}
 export LOG_ALL=${LOG_ALL:-false}
 export LOGLEVEL=${LOGLEVEL:-info}
 export DUMMY_LOGIN=${DUMMY_LOGIN:-true}

From 2d4ccd693394ac75aef291cdadf5bdbc72e173ac Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 21 Nov 2019 13:09:19 +0100
Subject: [PATCH 119/126] fix(watchdog): improve status&watchdog notification

---
 src/Application.hs                            | 60 ++++++++++---------
 .../Universe/Instances/Reverse/WithIndex.hs   | 20 +++++++
 src/Import/NoModel.hs                         |  1 +
 3 files changed, 54 insertions(+), 27 deletions(-)
 create mode 100644 src/Data/Universe/Instances/Reverse/WithIndex.hs

diff --git a/src/Application.hs b/src/Application.hs
index b1f13b800..c7a8e046a 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -84,12 +84,11 @@ import Network.Socket (socketPort, Socket, PortNumber)
 import qualified Network.Socket as Socket (close)
 
 import Control.Concurrent.STM.Delay
-import Control.Monad.STM (retry)
 import Control.Monad.Trans.Cont (runContT, callCC)
 
 import qualified Data.Set as Set
 
-import Data.Semigroup (Max(..), Min(..))
+import Data.Semigroup (Min(..))
 
 import qualified Prometheus.Metric.GHC as Prometheus
 import qualified Prometheus
@@ -481,39 +480,46 @@ appMain = runResourceT $ do
       case watchdogMicroSec of
         Just wInterval
           | maybe True (== myProcessID) watchdogProcess
-            -> let notifyWatchdog :: IO ()
+            -> let notifyWatchdog :: forall a. IO a
                    notifyWatchdog = runAppLoggingT foundation $ go Nothing
                      where
-                       go pStatus = do
-                         d <- liftIO . newDelay . floor $ wInterval % 2
+                       go :: Maybe (Set (UTCTime, HealthReport)) -> LoggingT IO a
+                       go pResults = do
+                         let delay = floor $ wInterval % 2
+                         d <- liftIO $ newDelay delay
 
-                         status <- atomically $ asum
-                           [ Nothing <$ waitDelay d
-                           , Just <$> do
+                         $logDebugS "Notify" $ "Waiting up to " <> tshow delay <> "µs..."
+                         mResults <- atomically $ asum
+                           [ pResults <$ waitDelay d
+                           , do
                                results <- readTVar $ foundation ^. _appHealthReport
-                               case fromNullable results of
-                                 Nothing -> retry
-                                 Just rs -> do
-                                   let status = ofoldMap1 (Max *** Min . healthReportStatus) rs
-                                   guard $ pStatus /= Just status
-                                   return status
+                               guardOn (pResults /= Just results) $ Just results
                            ]
 
-                         case status of
-                           Just (_, Min status') -> do
-                             $logInfoS "NotifyStatus" $ toPathPiece status'
-                             liftIO . void . Systemd.notifyStatus . unpack $ toPathPiece status'
-                           Nothing -> return ()
+                         $logDebugS "Notify" "Checking for status/watchdog..."
+                         (*> go mResults) . void . runMaybeT $ do
+                           results <- hoistMaybe mResults
 
-                         case status of
-                           Just (_, Min HealthSuccess) -> do
-                             $logInfoS "NotifyWatchdog" "Notify"
-                             liftIO $ void Systemd.notifyWatchdog
-                           _other -> return ()
+                           Min status <- hoistMaybe $ ofoldMap1 (Min . healthReportStatus . view _2) <$> fromNullable results
+                           $logInfoS "NotifyStatus" $ toPathPiece status
+                           liftIO . void . Systemd.notifyStatus . unpack $ toPathPiece status
 
-                         go status
-                in void $ allocateLinkedAsync notifyWatchdog
-        _other -> return ()
+                           now <- liftIO getCurrentTime
+                           iforM_ (foundation ^. _appHealthCheckInterval) . curry $ \case
+                             (_, Nothing) -> return ()
+                             (hc, Just interval) -> do
+                               lastSuccess <- hoistMaybe $ results
+                                 & Set.filter (\(_, rep) -> classifyHealthReport rep == hc)
+                                 & Set.filter (\(_, rep) -> healthReportStatus rep >= HealthSuccess)
+                                 & Set.mapMonotonic (view _1)
+                                 & Set.lookupMax
+                               guard $ lastSuccess > addUTCTime (negate interval) now
+                           $logInfoS "NotifyWatchdog" "Notify"
+                           liftIO $ void Systemd.notifyWatchdog
+                in do
+                     $logDebugS "Notify" "Spawning notify thread..."
+                     void $ allocateLinkedAsync notifyWatchdog
+        _other -> $logWarnS "Notify" "Not sending notifications of status/poking watchdog"
 
       let runWarp socket = runSettingsSocket (warpSettings foundation) socket app
       case sockets of
diff --git a/src/Data/Universe/Instances/Reverse/WithIndex.hs b/src/Data/Universe/Instances/Reverse/WithIndex.hs
new file mode 100644
index 000000000..ff6550058
--- /dev/null
+++ b/src/Data/Universe/Instances/Reverse/WithIndex.hs
@@ -0,0 +1,20 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Data.Universe.Instances.Reverse.WithIndex
+  (
+  ) where
+
+import ClassyPrelude
+
+import Data.Universe
+import Control.Lens.Indexed
+
+import Data.Universe.Instances.Reverse ()
+
+import qualified Data.Map as Map
+
+
+instance Finite a => FoldableWithIndex a ((->) a) where
+  ifoldMap f g = fold [ f x (g x) | x <- universeF ]
+instance (Ord a, Finite a) => TraversableWithIndex a ((->) a) where
+  itraverse f g = (Map.!) . Map.fromList <$> sequenceA [ (x, ) <$> f x (g x) | x <- universeF ]
diff --git a/src/Import/NoModel.hs b/src/Import/NoModel.hs
index 8b0082217..a49652b60 100644
--- a/src/Import/NoModel.hs
+++ b/src/Import/NoModel.hs
@@ -142,6 +142,7 @@ import Text.Blaze.Instances as Import ()
 import Jose.Jwt.Instances as Import ()
 import Web.PathPieces.Instances as Import ()
 import Data.Universe.Instances.Reverse.MonoTraversable ()
+import Data.Universe.Instances.Reverse.WithIndex ()
 import Database.Persist.Class.Instances as Import ()
 import Database.Persist.Types.Instances as Import ()
 import Data.UUID.Instances as Import ()

From 2462c68f49d9952eeb4c9f5413c53d307f10975a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 21 Nov 2019 16:17:54 +0100
Subject: [PATCH 120/126] fix(submissions): fix users being deleted for other
 submissions

---
 src/Handler/Submission.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Handler/Submission.hs b/src/Handler/Submission.hs
index d132683b1..0e7cbe547 100644
--- a/src/Handler/Submission.hs
+++ b/src/Handler/Submission.hs
@@ -486,7 +486,7 @@ submissionHelper tid ssh csh shn mcid = do
             | otherwise -> case change of
               Left subEmail -> deleteInvitation @SubmissionUser smid subEmail
               Right subUid  -> do
-                deleteWhere [SubmissionUserUser ==. subUid]
+                deleteBy $ UniqueSubmissionUser subUid smid
                 audit $ TransactionSubmissionUserDelete smid subUid
           
           addMessageI Success $ if | Nothing <- msmid -> MsgSubmissionCreated

From e1052a60ad3c10a8cf3603fd278bf123c7e8f595 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 21 Nov 2019 16:19:14 +0100
Subject: [PATCH 121/126] refactor: hlint

---
 src/Application.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Application.hs b/src/Application.hs
index c7a8e046a..2da92e313 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -379,7 +379,7 @@ warpSettings foundation = defaultSettings
                                     Systemd.notifyReady
                                 readyMetric ts = Prometheus.Metric $ return (MkReadySince, collectReadySince)
                                   where
-                                    collectReadySince = return $ [Prometheus.SampleGroup info Prometheus.GaugeType [Prometheus.Sample "ready_time" [] sample]]
+                                    collectReadySince = return [Prometheus.SampleGroup info Prometheus.GaugeType [Prometheus.Sample "ready_time" [] sample]]
                                     info = Prometheus.Info "ready_time" "POSIXTime this Uni2work-instance became ready"
                                     sample = encodeUtf8 . tshow . (realToFrac :: POSIXTime -> Nano) $ utcTimeToPOSIXSeconds ts
                             if

From ad96830a992947e2ec06dd48d7146b5cb0d1ce5e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 21 Nov 2019 16:19:56 +0100
Subject: [PATCH 122/126] chore(release): 7.24.0

---
 CHANGELOG.md      | 17 +++++++++++++++++
 package-lock.json |  2 +-
 package.json      |  2 +-
 package.yaml      |  2 +-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6abde7e5e..2732ae797 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,23 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [7.24.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.23.2...v7.24.0) (2019-11-21)
+
+
+### Bug Fixes
+
+* **submissions:** fix users being deleted for other submissions ([2462c68](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2462c68))
+* **watchdog:** improve status&watchdog notification ([2d4ccd6](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2d4ccd6))
+* typos ([97f62b9](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/97f62b9))
+* **cron-exec:** consider lastExec before executing job ([43833db](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/43833db))
+
+
+### Features
+
+* **metrics:** basic collection & export of metrics ([b8f41ef](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/b8f41ef))
+
+
+
 ### [7.23.2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.23.1...v7.23.2) (2019-11-19)
 
 
diff --git a/package-lock.json b/package-lock.json
index b36b043ef..95e7c56d2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.23.2",
+  "version": "7.24.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e1ff22914..d8104f1f1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.23.2",
+  "version": "7.24.0",
   "description": "",
   "keywords": [],
   "author": "",
diff --git a/package.yaml b/package.yaml
index b914b4d2d..7350ec9de 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name:    uniworx
-version: 7.23.2
+version: 7.24.0
 
 dependencies:
   - base >=4.9.1.0 && <5

From 9204565cac7b2c52f5d69ada066824e37ba6ae38 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 21 Nov 2019 18:41:21 +0100
Subject: [PATCH 123/126] feat: usergroups & metrics usergroup

Fixes #538
---
 messages/uniworx/de-de-formal.msg          |  2 +
 models/users.model                         |  9 +++
 package.yaml                               |  2 +-
 src/Foundation.hs                          | 12 +++-
 src/Handler/Course/LecturerInvite.hs       |  2 +-
 src/Handler/Course/ParticipantInvite.hs    |  2 +-
 src/Handler/Exam/CorrectorInvite.hs        |  2 +-
 src/Handler/Exam/RegistrationInvite.hs     |  2 +-
 src/Handler/ExamOffice/Users.hs            |  2 +-
 src/Handler/Metrics.hs                     |  8 +++
 src/Handler/Sheet.hs                       |  2 +-
 src/Handler/Submission.hs                  |  2 +-
 src/Handler/Tutorial/TutorInvite.hs        |  2 +-
 src/Handler/Users.hs                       |  2 +-
 src/Handler/Utils/Invitations.hs           |  2 +-
 src/Jobs/Handler/ChangeUserDisplayEmail.hs |  2 +-
 src/Jobs/Handler/SendNotification/Utils.hs |  2 +-
 src/Jobs/Handler/SendPasswordReset.hs      |  2 +-
 src/Model/Tokens.hs                        | 10 +--
 src/Model/Types/Security.hs                | 23 ++++++
 src/Model/Types/TH/PathPiece.hs            | 15 ++--
 src/Utils/Tokens.hs                        |  2 +-
 templates/metrics.hamlet                   | 81 ++++++++++++----------
 23 files changed, 126 insertions(+), 64 deletions(-)

diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index ac34ebfd6..4c262a059 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -386,6 +386,8 @@ UnauthorizedTokenNotStarted: Ihr Authorisierungs-Token ist noch nicht gültig.
 UnauthorizedTokenInvalid: Ihr Authorisierungs-Token konnte nicht verarbeitet werden.
 UnauthorizedTokenInvalidRoute: Ihr Authorisierungs-Token ist auf dieser Unterseite nicht gültig.
 UnauthorizedTokenInvalidAuthority: Ihr Authorisierungs-Token basiert auf den Rechten eines Nutzers, der nicht mehr existiert.
+UnauthorizedTokenInvalidAuthorityGroup: Ihr Authorisierungs-Token basiert auf den Rechten einer Gruppe von Nutzern, die nicht mehr existiert.
+UnauthorizedTokenInvalidAuthorityValue: Ihr Authorisierungs-Token basiert auf Rechten, deren Spezifikation nicht interpretiert werden konnte.
 UnauthorizedToken404: Authorisierungs-Tokens können nicht auf Fehlerseiten ausgewertet werden.
 UnauthorizedSiteAdmin: Sie sind kein System-weiter Administrator.
 UnauthorizedSchoolAdmin: Sie sind nicht als Administrator für dieses Institut eingetragen.
diff --git a/models/users.model b/models/users.model
index 57ae421cf..55ee044db 100644
--- a/models/users.model
+++ b/models/users.model
@@ -83,3 +83,12 @@ StudyTermCandidate    -- No one at LMU is willing and able to tell us the meanin
     key           Int      -- a possible key for the studyTermName
     name          Text     -- studyTermName as plain text from LDAP
     deriving Show Eq Ord
+
+UserGroupMember
+    group         UserGroupName
+    user          UserId
+    primary       Checkmark nullable
+
+    UniquePrimaryUserGroupMember group primary !force
+    UniqueUserGroupMember group user
+    
\ No newline at end of file
diff --git a/package.yaml b/package.yaml
index 7350ec9de..9606e398f 100644
--- a/package.yaml
+++ b/package.yaml
@@ -240,7 +240,7 @@ executables:
     ghc-options:
       - -threaded
       - -rtsopts
-      - -with-rtsopts=-N
+      - -with-rtsopts="-N -T"
     dependencies:
       - uniworx
     when:
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 4ac262136..688793330 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -360,7 +360,15 @@ validateToken mAuthId' route' isWrite' token' = $runCachedMemoT $ for4 memo vali
     validateToken' mAuthId route isWrite BearerToken{..} = lift . exceptT return return $ do
       guardMExceptT (maybe True (HashSet.member route) tokenRoutes) (unauthorizedI MsgUnauthorizedTokenInvalidRoute)
 
-      User{userTokensIssuedAfter} <- maybeMExceptT (unauthorizedI MsgUnauthorizedTokenInvalidAuthority) $ get tokenAuthority
+      tokenAuthority' <- case tokenAuthority of
+        Left tVal
+          | JSON.Success groupName <- JSON.fromJSON tVal -> maybeT (throwError =<< unauthorizedI MsgUnauthorizedTokenInvalidAuthorityGroup) . hoist lift $ do
+              Entity _ UserGroupMember{..} <- MaybeT . getBy $ UniquePrimaryUserGroupMember groupName Active
+              return userGroupMemberUser
+          | otherwise -> throwError =<< unauthorizedI MsgUnauthorizedTokenInvalidAuthorityValue
+        Right uid -> return uid
+        
+      User{userTokensIssuedAfter} <- maybeMExceptT (unauthorizedI MsgUnauthorizedTokenInvalidAuthority) $ get tokenAuthority'
       guardMExceptT (Just tokenIssuedAt >= userTokensIssuedAfter) (unauthorizedI MsgUnauthorizedTokenExpired)
 
       let
@@ -370,7 +378,7 @@ validateToken mAuthId' route' isWrite' token' = $runCachedMemoT $ for4 memo vali
 
       authorityVal <- do
         dnf <- either throwM return $ routeAuthTags route
-        fmap fst . runWriterT $ evalAuthTags (AuthTagActive $ const True) (noTokenAuth dnf) (Just tokenAuthority) route isWrite
+        fmap fst . runWriterT $ evalAuthTags (AuthTagActive $ const True) (noTokenAuth dnf) (Just tokenAuthority') route isWrite
       guardExceptT (is _Authorized authorityVal) authorityVal
 
       whenIsJust tokenAddAuth $ \addDNF -> do
diff --git a/src/Handler/Course/LecturerInvite.hs b/src/Handler/Course/LecturerInvite.hs
index 753bd7c10..44b27ce64 100644
--- a/src/Handler/Course/LecturerInvite.hs
+++ b/src/Handler/Course/LecturerInvite.hs
@@ -66,7 +66,7 @@ lecturerInvitationConfig = InvitationConfig{..}
     invitationHeading (Entity _ Course{..}) _ = return . SomeMessage $ MsgCourseLecInviteHeading $ CI.original courseName
     invitationExplanation _ _ = return [ihamlet|_{SomeMessage MsgCourseLecInviteExplanation}|]
     invitationTokenConfig _ _ = do
-      itAuthority <- liftHandler requireAuthId
+      itAuthority <- Right <$> liftHandler requireAuthId
       return $ InvitationTokenConfig itAuthority Nothing Nothing Nothing
     invitationRestriction _ _ = return Authorized
     invitationForm _ (InvDBDataLecturer mlType, _) _ = hoistAForm liftHandler $ toJunction <$> case mlType of
diff --git a/src/Handler/Course/ParticipantInvite.hs b/src/Handler/Course/ParticipantInvite.hs
index 6e2baca9d..280a69d6f 100644
--- a/src/Handler/Course/ParticipantInvite.hs
+++ b/src/Handler/Course/ParticipantInvite.hs
@@ -83,7 +83,7 @@ participantInvitationConfig = InvitationConfig{..}
     invitationHeading     (Entity _ Course{..}) _ = return . SomeMessage $ MsgCourseParticipantInviteHeading $ CI.original courseName
     invitationExplanation  _                    _ = return [ihamlet|_{SomeMessage MsgCourseParticipantInviteExplanation}|]
     invitationTokenConfig _ _ = do
-      itAuthority <- liftHandler requireAuthId
+      itAuthority <- Right <$> liftHandler requireAuthId
       return $ InvitationTokenConfig itAuthority Nothing Nothing Nothing
     invitationRestriction _ _ = return Authorized
     invitationForm (Entity _ Course{..}) _ uid = hoistAForm lift . wFormToAForm $ do
diff --git a/src/Handler/Exam/CorrectorInvite.hs b/src/Handler/Exam/CorrectorInvite.hs
index 8314a8ca1..d207ff9ef 100644
--- a/src/Handler/Exam/CorrectorInvite.hs
+++ b/src/Handler/Exam/CorrectorInvite.hs
@@ -67,7 +67,7 @@ examCorrectorInvitationConfig = InvitationConfig{..}
     invitationHeading (Entity _ Exam{..}) _ = return . SomeMessage $ MsgExamCorrectorInviteHeading examName
     invitationExplanation _ _ = return [ihamlet|_{SomeMessage MsgExamCorrectorInviteExplanation}|]
     invitationTokenConfig _ _ = do
-      itAuthority <- liftHandler requireAuthId
+      itAuthority <- Right <$> liftHandler requireAuthId
       return $ InvitationTokenConfig itAuthority Nothing Nothing Nothing
     invitationRestriction _ _ = return Authorized
     invitationForm _ _ _ = pure (JunctionExamCorrector, ())
diff --git a/src/Handler/Exam/RegistrationInvite.hs b/src/Handler/Exam/RegistrationInvite.hs
index 8a157f72d..cfd109f94 100644
--- a/src/Handler/Exam/RegistrationInvite.hs
+++ b/src/Handler/Exam/RegistrationInvite.hs
@@ -77,7 +77,7 @@ examRegistrationInvitationConfig = InvitationConfig{..}
     invitationHeading (Entity _ Exam{..}) _ = return . SomeMessage $ MsgExamRegistrationInviteHeading examName
     invitationExplanation _ _ = return [ihamlet|_{SomeMessage MsgExamRegistrationInviteExplanation}|]
     invitationTokenConfig _ (InvDBDataExamRegistration{..}, _) = do
-      itAuthority <- liftHandler requireAuthId
+      itAuthority <- Right <$> liftHandler requireAuthId
       let itExpiresAt = Just $ Just invDBExamRegistrationDeadline
           itAddAuth
             | not invDBExamRegistrationCourseRegister
diff --git a/src/Handler/ExamOffice/Users.hs b/src/Handler/ExamOffice/Users.hs
index 0a5d3b9bd..3e688c936 100644
--- a/src/Handler/ExamOffice/Users.hs
+++ b/src/Handler/ExamOffice/Users.hs
@@ -67,7 +67,7 @@ examOfficeUserInvitationConfig = InvitationConfig{..}
       return . SomeMessage $ MsgExamOfficeUserInviteHeading userDisplayName
     invitationExplanation _ _ = return [ihamlet|_{SomeMessage MsgExamOfficeUserInviteExplanation}|]
     invitationTokenConfig _ _ = do
-      itAuthority <- liftHandler requireAuthId
+      itAuthority <- Right <$> liftHandler requireAuthId
       let itExpiresAt = Nothing
           itStartsAt = Nothing
           itAddAuth = Nothing
diff --git a/src/Handler/Metrics.hs b/src/Handler/Metrics.hs
index 72ebd06a3..b51d8ebe9 100644
--- a/src/Handler/Metrics.hs
+++ b/src/Handler/Metrics.hs
@@ -8,6 +8,7 @@ import Prometheus
 import qualified Network.Wai.Middleware.Prometheus as Prometheus
 
 import qualified Data.Text as Text
+import qualified Data.HashSet as HashSet
 
 
 getMetricsR :: Handler TypedContent
@@ -19,6 +20,13 @@ getMetricsR = selectRep $ do
     metricsHtml :: Handler Html
     metricsHtml = do
       samples <- collectMetrics
+
+      metricsToken <- runMaybeT . hoist runDB $ do
+        uid <- MaybeT maybeAuthId
+        guardM . lift . existsBy $ UniqueUserGroupMember UserGroupMetrics uid
+
+        encodeToken =<< bearerToken (Left $ toJSON UserGroupMetrics) (Just $ HashSet.singleton MetricsR) Nothing (Just Nothing) Nothing
+  
       defaultLayout $ do
         setTitleI MsgTitleMetrics
         $(widgetFile "metrics")
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index bfbbdccaa..bc5c308d4 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -888,7 +888,7 @@ correctorInvitationConfig = InvitationConfig{..}
     invitationHeading (Entity _ Sheet{..}) _ = return . SomeMessage $ MsgSheetCorrInviteHeading sheetName
     invitationExplanation _ _ = return [ihamlet|_{SomeMessage MsgSheetCorrInviteExplanation}|]
     invitationTokenConfig _ _ = do
-      itAuthority <- liftHandler requireAuthId
+      itAuthority <- Right <$> liftHandler requireAuthId
       return $ InvitationTokenConfig itAuthority Nothing Nothing Nothing
     invitationRestriction _ _ = return Authorized
     invitationForm _ (InvDBDataSheetCorrector cLoad cState, _) _ = pure $ (JunctionSheetCorrector cLoad cState, ())
diff --git a/src/Handler/Submission.hs b/src/Handler/Submission.hs
index 0e7cbe547..9f3fe2788 100644
--- a/src/Handler/Submission.hs
+++ b/src/Handler/Submission.hs
@@ -107,7 +107,7 @@ submissionUserInvitationConfig = InvitationConfig{..}
     invitationTokenConfig (Entity _ Submission{..}) _ = do
       Sheet{..} <- getJust submissionSheet
       Course{..} <- getJust sheetCourse
-      itAuthority <- liftHandler requireAuthId
+      itAuthority <- Right <$> liftHandler requireAuthId
       itAddAuth <- either throwM (return . Just) $ routeAuthTags (CSheetR courseTerm courseSchool courseShorthand sheetName SubmissionNewR)
       let itExpiresAt = Nothing
           itStartsAt = Nothing
diff --git a/src/Handler/Tutorial/TutorInvite.hs b/src/Handler/Tutorial/TutorInvite.hs
index 1c1f119db..e78953b67 100644
--- a/src/Handler/Tutorial/TutorInvite.hs
+++ b/src/Handler/Tutorial/TutorInvite.hs
@@ -64,7 +64,7 @@ tutorInvitationConfig = InvitationConfig{..}
     invitationHeading (Entity _ Tutorial{..}) _ = return . SomeMessage $ MsgTutorInviteHeading tutorialName
     invitationExplanation _ _ = return [ihamlet|_{SomeMessage MsgTutorInviteExplanation}|]
     invitationTokenConfig _ _ = do
-      itAuthority <- liftHandler requireAuthId
+      itAuthority <- Right <$> liftHandler requireAuthId
       return $ InvitationTokenConfig itAuthority Nothing Nothing Nothing
     invitationRestriction _ _ = return Authorized
     invitationForm _ _ _ = pure (JunctionTutor, ())
diff --git a/src/Handler/Users.hs b/src/Handler/Users.hs
index e11f6a557..c2d944690 100644
--- a/src/Handler/Users.hs
+++ b/src/Handler/Users.hs
@@ -572,7 +572,7 @@ functionInvitationConfig = InvitationConfig{..}
       MsgRenderer mr <- getMsgRenderer
       return [ihamlet|_{SomeMessage $ MsgSchoolFunctionInviteExplanation (mr $ SomeMessage invTokenUserFunctionFunction)}|]
     invitationTokenConfig _ (InvDBDataUserFunction{..}, _) = do
-      itAuthority <- liftHandler requireAuthId
+      itAuthority <- Right <$> liftHandler requireAuthId
       let itExpiresAt = Just $ Just invDBUserFunctionDeadline
           itAddAuth = Nothing
           itStartsAt = Nothing
diff --git a/src/Handler/Utils/Invitations.hs b/src/Handler/Utils/Invitations.hs
index 7780709a1..c4230890b 100644
--- a/src/Handler/Utils/Invitations.hs
+++ b/src/Handler/Utils/Invitations.hs
@@ -144,7 +144,7 @@ data InvitationConfig junction = forall formCtx. InvitationConfig
 
 -- | Additional configuration needed for an invocation of `bearerToken`
 data InvitationTokenConfig = InvitationTokenConfig
-  { itAuthority :: UserId
+  { itAuthority :: Either Value UserId
   , itAddAuth   :: Maybe AuthDNF
   , itExpiresAt :: Maybe (Maybe UTCTime)
   , itStartsAt  :: Maybe UTCTime
diff --git a/src/Jobs/Handler/ChangeUserDisplayEmail.hs b/src/Jobs/Handler/ChangeUserDisplayEmail.hs
index dd5e8f0d4..bbf62d0c1 100644
--- a/src/Jobs/Handler/ChangeUserDisplayEmail.hs
+++ b/src/Jobs/Handler/ChangeUserDisplayEmail.hs
@@ -12,7 +12,7 @@ import Text.Hamlet
 
 dispatchJobChangeUserDisplayEmail :: UserId -> UserEmail -> Handler ()
 dispatchJobChangeUserDisplayEmail jUser jDisplayEmail = do
-  token <- tokenRestrict SetDisplayEmailR jDisplayEmail <$> bearerToken jUser (Just $ HashSet.singleton SetDisplayEmailR) Nothing Nothing Nothing
+  token <- tokenRestrict SetDisplayEmailR jDisplayEmail <$> bearerToken (Right jUser) (Just $ HashSet.singleton SetDisplayEmailR) Nothing Nothing Nothing
   jwt <- encodeToken token
   let
     setDisplayEmailUrl :: SomeRoute UniWorX
diff --git a/src/Jobs/Handler/SendNotification/Utils.hs b/src/Jobs/Handler/SendNotification/Utils.hs
index 49671e02d..111b43382 100644
--- a/src/Jobs/Handler/SendNotification/Utils.hs
+++ b/src/Jobs/Handler/SendNotification/Utils.hs
@@ -16,7 +16,7 @@ ihamletSomeMessage f trans = f $ trans . SomeMessage
 mkEditNotifications :: (MonadHandler m, HandlerSite m ~ UniWorX) => UserId -> m (HtmlUrlI18n UniWorXMessage (Route UniWorX))
 mkEditNotifications uid = liftHandler $ do
   cID <- encrypt uid
-  jwt <- encodeToken =<< bearerToken uid (Just . HashSet.singleton $ UserNotificationR cID) Nothing Nothing Nothing
+  jwt <- encodeToken =<< bearerToken (Right uid) (Just . HashSet.singleton $ UserNotificationR cID) Nothing Nothing Nothing
   let
     editNotificationsUrl :: SomeRoute UniWorX
     editNotificationsUrl = SomeRoute (UserNotificationR cID, [(toPathPiece GetBearer, toPathPiece jwt)])
diff --git a/src/Jobs/Handler/SendPasswordReset.hs b/src/Jobs/Handler/SendPasswordReset.hs
index d9acc739b..c589c3896 100644
--- a/src/Jobs/Handler/SendPasswordReset.hs
+++ b/src/Jobs/Handler/SendPasswordReset.hs
@@ -29,7 +29,7 @@ dispatchJobSendPasswordReset jRecipient = userMailT jRecipient $ do
       LTUUnique utc' _ -> utc'
       _other           -> UTCTime (addDays 2 $ utctDay now) 0
 
-  resetToken' <- bearerToken jRecipient (Just . HashSet.singleton $ UserPasswordR cID) Nothing (Just $ Just tomorrowEndOfDay) Nothing
+  resetToken' <- bearerToken (Right jRecipient) (Just . HashSet.singleton $ UserPasswordR cID) Nothing (Just $ Just tomorrowEndOfDay) Nothing
   let resetToken = resetToken'
         & tokenRestrict (UserPasswordR cID) (decodeUtf8 . Base64.encode . BA.convert $ computeUserAuthenticationDigest userAuthentication)
   encodedToken <- encodeToken resetToken
diff --git a/src/Model/Tokens.hs b/src/Model/Tokens.hs
index 2b445eb99..5a2d6335e 100644
--- a/src/Model/Tokens.hs
+++ b/src/Model/Tokens.hs
@@ -46,7 +46,7 @@ import Data.Binary (Binary)
 data BearerToken site = BearerToken
   { tokenIdentifier   :: TokenId
     -- ^ Unique identifier for each token; maybe useful for tracing usage of tokens
-  , tokenAuthority    :: AuthId site
+  , tokenAuthority    :: Either Value (AuthId site)
     -- ^ Tokens only grant rights the `tokenAuthority` has (i.e. `AuthTag`s are evaluated with the user set to `tokenAuthority`)
   , tokenRoutes       :: Maybe (HashSet (Route site))
     -- ^ Tokens can optionally be restricted to only be usable on a subset of routes
@@ -97,7 +97,7 @@ tokenToJSON :: forall m.
 --
 -- Monadic context is needed because `AuthId`s are encrypted during encoding
 tokenToJSON BearerToken{..} = do
-  cID <- encrypt tokenAuthority :: m (CryptoUUID (AuthId (HandlerSite m)))
+  cID <- either (return . Left) (fmap Right . encrypt) tokenAuthority :: m (Either Value (CryptoUUID (AuthId (HandlerSite m))))
   let stdPayload = Jose.JwtClaims
         { jwtIss = Just $ toPathPiece tokenIssuedBy
         , jwtSub = Nothing
@@ -108,7 +108,7 @@ tokenToJSON BearerToken{..} = do
         , jwtJti = Just $ toPathPiece tokenIdentifier
         }
   return . JSON.object $
-    catMaybes [ Just $ "authority" .= cID
+    catMaybes [ Just $ "authority" .= either id toJSON cID
               , ("routes" .=) <$> tokenRoutes
               , ("add-auth" .=) <$> tokenAddAuth
               , ("restrictions" .=) <$> assertM' (not . HashMap.null) tokenRestrictions
@@ -128,8 +128,8 @@ tokenParseJSON :: forall site.
 --
 -- It's usually easier to use `Utils.Tokens.tokenParseJSON'`
 tokenParseJSON v@(Object o) = do
-  tokenAuthority' <- lift (o .: "authority") :: ReaderT CryptoIDKey Parser (CryptoUUID (AuthId site))
-  tokenAuthority <- decrypt tokenAuthority'
+  tokenAuthority' <- lift $ (Right <$> o .: "authority") <|> (Left <$> o .: "authority") :: ReaderT CryptoIDKey Parser (Either Value (CryptoUUID (AuthId site)))
+  tokenAuthority <- either (return . Left) (fmap Right . decrypt) tokenAuthority'
 
   tokenRoutes        <- lift $ o .:? "routes"
   tokenAddAuth       <- lift $ o .:? "add-auth"
diff --git a/src/Model/Types/Security.hs b/src/Model/Types/Security.hs
index 66a01cf6b..a1df33f56 100644
--- a/src/Model/Types/Security.hs
+++ b/src/Model/Types/Security.hs
@@ -21,6 +21,11 @@ import qualified Data.Aeson.Types as Aeson
 
 import qualified Data.Binary as Binary
 
+import qualified Data.CaseInsensitive as CI
+
+import Model.Types.TH.PathPiece
+import Database.Persist.Sql
+
 
 data AuthenticationMode = AuthLDAP
                         | AuthPWHash { authPWHash :: Text }
@@ -152,3 +157,21 @@ instance (Ord a, Binary a) => Binary (PredDNF a) where
 type AuthLiteral = PredLiteral AuthTag
 
 type AuthDNF = PredDNF AuthTag
+
+
+data UserGroupName
+  = UserGroupMetrics
+  | UserGroupCustom { userGroupCustomName :: CI Text }
+  deriving (Eq, Ord, Read, Show, Generic, Typeable)
+
+instance PathPiece UserGroupName where
+  toPathPiece UserGroupMetrics = "metrics"
+  toPathPiece (UserGroupCustom t) = CI.original t
+  fromPathPiece t = Just $ if
+    | "metrics" `ciEq` t -> UserGroupMetrics
+    | otherwise          -> UserGroupCustom $ CI.mk t
+    where
+      ciEq = (==) `on` CI.mk
+
+pathPieceJSON ''UserGroupName
+derivePersistFieldPathPiece' (sqlType (Proxy @(CI Text))) ''UserGroupName
diff --git a/src/Model/Types/TH/PathPiece.hs b/src/Model/Types/TH/PathPiece.hs
index 365ffb969..daf1dd789 100644
--- a/src/Model/Types/TH/PathPiece.hs
+++ b/src/Model/Types/TH/PathPiece.hs
@@ -1,5 +1,6 @@
 module Model.Types.TH.PathPiece
   ( derivePersistFieldPathPiece
+  , derivePersistFieldPathPiece'
   ) where
 
 import ClassyPrelude.Yesod
@@ -13,7 +14,10 @@ import Language.Haskell.TH.Datatype
 
 
 derivePersistFieldPathPiece :: Name -> DecsQ
-derivePersistFieldPathPiece tName = do
+derivePersistFieldPathPiece = derivePersistFieldPathPiece' SqlString
+
+derivePersistFieldPathPiece' :: SqlType -> Name -> DecsQ
+derivePersistFieldPathPiece' sType tName = do
   DatatypeInfo{..} <- reifyDatatype tName
   vars <- forM datatypeVars (const $ newName "a")
   let t = foldl (\t' n' -> t' `appT` varT n') (conT tName) vars
@@ -32,15 +36,18 @@ derivePersistFieldPathPiece tName = do
         [ do
             bs <- newName "bs"
             clause [[p|PersistByteString $(varP bs)|]] (normalB [e|maybe (Left "Could not decode PathPiece from PersistByteString") Right $ fromPathPiece =<< either (const Nothing) Just (Text.decodeUtf8' $(varE bs))|]) []
+        , do
+            bs <- newName "bs"
+            clause [[p|PersistDbSpecific $(varP bs)|]] (normalB [e|maybe (Left "Could not decode PathPiece from PersistDbSpecific") Right $ fromPathPiece =<< either (const Nothing) Just (Text.decodeUtf8' $(varE bs))|]) []
         , do
             text <- newName "text"
-            clause [[p|PersistText $(varP text)|]] (normalB [e|maybe (Left "Could not decode PathPiece from PersistTetx") Right $ fromPathPiece $(varE text)|]) []
-        , clause [wildP] (normalB [e|Left "PathPiece values must be converted from PersistText or PersistByteString"|]) []
+            clause [[p|PersistText $(varP text)|]] (normalB [e|maybe (Left "Could not decode PathPiece from PersistText") Right $ fromPathPiece $(varE text)|]) []
+        , clause [wildP] (normalB [e|Left "PathPiece values must be converted from PersistText, PersistByteString, or PersistDbSpecific"|]) []
         ]
       ]
     , instanceD sqlCxt ([t|PersistFieldSql|] `appT` t)
       [ funD 'sqlType
-        [ clause [wildP] (normalB [e|SqlString|]) []
+        [ clause [wildP] (normalB [e|sType|]) []
         ]
       ]
     ]
diff --git a/src/Utils/Tokens.hs b/src/Utils/Tokens.hs
index 64d4c0989..549ea81e6 100644
--- a/src/Utils/Tokens.hs
+++ b/src/Utils/Tokens.hs
@@ -58,7 +58,7 @@ bearerToken :: forall m.
                , HasInstanceID (HandlerSite m) InstanceId
                , HasAppSettings (HandlerSite m)
                )
-            => AuthId (HandlerSite m)
+            => Either Value (AuthId (HandlerSite m))
             -> Maybe (HashSet (Route (HandlerSite m)))
             -> Maybe AuthDNF
             -> Maybe (Maybe UTCTime) -- ^ @Nothing@ determines default expiry time automatically
diff --git a/templates/metrics.hamlet b/templates/metrics.hamlet
index 9f4a780a3..1881382bc 100644
--- a/templates/metrics.hamlet
+++ b/templates/metrics.hamlet
@@ -1,41 +1,46 @@
 $newline never
-<dl .deflist>
-  $forall SampleGroup Info{..} _ mSamples <- samples
-    <dt .deflist__dt>
-      <div>#{metricName}
-      <p style="font-weight: 600; color: var(--color-fontsec); font-size: 0.9rem; margin-top: 7px">
-        #{metricHelp}
-    <dd .deflist__dd style="overflow: auto; max-height: 50vh">
-      $case mSamples
-        $of []
-          <p style="font-style: italic">_{MsgMetricNoSamples}
-        $of _
-          $maybe (lPairs, sValue) <- singleSample metricName mSamples
-            <p>
-              #{decodeUtf8 sValue}
-            $case lPairs
-              $of []
-              $of _
-                <ul .list-inline .list--comma-separated>
-                  $forall (lName, lValue) <- lPairs
-                    <li>#{lName}=#{lValue}
-          $nothing
-            $with allLabels <- getLabels mSamples
-              <table .table .table--striped .table--hover>
-                <thead>
-                  <tr .table__row .table__row--head>
-                    <th .table__th>_{MsgMetricName}
-                    $forall l <- allLabels
-                      <th .table__th style="font-family: monospace">#{l}
-                    <th .table__th>_{MsgMetricValue}
-                <tbody>
-                  $forall Sample sName lPairs sValue <- mSamples
-                    <tr .table__row>
-                      <td .table__td title=#{sName}>
-                        #{metricBasename metricName sName}
+$maybe t <- metricsToken
+  <section>
+    <pre style="font-family: monospace; white-space: pre-wrap; word-break: break-all;">
+      #{toPathPiece t}
+<section>
+  <dl .deflist>
+    $forall SampleGroup Info{..} _ mSamples <- samples
+      <dt .deflist__dt>
+        <div>#{metricName}
+        <p style="font-weight: 600; color: var(--color-fontsec); font-size: 0.9rem; margin-top: 7px">
+          #{metricHelp}
+      <dd .deflist__dd style="overflow: auto; max-height: 50vh">
+        $case mSamples
+          $of []
+            <p style="font-style: italic">_{MsgMetricNoSamples}
+          $of _
+            $maybe (lPairs, sValue) <- singleSample metricName mSamples
+              <p>
+                #{decodeUtf8 sValue}
+              $case lPairs
+                $of []
+                $of _
+                  <ul .list-inline .list--comma-separated>
+                    $forall (lName, lValue) <- lPairs
+                      <li>#{lName}=#{lValue}
+            $nothing
+              $with allLabels <- getLabels mSamples
+                <table .table .table--striped .table--hover>
+                  <thead>
+                    <tr .table__row .table__row--head>
+                      <th .table__th>_{MsgMetricName}
                       $forall l <- allLabels
+                        <th .table__th style="font-family: monospace">#{l}
+                      <th .table__th>_{MsgMetricValue}
+                  <tbody>
+                    $forall Sample sName lPairs sValue <- mSamples
+                      <tr .table__row>
+                        <td .table__td title=#{sName}>
+                          #{metricBasename metricName sName}
+                        $forall l <- allLabels
+                          <td .table__td>
+                            $maybe lValue <- lookup l lPairs
+                              #{lValue}
                         <td .table__td>
-                          $maybe lValue <- lookup l lPairs
-                            #{lValue}
-                      <td .table__td>
-                        #{decodeUtf8 sValue}
+                          #{decodeUtf8 sValue}

From b92aae87e1fb525baf85d7b4f208361dd195e0a4 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 21 Nov 2019 18:53:40 +0100
Subject: [PATCH 124/126] chore(release): 7.25.0

---
 CHANGELOG.md      | 9 +++++++++
 package-lock.json | 2 +-
 package.json      | 2 +-
 package.yaml      | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2732ae797..edd2e4607 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [7.25.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.24.0...v7.25.0) (2019-11-21)
+
+
+### Features
+
+* usergroups & metrics usergroup ([9204565](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9204565)), closes [#538](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/538)
+
+
+
 ## [7.24.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.23.2...v7.24.0) (2019-11-21)
 
 
diff --git a/package-lock.json b/package-lock.json
index 95e7c56d2..502204cdc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.24.0",
+  "version": "7.25.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d8104f1f1..c74760f27 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.24.0",
+  "version": "7.25.0",
   "description": "",
   "keywords": [],
   "author": "",
diff --git a/package.yaml b/package.yaml
index 9606e398f..63bbae415 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name:    uniworx
-version: 7.24.0
+version: 7.25.0
 
 dependencies:
   - base >=4.9.1.0 && <5

From 139f3ba8ccbee4bf3f6a4f17404d92ddf0b15632 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 22 Nov 2019 08:34:37 +0100
Subject: [PATCH 125/126] chore: reformat ghc-options

See https://github.com/sol/hpack/issues/237
---
 package.yaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/package.yaml b/package.yaml
index 63bbae415..f4d49bc47 100644
--- a/package.yaml
+++ b/package.yaml
@@ -237,10 +237,7 @@ executables:
   uniworx:
     main: main.hs
     source-dirs: app
-    ghc-options:
-      - -threaded
-      - -rtsopts
-      - -with-rtsopts="-N -T"
+    ghc-options: -threaded -rtsopts "-with-rtsopts=-N -T"
     dependencies:
       - uniworx
     when:

From 46a57bc1e4685912ce8a7060c38259b30c64b83b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 22 Nov 2019 08:35:36 +0100
Subject: [PATCH 126/126] chore(release): 7.25.1

---
 CHANGELOG.md      | 4 ++++
 package-lock.json | 2 +-
 package.json      | 2 +-
 package.yaml      | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index edd2e4607..7bff3b29c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [7.25.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.25.0...v7.25.1) (2019-11-22)
+
+
+
 ## [7.25.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v7.24.0...v7.25.0) (2019-11-21)
 
 
diff --git a/package-lock.json b/package-lock.json
index 502204cdc..a5d734d8f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.25.0",
+  "version": "7.25.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c74760f27..603a648a8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "7.25.0",
+  "version": "7.25.1",
   "description": "",
   "keywords": [],
   "author": "",
diff --git a/package.yaml b/package.yaml
index f4d49bc47..c5339dc30 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name:    uniworx
-version: 7.25.0
+version: 7.25.1
 
 dependencies:
   - base >=4.9.1.0 && <5