Fix some warnings
This commit is contained in:
parent
13d9932c74
commit
0221258fec
@ -35,7 +35,6 @@ import Data.Text (Text)
|
|||||||
import qualified Data.Text as T
|
import qualified Data.Text as T
|
||||||
import Data.Text.Encoding (decodeUtf8With)
|
import Data.Text.Encoding (decodeUtf8With)
|
||||||
import Data.Text.Encoding.Error (lenientDecode)
|
import Data.Text.Encoding.Error (lenientDecode)
|
||||||
import Web.Routes.Quasi (toSinglePiece, fromSinglePiece)
|
|
||||||
import Yesod.Auth.Message (AuthMessage, defaultMessage)
|
import Yesod.Auth.Message (AuthMessage, defaultMessage)
|
||||||
import qualified Yesod.Auth.Message as Msg
|
import qualified Yesod.Auth.Message as Msg
|
||||||
import Yesod.Form (FormMessage)
|
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.
|
-- | What to show on the login page.
|
||||||
loginHandler :: GHandler Auth m RepHtml
|
loginHandler :: GHandler Auth m RepHtml
|
||||||
loginHandler = defaultLayout $ do
|
loginHandler = defaultLayout $ do
|
||||||
setTitle "Login"
|
setTitleI Msg.LoginTitle
|
||||||
tm <- lift getRouteToMaster
|
tm <- lift getRouteToMaster
|
||||||
mapM_ (flip apLogin tm) authPlugins
|
mapM_ (flip apLogin tm) authPlugins
|
||||||
|
|
||||||
@ -111,7 +110,6 @@ setCreds :: YesodAuth m => Bool -> Creds m -> GHandler s m ()
|
|||||||
setCreds doRedirects creds = do
|
setCreds doRedirects creds = do
|
||||||
y <- getYesod
|
y <- getYesod
|
||||||
maid <- getAuthId creds
|
maid <- getAuthId creds
|
||||||
l <- languages
|
|
||||||
case maid of
|
case maid of
|
||||||
Nothing ->
|
Nothing ->
|
||||||
if doRedirects
|
if doRedirects
|
||||||
|
|||||||
@ -33,6 +33,7 @@ data AuthMessage =
|
|||||||
| LoginViaEmail
|
| LoginViaEmail
|
||||||
| InvalidLogin
|
| InvalidLogin
|
||||||
| NowLoggedIn
|
| NowLoggedIn
|
||||||
|
| LoginTitle
|
||||||
|
|
||||||
defaultMessage :: AuthMessage -> Text
|
defaultMessage :: AuthMessage -> Text
|
||||||
defaultMessage NoOpenID = "No OpenID identifier found"
|
defaultMessage NoOpenID = "No OpenID identifier found"
|
||||||
@ -62,3 +63,4 @@ defaultMessage Facebook = "Login with Facebook"
|
|||||||
defaultMessage LoginViaEmail = "Login via email"
|
defaultMessage LoginViaEmail = "Login via email"
|
||||||
defaultMessage InvalidLogin = "Invalid login"
|
defaultMessage InvalidLogin = "Invalid login"
|
||||||
defaultMessage NowLoggedIn = "You are now logged in"
|
defaultMessage NowLoggedIn = "You are now logged in"
|
||||||
|
defaultMessage LoginTitle = "Login"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user