Merge pull request #107 from tathougies/master

Time 1.5 compatibility
jaspervdj · Feb 14, 2015 · da58c67 · da58c67
2 parents 3e048f5 + d7b48ab
commit da58c67
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/digestive-functors/digestive-functors.cabal b/digestive-functors/digestive-functors.cabal
@@ -67,7 +67,8 @@ Library
     mtl        >= 1.1.0.0 && < 3,
     old-locale >= 1.0     && < 1.1,
     text       >= 0.10    && < 1.3,
-    time       >= 1.4     && < 1.5
+    time       >= 1.4     && < 1.6
+  Extensions: CPP
 
 Test-suite digestive-functors-tests
   Type:           exitcode-stdio-1.0

diff --git a/digestive-functors/src/Text/Digestive/Form.hs b/digestive-functors/src/Text/Digestive/Form.hs
@@ -3,6 +3,7 @@
 {-# LANGUAGE GADTs                     #-}
 {-# LANGUAGE OverloadedStrings         #-}
 {-# LANGUAGE Rank2Types                #-}
+{-# LANGUAGE CPP                       #-}
 -- | End-user interface - provides the main functionality for
 -- form creation and validation. For an interface for front-end
 -- implementation, see "View".
@@ -67,7 +68,9 @@ import           Data.Maybe                         (fromMaybe)
 import           Data.Text                          (Text)
 import qualified Data.Text                          as T
 import           Data.Time
+#if !MIN_VERSION_time(1,5,0)
 import           System.Locale
+#endif
 
 
 --------------------------------------------------------------------------------
@@ -483,7 +486,11 @@ optionalTimeFormlet fmt d =
 
 vFunc :: ParseTime a => String -> Text -> String -> Result Text a
 vFunc fmt err x
+#if MIN_VERSION_time(1,5,0)
+  | length x < 40 = maybe (Error err) Success $ parseTimeM True defaultTimeLocale fmt x
+#else
   | length x < 40 = maybe (Error err) Success $ parseTime defaultTimeLocale fmt x
+#endif
   | otherwise = Error "Not a valid date/time string"