From 311f949f0e9e2985068fe082e9629fd9ffdb9b72 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: Mon, 23 Nov 2015 16:14:40 +0500 Subject: [PATCH 1/6] Extract "in"/"out" suffixes in Login/Logout words Split "Login" and "Logout" words into two parts, e.g. "Log In" and "Log Out". --- 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 abfa4f9b..035deca5 100644 --- a/yesod-auth/Yesod/Auth/Message.hs +++ b/yesod-auth/Yesod/Auth/Message.hs @@ -97,7 +97,7 @@ englishMessage Facebook = "Login with Facebook" englishMessage LoginViaEmail = "Login via email" englishMessage InvalidLogin = "Invalid login" englishMessage NowLoggedIn = "You are now logged in" -englishMessage LoginTitle = "Login" +englishMessage LoginTitle = "Log In" englishMessage PleaseProvideUsername = "Please fill in your username" englishMessage PleaseProvidePassword = "Please fill in your password" englishMessage NoIdentifierProvided = "No email/username provided" @@ -108,7 +108,7 @@ englishMessage SendPasswordResetEmail = "Send password reset email" englishMessage PasswordResetPrompt = "Enter your e-mail address or username below, and a password reset e-mail will be sent to you." englishMessage InvalidUsernamePass = "Invalid username/password combination" englishMessage (IdentifierNotFound ident) = "Login not found: " `mappend` ident -englishMessage Logout = "Logout" +englishMessage Logout = "Log Out" englishMessage AuthError = "Authentication Error" -- FIXME by Google Translate portugueseMessage :: AuthMessage -> Text @@ -186,7 +186,7 @@ spanishMessage Facebook = "Entrar mediante Facebook" spanishMessage LoginViaEmail = "Entrar mediante una cuenta de correo" spanishMessage InvalidLogin = "Login inválido" spanishMessage NowLoggedIn = "Usted ha ingresado al sitio" -spanishMessage LoginTitle = "Login" +spanishMessage LoginTitle = "Log In" spanishMessage PleaseProvideUsername = "Por favor escriba su nombre de usuario" spanishMessage PleaseProvidePassword = "Por favor escriba su contraseña" spanishMessage NoIdentifierProvided = "No ha indicado una cuenta de correo/nombre de usuario" @@ -277,7 +277,7 @@ germanMessage Facebook = "Login über Facebook" germanMessage LoginViaEmail = "Login via e-Mail" germanMessage InvalidLogin = "Ungültiger Login" germanMessage NowLoggedIn = "Login erfolgreich" -germanMessage LoginTitle = "Login" +germanMessage LoginTitle = "Log In" germanMessage PleaseProvideUsername = "Bitte Nutzername angeben" germanMessage PleaseProvidePassword = "Bitte Passwort angeben" germanMessage NoIdentifierProvided = "Keine Email-Adresse oder kein Nutzername angegeben" @@ -647,5 +647,5 @@ 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 = "Logout" -- FIXME NOT TRANSLATED +dutchMessage Logout = "Log Out" -- FIXME NOT TRANSLATED dutchMessage AuthError = "Verificatiefout" -- FIXME by Google Translate From d1e92af79e117caf89101ee1592682c1629ce3fc 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: Mon, 23 Nov 2015 16:40:47 +0500 Subject: [PATCH 2/6] Add UserName message constructor --- yesod-auth/Yesod/Auth/Message.hs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/yesod-auth/Yesod/Auth/Message.hs b/yesod-auth/Yesod/Auth/Message.hs index 035deca5..7a6612e3 100644 --- a/yesod-auth/Yesod/Auth/Message.hs +++ b/yesod-auth/Yesod/Auth/Message.hs @@ -28,6 +28,7 @@ data AuthMessage = | LoginGoogle | LoginYahoo | Email + | UserName | IdentifierNotFound Text | Password | Register @@ -73,6 +74,7 @@ englishMessage LoginOpenID = "Login via OpenID" englishMessage LoginGoogle = "Login via Google" englishMessage LoginYahoo = "Login via Yahoo" englishMessage Email = "Email" +englishMessage UserName = "User name" englishMessage Password = "Password" englishMessage Register = "Register" englishMessage RegisterLong = "Register a new account" @@ -117,6 +119,7 @@ portugueseMessage LoginOpenID = "Entrar via OpenID" portugueseMessage LoginGoogle = "Entrar via Google" portugueseMessage LoginYahoo = "Entrar via Yahoo" portugueseMessage Email = "E-mail" +portugueseMessage UserName = "Nome de usuário" -- FIXME by Google Translate "user name" portugueseMessage Password = "Senha" portugueseMessage Register = "Registrar" portugueseMessage RegisterLong = "Registrar uma nova conta" @@ -162,6 +165,7 @@ spanishMessage LoginOpenID = "Entrar utilizando OpenID" spanishMessage LoginGoogle = "Entrar utilizando Google" spanishMessage LoginYahoo = "Entrar utilizando Yahoo" spanishMessage Email = "Correo electrónico" +spanishMessage UserName = "Nombre de Usuario" -- FIXME by Google Translate "user name" spanishMessage Password = "Contraseña" spanishMessage Register = "Registrarse" spanishMessage RegisterLong = "Registrar una nueva cuenta" @@ -207,6 +211,7 @@ swedishMessage LoginOpenID = "Logga in via OpenID" swedishMessage LoginGoogle = "Logga in via Google" swedishMessage LoginYahoo = "Logga in via Yahoo" swedishMessage Email = "Epost" +swedishMessage UserName = "Användarnamn" -- FIXME by Google Translate "user name" swedishMessage Password = "Lösenord" swedishMessage Register = "Registrera" swedishMessage RegisterLong = "Registrera ett nytt konto" @@ -253,6 +258,7 @@ germanMessage LoginOpenID = "Login via OpenID" germanMessage LoginGoogle = "Login via Google" germanMessage LoginYahoo = "Login via Yahoo" germanMessage Email = "Email" +germanMessage UserName = "Benutzername" -- FIXME by Google Translate "user name" germanMessage Password = "Passwort" germanMessage Register = "Registrieren" germanMessage RegisterLong = "Neuen Account registrieren" @@ -298,6 +304,7 @@ frenchMessage LoginOpenID = "Se connecter avec OpenID" frenchMessage LoginGoogle = "Se connecter avec Google" frenchMessage LoginYahoo = "Se connecter avec Yahoo" frenchMessage Email = "Adresse électronique" +frenchMessage UserName = "Nom d'utilisateur" -- FIXME by Google Translate "user name" frenchMessage Password = "Mot de passe" frenchMessage Register = "S'inscrire" frenchMessage RegisterLong = "Créer un compte" @@ -342,6 +349,7 @@ norwegianBokmålMessage LoginOpenID = "Logg inn med OpenID" norwegianBokmålMessage LoginGoogle = "Logg inn med Google" norwegianBokmålMessage LoginYahoo = "Logg inn med Yahoo" norwegianBokmålMessage Email = "E-post" +norwegianBokmålMessage UserName = "Brukernavn" -- FIXME by Google Translate "user name" norwegianBokmålMessage Password = "Passord" norwegianBokmålMessage Register = "Registrer" norwegianBokmålMessage RegisterLong = "Registrer en ny konto" @@ -387,6 +395,7 @@ japaneseMessage LoginOpenID = "OpenIDでログイン" japaneseMessage LoginGoogle = "Googleでログイン" japaneseMessage LoginYahoo = "Yahooでログイン" japaneseMessage Email = "Eメール" +japaneseMessage UserName = "ユーザー名" -- FIXME by Google Translate "user name" japaneseMessage Password = "パスワード" japaneseMessage Register = "登録" japaneseMessage RegisterLong = "新規アカウント登録" @@ -432,6 +441,7 @@ finnishMessage LoginOpenID = "Kirjaudu OpenID-tilillä" finnishMessage LoginGoogle = "Kirjaudu Google-tilillä" finnishMessage LoginYahoo = "Kirjaudu Yahoo-tilillä" finnishMessage Email = "Sähköposti" +finnishMessage UserName = "Käyttäjätunnus" -- FIXME by Google Translate "user name" finnishMessage Password = "Salasana" finnishMessage Register = "Luo uusi" finnishMessage RegisterLong = "Luo uusi tili" @@ -478,6 +488,7 @@ chineseMessage LoginOpenID = "用OpenID登录" chineseMessage LoginGoogle = "用Google帐户登录" chineseMessage LoginYahoo = "用Yahoo帐户登录" chineseMessage Email = "邮箱" +chineseMessage UserName = "用户名" -- FIXME by Google Translate "user name" chineseMessage Password = "密码" chineseMessage Register = "注册" chineseMessage RegisterLong = "注册新帐户" @@ -523,6 +534,7 @@ czechMessage LoginOpenID = "Přihlásit přes OpenID" czechMessage LoginGoogle = "Přihlásit přes Google" czechMessage LoginYahoo = "Přihlásit přes Yahoo" czechMessage Email = "E-mail" +czechMessage UserName = "Uživatelské Jméno" -- FIXME by Google Translate "user name" czechMessage Password = "Heslo" czechMessage Register = "Registrovat" czechMessage RegisterLong = "Zaregistrovat nový účet" @@ -568,6 +580,7 @@ russianMessage LoginOpenID = "Вход с помощью OpenID" russianMessage LoginGoogle = "Вход с помощью Google" russianMessage LoginYahoo = "Вход с помощью Yahoo" russianMessage Email = "Эл.почта" +russianMessage UserName = "Имя пользователя" russianMessage Password = "Пароль" russianMessage Register = "Регистрация" russianMessage RegisterLong = "Создать учётную запись" @@ -612,6 +625,7 @@ 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 Password = "Wachtwoord" dutchMessage Register = "Registreren" dutchMessage RegisterLong = "Registreer een nieuw account" From 11bedecdc0da4c1dddbb2a8b6f2deed682f712ba 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: Mon, 23 Nov 2015 16:41:09 +0500 Subject: [PATCH 3/6] Prettify imports (via Stylish Haskell) --- yesod-auth/Yesod/Auth/Message.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yesod-auth/Yesod/Auth/Message.hs b/yesod-auth/Yesod/Auth/Message.hs index 7a6612e3..959cd060 100644 --- a/yesod-auth/Yesod/Auth/Message.hs +++ b/yesod-auth/Yesod/Auth/Message.hs @@ -19,8 +19,8 @@ module Yesod.Auth.Message , dutchMessage ) where -import Data.Monoid (mappend) -import Data.Text (Text) +import Data.Monoid (mappend) +import Data.Text (Text) data AuthMessage = NoOpenID From 45c0b4414291715c25ca4e81f27a1acff8d03713 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: Mon, 23 Nov 2015 17:04:21 +0500 Subject: [PATCH 4/6] Update Travis build instructions Follow "S3 Hackage mirror for Travis builds" (http://www.yesodweb.com/blog/2015/07/s3-hackage-mirror-travis) suggestions. --- .travis-setup.sh | 10 ++++++++++ .travis.yml | 3 +++ 2 files changed, 13 insertions(+) create mode 100755 .travis-setup.sh diff --git a/.travis-setup.sh b/.travis-setup.sh new file mode 100755 index 00000000..e694e093 --- /dev/null +++ b/.travis-setup.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +set -eux + +mkdir -p $HOME/.cabal +cat > $HOME/.cabal/config < Date: Tue, 24 Nov 2015 02:15:03 +0500 Subject: [PATCH 5/6] 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 From a6494bf7883fa26878a7c3875148038109d89797 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:19:04 +0500 Subject: [PATCH 6/6] Bump minor version --- yesod-auth/yesod-auth.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal index cf92f837..84428112 100644 --- a/yesod-auth/yesod-auth.cabal +++ b/yesod-auth/yesod-auth.cabal @@ -1,5 +1,5 @@ name: yesod-auth -version: 1.4.9 +version: 1.4.10 license: MIT license-file: LICENSE author: Michael Snoyman, Patrick Brisbin