From 65a64f5ab508a4623af8c34e0ae3da28a9363cb4 Mon Sep 17 00:00:00 2001 From: Tom Streller Date: Tue, 28 Feb 2012 19:28:47 +0100 Subject: [PATCH 1/5] removed double occurence in scaffolded cabal file --- yesod/scaffold/project.cabal.cg | 1 - 1 file changed, 1 deletion(-) diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg index 9a43e551..79c75c47 100644 --- a/yesod/scaffold/project.cabal.cg +++ b/yesod/scaffold/project.cabal.cg @@ -42,7 +42,6 @@ library OverloadedStrings NoImplicitPrelude CPP - OverloadedStrings MultiParamTypeClasses TypeFamilies GADTs From 7b90f10f14aad98c7a690529f1783f86196324eb Mon Sep 17 00:00:00 2001 From: Tom Streller Date: Tue, 28 Feb 2012 19:38:46 +0100 Subject: [PATCH 2/5] german auth messages --- yesod-auth/Yesod/Auth/Message.hs | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/yesod-auth/Yesod/Auth/Message.hs b/yesod-auth/Yesod/Auth/Message.hs index 9be0776b..b68d7799 100644 --- a/yesod-auth/Yesod/Auth/Message.hs +++ b/yesod-auth/Yesod/Auth/Message.hs @@ -148,3 +148,37 @@ swedishMessage NowLoggedIn = "Du är nu inloggad" swedishMessage LoginTitle = "Logga in" swedishMessage PleaseProvideUsername = "Vänligen fyll i användarnamn" swedishMessage PleaseProvidePassword = "Vänligen fyll i lösenord" + +germanMessage :: AuthMessage -> Text +germanMessage NoOpenID = "Kein OpenID-Identifier gefunden" +germanMessage LoginOpenID = "Login via OpenID" +germanMessage LoginGoogle = "Login via Google" +germanMessage LoginYahoo = "Login via Yahoo" +germanMessage Email = "Email" +germanMessage Password = "Passwort" +germanMessage Register = "Registrieren" +germanMessage RegisterLong = "Neuen Account registrieren" +germanMessage EnterEmail = "Bitte die e-Mail Adresse angeben, eine Bestätigungsmail wird verschickt." +germanMessage ConfirmationEmailSentTitle = "Bestätigung verschickt." +germanMessage (ConfirmationEmailSent email) = + "Eine Bestätigung wurde an " `mappend` + email `mappend` + "versandt." +germanMessage AddressVerified = "Adresse bestätigt, bitte neues Passwort angeben" +germanMessage InvalidKeyTitle = "Ungültiger Bestätigungsschlüssel" +germanMessage InvalidKey = "Das war leider ein ungültiger Bestätigungsschlüssel" +germanMessage InvalidEmailPass = "Ungültiger Nutzername oder Passwort" +germanMessage BadSetPass = "Um das Passwort zu ändern muss man eingeloggt sein" +germanMessage SetPassTitle = "Passwort angeben" +germanMessage SetPass = "Neues Passwort angeben" +germanMessage NewPass = "Neues Passwort" +germanMessage ConfirmPass = "Bestätigen" +germanMessage PassMismatch = "Die Passwörter stimmten nicht überein" +germanMessage PassUpdated = "Passwort überschrieben" +germanMessage Facebook = "Login über Facebook" +germanMessage LoginViaEmail = "Login via e-Mail" +germanMessage InvalidLogin = "Ungültiger Login" +germanMessage NowLoggedIn = "Login erfolgreich" +germanMessage LoginTitle = "Login" +germanMessage PleaseProvideUsername = "Bitte Nutzername angeben" +germanMessage PleaseProvidePassword = "Bitte Passwort angeben" From f941dad48d2e52ae67b56b07e1603d93864afa71 Mon Sep 17 00:00:00 2001 From: Tom Streller Date: Tue, 28 Feb 2012 20:48:34 +0100 Subject: [PATCH 3/5] Added StaticFiles to Import --- yesod/scaffold/Import.hs.cg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/yesod/scaffold/Import.hs.cg b/yesod/scaffold/Import.hs.cg index 5083f615..66d1bcc7 100644 --- a/yesod/scaffold/Import.hs.cg +++ b/yesod/scaffold/Import.hs.cg @@ -6,6 +6,7 @@ module Import , Text , module Data.Monoid , module Control.Applicative + , module Settings.StaticField ) where import Prelude hiding (writeFile, readFile, head, tail, init, last) @@ -14,6 +15,7 @@ import Foundation import Data.Monoid (Monoid (mappend, mempty, mconcat)) import Control.Applicative ((<$>), (<*>), pure) import Data.Text (Text) +import Settings.StaticField infixr 5 <> (<>) :: Monoid m => m -> m -> m From 0361f01dd2fcc3cb75793376c6177a8147fa103b Mon Sep 17 00:00:00 2001 From: Tom Streller Date: Tue, 28 Feb 2012 21:01:01 +0100 Subject: [PATCH 4/5] Added StaticFiles to Import.hs --- yesod/scaffold/Import.hs.cg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yesod/scaffold/Import.hs.cg b/yesod/scaffold/Import.hs.cg index 66d1bcc7..7fdd7160 100644 --- a/yesod/scaffold/Import.hs.cg +++ b/yesod/scaffold/Import.hs.cg @@ -6,7 +6,7 @@ module Import , Text , module Data.Monoid , module Control.Applicative - , module Settings.StaticField + , module Settings.StaticFiles ) where import Prelude hiding (writeFile, readFile, head, tail, init, last) @@ -15,7 +15,7 @@ import Foundation import Data.Monoid (Monoid (mappend, mempty, mconcat)) import Control.Applicative ((<$>), (<*>), pure) import Data.Text (Text) -import Settings.StaticField +import Settings.StaticFiles infixr 5 <> (<>) :: Monoid m => m -> m -> m From f9dde8602503ed986c4aa4e0d90b8d66fb968999 Mon Sep 17 00:00:00 2001 From: Tom Streller Date: Wed, 29 Feb 2012 12:28:57 +0100 Subject: [PATCH 5/5] germanMessage added to the export list --- yesod-auth/Yesod/Auth/Message.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/yesod-auth/Yesod/Auth/Message.hs b/yesod-auth/Yesod/Auth/Message.hs index b68d7799..383ef98f 100644 --- a/yesod-auth/Yesod/Auth/Message.hs +++ b/yesod-auth/Yesod/Auth/Message.hs @@ -7,6 +7,7 @@ module Yesod.Auth.Message , englishMessage , portugueseMessage , swedishMessage + , germanMessage ) where import Data.Monoid (mappend)