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.
This commit is contained in:
parent
45c0b44142
commit
97d8bbba06
@ -62,7 +62,9 @@ data AuthMessage =
|
|||||||
| PasswordResetPrompt
|
| PasswordResetPrompt
|
||||||
| InvalidUsernamePass
|
| InvalidUsernamePass
|
||||||
| Logout
|
| Logout
|
||||||
|
| LogoutTitle
|
||||||
| AuthError
|
| AuthError
|
||||||
|
{-# DEPRECATED Logout "Please, use LogoutTitle instead." #-}
|
||||||
|
|
||||||
-- | Defaults to 'englishMessage'.
|
-- | Defaults to 'englishMessage'.
|
||||||
defaultMessage :: AuthMessage -> Text
|
defaultMessage :: AuthMessage -> Text
|
||||||
@ -111,6 +113,7 @@ englishMessage PasswordResetPrompt = "Enter your e-mail address or username belo
|
|||||||
englishMessage InvalidUsernamePass = "Invalid username/password combination"
|
englishMessage InvalidUsernamePass = "Invalid username/password combination"
|
||||||
englishMessage (IdentifierNotFound ident) = "Login not found: " `mappend` ident
|
englishMessage (IdentifierNotFound ident) = "Login not found: " `mappend` ident
|
||||||
englishMessage Logout = "Log Out"
|
englishMessage Logout = "Log Out"
|
||||||
|
englishMessage LogoutTitle = "Log Out"
|
||||||
englishMessage AuthError = "Authentication Error" -- FIXME by Google Translate
|
englishMessage AuthError = "Authentication Error" -- FIXME by Google Translate
|
||||||
|
|
||||||
portugueseMessage :: AuthMessage -> Text
|
portugueseMessage :: AuthMessage -> Text
|
||||||
@ -157,6 +160,7 @@ portugueseMessage InvalidUsernamePass = "Nome de usuário ou senha inválidos"
|
|||||||
-- TODO
|
-- TODO
|
||||||
portugueseMessage i@(IdentifierNotFound _) = englishMessage i
|
portugueseMessage i@(IdentifierNotFound _) = englishMessage i
|
||||||
portugueseMessage Logout = "Sair" -- FIXME by Google Translate
|
portugueseMessage Logout = "Sair" -- FIXME by Google Translate
|
||||||
|
portugueseMessage LogoutTitle = "Sair" -- FIXME by Google Translate
|
||||||
portugueseMessage AuthError = "Erro de autenticação" -- FIXME by Google Translate
|
portugueseMessage AuthError = "Erro de autenticação" -- FIXME by Google Translate
|
||||||
|
|
||||||
spanishMessage :: AuthMessage -> Text
|
spanishMessage :: AuthMessage -> Text
|
||||||
@ -203,6 +207,7 @@ spanishMessage InvalidUsernamePass = "Combinación de nombre de usuario/contrase
|
|||||||
-- TODO
|
-- TODO
|
||||||
spanishMessage i@(IdentifierNotFound _) = englishMessage i
|
spanishMessage i@(IdentifierNotFound _) = englishMessage i
|
||||||
spanishMessage Logout = "Finalizar la sesión" -- FIXME by Google Translate
|
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
|
spanishMessage AuthError = "Error de autenticación" -- FIXME by Google Translate
|
||||||
|
|
||||||
swedishMessage :: AuthMessage -> Text
|
swedishMessage :: AuthMessage -> Text
|
||||||
@ -250,6 +255,7 @@ swedishMessage InvalidUsernamePass = "Ogiltig kombination av användarnamn och l
|
|||||||
-- TODO
|
-- TODO
|
||||||
swedishMessage i@(IdentifierNotFound _) = englishMessage i
|
swedishMessage i@(IdentifierNotFound _) = englishMessage i
|
||||||
swedishMessage Logout = "Loggar ut" -- FIXME by Google Translate
|
swedishMessage Logout = "Loggar ut" -- FIXME by Google Translate
|
||||||
|
swedishMessage LogoutTitle = "Loggar ut" -- FIXME by Google Translate
|
||||||
swedishMessage AuthError = "Autentisering Fel" -- FIXME by Google Translate
|
swedishMessage AuthError = "Autentisering Fel" -- FIXME by Google Translate
|
||||||
|
|
||||||
germanMessage :: AuthMessage -> Text
|
germanMessage :: AuthMessage -> Text
|
||||||
@ -296,6 +302,7 @@ germanMessage InvalidUsernamePass = "Ungültige Kombination aus Nutzername und P
|
|||||||
-- TODO
|
-- TODO
|
||||||
germanMessage i@(IdentifierNotFound _) = englishMessage i
|
germanMessage i@(IdentifierNotFound _) = englishMessage i
|
||||||
germanMessage Logout = "Ausloggen" -- FIXME by Google Translate
|
germanMessage Logout = "Ausloggen" -- FIXME by Google Translate
|
||||||
|
germanMessage LogoutTitle = "Ausloggen" -- FIXME by Google Translate
|
||||||
germanMessage AuthError = "Authorisierungsfehler" -- FIXME by Google Translate
|
germanMessage AuthError = "Authorisierungsfehler" -- FIXME by Google Translate
|
||||||
|
|
||||||
frenchMessage :: AuthMessage -> Text
|
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 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 (IdentifierNotFound ident) = "Nom d'utilisateur introuvable: " `mappend` ident
|
||||||
frenchMessage Logout = "Déconnexion"
|
frenchMessage Logout = "Déconnexion"
|
||||||
|
frenchMessage LogoutTitle = "Déconnexion"
|
||||||
frenchMessage AuthError = "Erreur d'authentification" -- FIXME by Google Translate
|
frenchMessage AuthError = "Erreur d'authentification" -- FIXME by Google Translate
|
||||||
|
|
||||||
norwegianBokmålMessage :: AuthMessage -> Text
|
norwegianBokmålMessage :: AuthMessage -> Text
|
||||||
@ -387,6 +395,7 @@ norwegianBokmålMessage InvalidUsernamePass = "Invalid username/password combina
|
|||||||
-- TODO
|
-- TODO
|
||||||
norwegianBokmålMessage i@(IdentifierNotFound _) = englishMessage i
|
norwegianBokmålMessage i@(IdentifierNotFound _) = englishMessage i
|
||||||
norwegianBokmålMessage Logout = "Logge ut" -- FIXME by Google Translate
|
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
|
norwegianBokmålMessage AuthError = "Godkjenningsfeil" -- FIXME by Google Translate
|
||||||
|
|
||||||
japaneseMessage :: AuthMessage -> Text
|
japaneseMessage :: AuthMessage -> Text
|
||||||
@ -433,6 +442,7 @@ japaneseMessage InvalidUsernamePass = "ユーザ名とパスワードの組み
|
|||||||
japaneseMessage (IdentifierNotFound ident) =
|
japaneseMessage (IdentifierNotFound ident) =
|
||||||
ident `mappend` "は登録されていません"
|
ident `mappend` "は登録されていません"
|
||||||
japaneseMessage Logout = "ログアウト" -- FIXME by Google Translate
|
japaneseMessage Logout = "ログアウト" -- FIXME by Google Translate
|
||||||
|
japaneseMessage LogoutTitle = "ログアウト" -- FIXME by Google Translate
|
||||||
japaneseMessage AuthError = "認証エラー" -- FIXME by Google Translate
|
japaneseMessage AuthError = "認証エラー" -- FIXME by Google Translate
|
||||||
|
|
||||||
finnishMessage :: AuthMessage -> Text
|
finnishMessage :: AuthMessage -> Text
|
||||||
@ -480,6 +490,7 @@ finnishMessage InvalidUsernamePass = "Virheellinen käyttäjänimi tai salasana.
|
|||||||
-- TODO
|
-- TODO
|
||||||
finnishMessage i@(IdentifierNotFound _) = englishMessage i
|
finnishMessage i@(IdentifierNotFound _) = englishMessage i
|
||||||
finnishMessage Logout = "Kirjaudu ulos" -- FIXME by Google Translate
|
finnishMessage Logout = "Kirjaudu ulos" -- FIXME by Google Translate
|
||||||
|
finnishMessage LogoutTitle = "Kirjaudu ulos" -- FIXME by Google Translate
|
||||||
finnishMessage AuthError = "Authentication Error" -- FIXME by Google Translate
|
finnishMessage AuthError = "Authentication Error" -- FIXME by Google Translate
|
||||||
|
|
||||||
chineseMessage :: AuthMessage -> Text
|
chineseMessage :: AuthMessage -> Text
|
||||||
@ -526,6 +537,7 @@ chineseMessage InvalidUsernamePass = "无效的用户名/密码组合"
|
|||||||
-- TODO
|
-- TODO
|
||||||
chineseMessage i@(IdentifierNotFound _) = englishMessage i
|
chineseMessage i@(IdentifierNotFound _) = englishMessage i
|
||||||
chineseMessage Logout = "註銷" -- FIXME by Google Translate
|
chineseMessage Logout = "註銷" -- FIXME by Google Translate
|
||||||
|
chineseMessage LogoutTitle = "註銷" -- FIXME by Google Translate
|
||||||
chineseMessage AuthError = "验证错误" -- FIXME by Google Translate
|
chineseMessage AuthError = "验证错误" -- FIXME by Google Translate
|
||||||
|
|
||||||
czechMessage :: AuthMessage -> Text
|
czechMessage :: AuthMessage -> Text
|
||||||
@ -570,6 +582,7 @@ czechMessage InvalidUsernamePass = "Neplatná kombinace uživatelského jména a
|
|||||||
-- TODO
|
-- TODO
|
||||||
czechMessage i@(IdentifierNotFound _) = englishMessage i
|
czechMessage i@(IdentifierNotFound _) = englishMessage i
|
||||||
czechMessage Logout = "Odhlásit" -- FIXME by Google Translate
|
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
|
czechMessage AuthError = "Chyba ověřování" -- FIXME by Google Translate
|
||||||
|
|
||||||
-- Так как e-mail – это фактическое сокращение словосочетания electronic mail,
|
-- Так как e-mail – это фактическое сокращение словосочетания electronic mail,
|
||||||
@ -617,6 +630,7 @@ russianMessage PasswordResetPrompt = "Введите адрес эл.почты
|
|||||||
russianMessage InvalidUsernamePass = "Неверное сочетание имени пользователя и пароля"
|
russianMessage InvalidUsernamePass = "Неверное сочетание имени пользователя и пароля"
|
||||||
russianMessage (IdentifierNotFound ident) = "Логин не найден: " `mappend` ident
|
russianMessage (IdentifierNotFound ident) = "Логин не найден: " `mappend` ident
|
||||||
russianMessage Logout = "Выйти"
|
russianMessage Logout = "Выйти"
|
||||||
|
russianMessage LogoutTitle = "Выйти"
|
||||||
russianMessage AuthError = "Ошибка аутентификации"
|
russianMessage AuthError = "Ошибка аутентификации"
|
||||||
|
|
||||||
dutchMessage :: AuthMessage -> Text
|
dutchMessage :: AuthMessage -> Text
|
||||||
@ -662,4 +676,5 @@ dutchMessage PasswordResetPrompt = "Voer uw e-mailadres of gebruikersnaam hieron
|
|||||||
dutchMessage InvalidUsernamePass = "Ongeldige gebruikersnaam/wachtwoord combinatie"
|
dutchMessage InvalidUsernamePass = "Ongeldige gebruikersnaam/wachtwoord combinatie"
|
||||||
dutchMessage (IdentifierNotFound ident) = "Inloggegevens niet gevonden: " `mappend` ident
|
dutchMessage (IdentifierNotFound ident) = "Inloggegevens niet gevonden: " `mappend` ident
|
||||||
dutchMessage Logout = "Log Out" -- FIXME NOT TRANSLATED
|
dutchMessage Logout = "Log Out" -- FIXME NOT TRANSLATED
|
||||||
|
dutchMessage LogoutTitle = "Log Out" -- FIXME NOT TRANSLATED
|
||||||
dutchMessage AuthError = "Verificatiefout" -- FIXME by Google Translate
|
dutchMessage AuthError = "Verificatiefout" -- FIXME by Google Translate
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user