From 16d0fdd1c83b8ae3321df9e5a8cdd3ff33476be5 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Wed, 11 Oct 2023 08:46:25 +0000 Subject: [PATCH 1/2] chore(course): change default name for tutorial to %y_%m_%d --- src/Handler/Course/ParticipantInvite.hs | 2 +- src/Utils.hs | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Handler/Course/ParticipantInvite.hs b/src/Handler/Course/ParticipantInvite.hs index d31cd0d41..4bdf04021 100644 --- a/src/Handler/Course/ParticipantInvite.hs +++ b/src/Handler/Course/ParticipantInvite.hs @@ -49,7 +49,7 @@ tutorialTemplateNames Nothing = ["Vorlage", "Template"] tutorialTemplateNames (Just name) = [prefixes <> suffixes | prefixes <- tutorialTemplateNames Nothing, suffixes <- [mempty, tutorialTypeSeparator <> name]] tutorialDefaultName :: Maybe TutorialType -> Day -> TutorialName -tutorialDefaultName Nothing = CI.mk . tshow -- Don't use user date display setting, so that tutorial default names conform to all users +tutorialDefaultName Nothing = string2citext . formatTime defaultTimeLocale "%y_%m_%d" -- Don't use user date display setting, so that tutorial default names conform to all users tutorialDefaultName (Just ttyp) = let prefix = CI.mk $ snd $ Text.breakOnEnd (CI.original tutorialTypeSeparator) $ CI.original ttyp in (<> (tutorialTypeSeparator <> prefix)) . tutorialDefaultName Nothing diff --git a/src/Utils.hs b/src/Utils.hs index dc9e8199a..80af449b7 100644 --- a/src/Utils.hs +++ b/src/Utils.hs @@ -312,6 +312,9 @@ citext2lower = Text.toLower . CI.original citext2string :: CI Text -> String citext2string = Text.unpack . CI.original +string2citext :: CI Text -> String +string2citext = CI.mk . Text.pack + -- | Convert or remove all non-ascii characters, e.g. for filenames text2asciiAlphaNum :: Text -> Text text2asciiAlphaNum = Text.filter (\c -> Char.isAlphaNum c && Char.isAscii c) From 87f0b2edab2bcf696b7b776e47272ef2204c0b75 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Wed, 11 Oct 2023 09:18:22 +0000 Subject: [PATCH 2/2] fix(build): Update Utils.hs --- src/Utils.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Utils.hs b/src/Utils.hs index 80af449b7..4f8b5ff03 100644 --- a/src/Utils.hs +++ b/src/Utils.hs @@ -312,7 +312,7 @@ citext2lower = Text.toLower . CI.original citext2string :: CI Text -> String citext2string = Text.unpack . CI.original -string2citext :: CI Text -> String +string2citext :: String -> CI Text string2citext = CI.mk . Text.pack -- | Convert or remove all non-ascii characters, e.g. for filenames