diff --git a/Yesod/Auth.hs b/Yesod/Auth.hs index 71574336..2e087002 100644 --- a/Yesod/Auth.hs +++ b/Yesod/Auth.hs @@ -35,7 +35,6 @@ import Data.Text (Text) import qualified Data.Text as T import Data.Text.Encoding (decodeUtf8With) import Data.Text.Encoding.Error (lenientDecode) -import Web.Routes.Quasi (toSinglePiece, fromSinglePiece) import Yesod.Auth.Message (AuthMessage, defaultMessage) import qualified Yesod.Auth.Message as Msg import Yesod.Form (FormMessage) @@ -79,7 +78,7 @@ class (Yesod m, SinglePiece (AuthId m), RenderMessage m FormMessage) => YesodAut -- | What to show on the login page. loginHandler :: GHandler Auth m RepHtml loginHandler = defaultLayout $ do - setTitle "Login" + setTitleI Msg.LoginTitle tm <- lift getRouteToMaster mapM_ (flip apLogin tm) authPlugins @@ -111,7 +110,6 @@ setCreds :: YesodAuth m => Bool -> Creds m -> GHandler s m () setCreds doRedirects creds = do y <- getYesod maid <- getAuthId creds - l <- languages case maid of Nothing -> if doRedirects diff --git a/Yesod/Auth/Message.hs b/Yesod/Auth/Message.hs index 88e301b2..793a5999 100644 --- a/Yesod/Auth/Message.hs +++ b/Yesod/Auth/Message.hs @@ -33,6 +33,7 @@ data AuthMessage = | LoginViaEmail | InvalidLogin | NowLoggedIn + | LoginTitle defaultMessage :: AuthMessage -> Text defaultMessage NoOpenID = "No OpenID identifier found" @@ -62,3 +63,4 @@ defaultMessage Facebook = "Login with Facebook" defaultMessage LoginViaEmail = "Login via email" defaultMessage InvalidLogin = "Invalid login" defaultMessage NowLoggedIn = "You are now logged in" +defaultMessage LoginTitle = "Login"