haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #281 from scan/master

Browse Source 
German auth messages and tiny scaffold .cabal correction
This commit is contained in:
Michael Snoyman 2012-02-29 07:17:55 -08:00
commit fe67a28c19
3 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
yesod-auth/Yesod/Auth/Message.hs
View File

@ -7,6 +7,7 @@ module Yesod.Auth.Message
, englishMessage , englishMessage
, portugueseMessage , portugueseMessage
, swedishMessage , swedishMessage
, germanMessage
) where ) where
import Data.Monoid (mappend) import Data.Monoid (mappend)
@ -148,3 +149,37 @@ swedishMessage NowLoggedIn = "Du är nu inloggad"
swedishMessage LoginTitle = "Logga in" swedishMessage LoginTitle = "Logga in"
swedishMessage PleaseProvideUsername = "Vänligen fyll i användarnamn" swedishMessage PleaseProvideUsername = "Vänligen fyll i användarnamn"
swedishMessage PleaseProvidePassword = "Vänligen fyll i lösenord" 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"

2
yesod/scaffold/Import.hs.cg
View File

@ -6,6 +6,7 @@ module Import
, Text , Text
, module Data.Monoid , module Data.Monoid
, module Control.Applicative , module Control.Applicative
, module Settings.StaticFiles
) where ) where
import Prelude hiding (writeFile, readFile, head, tail, init, last) import Prelude hiding (writeFile, readFile, head, tail, init, last)
@ -14,6 +15,7 @@ import Foundation
import Data.Monoid (Monoid (mappend, mempty, mconcat)) import Data.Monoid (Monoid (mappend, mempty, mconcat))
import Control.Applicative ((<$>), (<*>), pure) import Control.Applicative ((<$>), (<*>), pure)
import Data.Text (Text) import Data.Text (Text)
import Settings.StaticFiles
infixr 5 <> infixr 5 <>
(<>) :: Monoid m => m -> m -> m (<>) :: Monoid m => m -> m -> m

1
yesod/scaffold/project.cabal.cg
View File

@ -42,7 +42,6 @@ library
OverloadedStrings OverloadedStrings
NoImplicitPrelude NoImplicitPrelude
CPP CPP
OverloadedStrings
MultiParamTypeClasses MultiParamTypeClasses
TypeFamilies TypeFamilies
GADTs GADTs