From f9872ba1bb06e2af30639a8cadc26004afcd5ca3 Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Tue, 30 Jun 2015 11:51:06 +0200 Subject: Allow empty template, fix some import warnings Closes #355 --- src/Hakyll/Web/Template/Context.hs | 4 ++-- src/Hakyll/Web/Template/Internal.hs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Hakyll/Web/Template') diff --git a/src/Hakyll/Web/Template/Context.hs b/src/Hakyll/Web/Template/Context.hs index f783c10..080f819 100644 --- a/src/Hakyll/Web/Template/Context.hs +++ b/src/Hakyll/Web/Template/Context.hs @@ -36,7 +36,7 @@ import qualified Data.Map as M import Data.Monoid (Monoid (..)) import Data.Time.Clock (UTCTime (..)) import Data.Time.Format (TimeLocale, defaultTimeLocale, - formatTime, parseTime) + formatTime, parseTimeM) import System.FilePath (splitDirectories, takeBaseName) @@ -282,7 +282,7 @@ getItemUTC locale id' = do where empty' = fail $ "Hakyll.Web.Template.Context.getItemUTC: " ++ "could not parse time for " ++ show id' - parseTime' = parseTime locale + parseTime' = parseTimeM True locale formats = [ "%a, %d %b %Y %H:%M:%S %Z" , "%Y-%m-%dT%H:%M:%S%Z" diff --git a/src/Hakyll/Web/Template/Internal.hs b/src/Hakyll/Web/Template/Internal.hs index b677923..2d9de5e 100644 --- a/src/Hakyll/Web/Template/Internal.hs +++ b/src/Hakyll/Web/Template/Internal.hs @@ -128,7 +128,7 @@ readTemplate input = case P.parse template "" input of -------------------------------------------------------------------------------- template :: P.Parser Template template = Template <$> - (P.many1 $ chunk <|> escaped <|> conditional <|> for <|> partial <|> expr) + (P.many $ chunk <|> escaped <|> conditional <|> for <|> partial <|> expr) -------------------------------------------------------------------------------- -- cgit v1.2.3