From 76726063e4f5a9bc989421e65a5062f36b55856b Mon Sep 17 00:00:00 2001 From: Felix Paulusma Date: Tue, 12 Jul 2016 17:19:09 +0200 Subject: [PATCH 1/2] Updated some Dutch translations. --- yesod-auth/Yesod/Auth/Message.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/yesod-auth/Yesod/Auth/Message.hs b/yesod-auth/Yesod/Auth/Message.hs index 525b2af3..ac66dd27 100644 --- a/yesod-auth/Yesod/Auth/Message.hs +++ b/yesod-auth/Yesod/Auth/Message.hs @@ -653,9 +653,9 @@ dutchMessage LoginOpenID = "Inloggen via OpenID" dutchMessage LoginGoogle = "Inloggen via Google" dutchMessage LoginYahoo = "Inloggen via Yahoo" dutchMessage Email = "E-mail" -dutchMessage UserName = "Gebruikersnaam" -- FIXME by Google Translate "user name" +dutchMessage UserName = "Gebruikersnaam" dutchMessage Password = "Wachtwoord" -dutchMessage CurrentPassword = "Current password" +dutchMessage CurrentPassword = "Huidig wachtwoord" dutchMessage Register = "Registreren" dutchMessage RegisterLong = "Registreer een nieuw account" dutchMessage EnterEmail = "Voer uw e-mailadres hieronder in, er zal een bevestigings-e-mail naar u worden verzonden." @@ -690,9 +690,9 @@ dutchMessage SendPasswordResetEmail = "Stuur een wachtwoord reset e-mail" dutchMessage PasswordResetPrompt = "Voer uw e-mailadres of gebruikersnaam hieronder in, er zal een e-mail naar u worden verzonden waarmee u uw wachtwoord kunt wijzigen." dutchMessage InvalidUsernamePass = "Ongeldige gebruikersnaam/wachtwoord combinatie" dutchMessage (IdentifierNotFound ident) = "Inloggegevens niet gevonden: " `mappend` ident -dutchMessage Logout = "Log Out" -- FIXME NOT TRANSLATED -dutchMessage LogoutTitle = "Log Out" -- FIXME NOT TRANSLATED -dutchMessage AuthError = "Verificatiefout" -- FIXME by Google Translate +dutchMessage Logout = "Uitloggen" +dutchMessage LogoutTitle = "Uitloggen" +dutchMessage AuthError = "Verificatiefout" croatianMessage :: AuthMessage -> Text croatianMessage NoOpenID = "Nije pronađen OpenID identifikator" From 0eb8ab30508ba37bbab0a57f35fc9663336effc7 Mon Sep 17 00:00:00 2001 From: Maximilian Tagher Date: Thu, 14 Jul 2016 07:56:31 -0700 Subject: [PATCH 2/2] Document recommended usage of the CSRF middleware * Closes #1246 --- yesod-core/Yesod/Core/Class/Yesod.hs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/yesod-core/Yesod/Core/Class/Yesod.hs b/yesod-core/Yesod/Core/Class/Yesod.hs index 5893e1af..4f7d71a3 100644 --- a/yesod-core/Yesod/Core/Class/Yesod.hs +++ b/yesod-core/Yesod/Core/Class/Yesod.hs @@ -454,6 +454,18 @@ csrfSetCookieMiddleware handler cookie = setCsrfCookieWithCookie cookie >> handl -- -- For details, see the "AJAX CSRF protection" section of "Yesod.Core.Handler". -- +-- You can add this chain this middleware together with other middleware like so: +-- +-- @ +-- 'yesodMiddleware' = 'defaultYesodMiddleware' . 'defaultCsrfMiddleware' +-- @ +-- +-- or: +-- +-- @ +-- 'yesodMiddleware' app = 'defaultYesodMiddleware' $ 'defaultCsrfMiddleware' $ app +-- @ +-- -- Since 1.4.14 defaultCsrfMiddleware :: Yesod site => HandlerT site IO res -> HandlerT site IO res defaultCsrfMiddleware = defaultCsrfSetCookieMiddleware . defaultCsrfCheckMiddleware