From 97d8bbba060ab5fecce6840d98ef4410b4cb50f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arthur=20Fayzrakhmanov=20=28=D0=90=D1=80=D1=82=D1=83=D1=80?= =?UTF-8?q?=20=D0=A4=D0=B0=D0=B9=D0=B7=D1=80=D0=B0=D1=85=D0=BC=D0=B0=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=29?= Date: Tue, 24 Nov 2015 02:15:03 +0500 Subject: [PATCH] Introduce LogoutTitle message constructor `LogoutTitle` is a replacement for `Logout` constructor, the latter is inconsistent with `LoginTitle` constructor name. Added `DEPRECATED` pragma to warn users about this change. --- yesod-auth/Yesod/Auth/Message.hs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/yesod-auth/Yesod/Auth/Message.hs b/yesod-auth/Yesod/Auth/Message.hs index 959cd060..d67e390e 100644 --- a/yesod-auth/Yesod/Auth/Message.hs +++ b/yesod-auth/Yesod/Auth/Message.hs @@ -62,7 +62,9 @@ data AuthMessage = | PasswordResetPrompt | InvalidUsernamePass | Logout + | LogoutTitle | AuthError +{-# DEPRECATED Logout "Please, use LogoutTitle instead." #-} -- | Defaults to 'englishMessage'. defaultMessage :: AuthMessage -> Text @@ -111,6 +113,7 @@ englishMessage PasswordResetPrompt = "Enter your e-mail address or username belo englishMessage InvalidUsernamePass = "Invalid username/password combination" englishMessage (IdentifierNotFound ident) = "Login not found: " `mappend` ident englishMessage Logout = "Log Out" +englishMessage LogoutTitle = "Log Out" englishMessage AuthError = "Authentication Error" -- FIXME by Google Translate portugueseMessage :: AuthMessage -> Text @@ -157,6 +160,7 @@ portugueseMessage InvalidUsernamePass = "Nome de usuário ou senha inválidos" -- TODO portugueseMessage i@(IdentifierNotFound _) = englishMessage i portugueseMessage Logout = "Sair" -- FIXME by Google Translate +portugueseMessage LogoutTitle = "Sair" -- FIXME by Google Translate portugueseMessage AuthError = "Erro de autenticação" -- FIXME by Google Translate spanishMessage :: AuthMessage -> Text @@ -203,6 +207,7 @@ spanishMessage InvalidUsernamePass = "Combinación de nombre de usuario/contrase -- TODO spanishMessage i@(IdentifierNotFound _) = englishMessage i spanishMessage Logout = "Finalizar la sesión" -- FIXME by Google Translate +spanishMessage LogoutTitle = "Finalizar la sesión" -- FIXME by Google Translate spanishMessage AuthError = "Error de autenticación" -- FIXME by Google Translate swedishMessage :: AuthMessage -> Text @@ -250,6 +255,7 @@ swedishMessage InvalidUsernamePass = "Ogiltig kombination av användarnamn och l -- TODO swedishMessage i@(IdentifierNotFound _) = englishMessage i swedishMessage Logout = "Loggar ut" -- FIXME by Google Translate +swedishMessage LogoutTitle = "Loggar ut" -- FIXME by Google Translate swedishMessage AuthError = "Autentisering Fel" -- FIXME by Google Translate germanMessage :: AuthMessage -> Text @@ -296,6 +302,7 @@ germanMessage InvalidUsernamePass = "Ungültige Kombination aus Nutzername und P -- TODO germanMessage i@(IdentifierNotFound _) = englishMessage i germanMessage Logout = "Ausloggen" -- FIXME by Google Translate +germanMessage LogoutTitle = "Ausloggen" -- FIXME by Google Translate germanMessage AuthError = "Authorisierungsfehler" -- FIXME by Google Translate frenchMessage :: AuthMessage -> Text @@ -341,6 +348,7 @@ frenchMessage PasswordResetPrompt = "Entrez votre courriel ou votre nom d'utilis frenchMessage InvalidUsernamePass = "La combinaison de ce mot de passe et de ce nom d'utilisateur n'existe pas." frenchMessage (IdentifierNotFound ident) = "Nom d'utilisateur introuvable: " `mappend` ident frenchMessage Logout = "Déconnexion" +frenchMessage LogoutTitle = "Déconnexion" frenchMessage AuthError = "Erreur d'authentification" -- FIXME by Google Translate norwegianBokmålMessage :: AuthMessage -> Text @@ -387,6 +395,7 @@ norwegianBokmålMessage InvalidUsernamePass = "Invalid username/password combina -- TODO norwegianBokmålMessage i@(IdentifierNotFound _) = englishMessage i norwegianBokmålMessage Logout = "Logge ut" -- FIXME by Google Translate +norwegianBokmålMessage LogoutTitle = "Logge ut" -- FIXME by Google Translate norwegianBokmålMessage AuthError = "Godkjenningsfeil" -- FIXME by Google Translate japaneseMessage :: AuthMessage -> Text @@ -433,6 +442,7 @@ japaneseMessage InvalidUsernamePass = "ユーザ名とパスワードの組み japaneseMessage (IdentifierNotFound ident) = ident `mappend` "は登録されていません" japaneseMessage Logout = "ログアウト" -- FIXME by Google Translate +japaneseMessage LogoutTitle = "ログアウト" -- FIXME by Google Translate japaneseMessage AuthError = "認証エラー" -- FIXME by Google Translate finnishMessage :: AuthMessage -> Text @@ -480,6 +490,7 @@ finnishMessage InvalidUsernamePass = "Virheellinen käyttäjänimi tai salasana. -- TODO finnishMessage i@(IdentifierNotFound _) = englishMessage i finnishMessage Logout = "Kirjaudu ulos" -- FIXME by Google Translate +finnishMessage LogoutTitle = "Kirjaudu ulos" -- FIXME by Google Translate finnishMessage AuthError = "Authentication Error" -- FIXME by Google Translate chineseMessage :: AuthMessage -> Text @@ -526,6 +537,7 @@ chineseMessage InvalidUsernamePass = "无效的用户名/密码组合" -- TODO chineseMessage i@(IdentifierNotFound _) = englishMessage i chineseMessage Logout = "註銷" -- FIXME by Google Translate +chineseMessage LogoutTitle = "註銷" -- FIXME by Google Translate chineseMessage AuthError = "验证错误" -- FIXME by Google Translate czechMessage :: AuthMessage -> Text @@ -570,6 +582,7 @@ czechMessage InvalidUsernamePass = "Neplatná kombinace uživatelského jména a -- TODO czechMessage i@(IdentifierNotFound _) = englishMessage i czechMessage Logout = "Odhlásit" -- FIXME by Google Translate +czechMessage LogoutTitle = "Odhlásit" -- FIXME by Google Translate czechMessage AuthError = "Chyba ověřování" -- FIXME by Google Translate -- Так как e-mail – это фактическое сокращение словосочетания electronic mail, @@ -617,6 +630,7 @@ russianMessage PasswordResetPrompt = "Введите адрес эл.почты russianMessage InvalidUsernamePass = "Неверное сочетание имени пользователя и пароля" russianMessage (IdentifierNotFound ident) = "Логин не найден: " `mappend` ident russianMessage Logout = "Выйти" +russianMessage LogoutTitle = "Выйти" russianMessage AuthError = "Ошибка аутентификации" dutchMessage :: AuthMessage -> Text @@ -662,4 +676,5 @@ dutchMessage PasswordResetPrompt = "Voer uw e-mailadres of gebruikersnaam hieron 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