From d9fb87b63441b32b21233b06f62cf21f050b0ffe Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 1 Apr 2011 12:52:35 +0300
Subject: [PATCH] More String -> Text

---
 Yesod/Content.hs | 14 +++++++-------
 Yesod/Handler.hs |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Yesod/Content.hs b/Yesod/Content.hs
index adc440ec..6244474c 100644
--- a/Yesod/Content.hs
+++ b/Yesod/Content.hs
@@ -167,7 +167,7 @@ newtype RepXml = RepXml Content
 instance HasReps RepXml where
     chooseRep (RepXml c) _ = return (typeXml, c)
 
-type ContentType = B.ByteString
+type ContentType = B.ByteString -- FIXME Text?
 
 typeHtml :: ContentType
 typeHtml = "text/html; charset=utf-8"
@@ -220,13 +220,13 @@ simpleContentType :: ContentType -> ContentType
 simpleContentType = fst . B.breakByte 59 -- 59 == ;
 
 -- | Format a 'UTCTime' in W3 format.
-formatW3 :: UTCTime -> String
-formatW3 = formatTime defaultTimeLocale "%FT%X-00:00"
+formatW3 :: UTCTime -> T.Text
+formatW3 = T.pack . formatTime defaultTimeLocale "%FT%X-00:00"
 
 -- | Format as per RFC 1123.
-formatRFC1123 :: UTCTime -> String
-formatRFC1123 = formatTime defaultTimeLocale "%a, %d %b %Y %X %Z"
+formatRFC1123 :: UTCTime -> T.Text
+formatRFC1123 = T.pack . formatTime defaultTimeLocale "%a, %d %b %Y %X %Z"
 
 -- | Format as per RFC 822.
-formatRFC822 :: UTCTime -> String
-formatRFC822 = formatTime defaultTimeLocale "%a, %d %b %Y %H:%M:%S %z"
+formatRFC822 :: UTCTime -> T.Text
+formatRFC822 = T.pack . formatTime defaultTimeLocale "%a, %d %b %Y %H:%M:%S %z"
diff --git a/Yesod/Handler.hs b/Yesod/Handler.hs
index 0a9c3dc2..1c70923f 100644
--- a/Yesod/Handler.hs
+++ b/Yesod/Handler.hs
@@ -612,7 +612,7 @@ alreadyExpired = setHeader "Expires" "Thu, 01 Jan 1970 05:05:05 GMT"
 
 -- | Set an Expires header to the given date.
 expiresAt :: Monad mo => UTCTime -> GGHandler s m mo ()
-expiresAt = setHeader "Expires" . S8.pack . formatRFC1123
+expiresAt = setHeader "Expires" . encodeUtf8 . formatRFC1123
 
 -- | Set a variable in the user's session.
 --