From 9edca8e3b5ec26e4b824ad28ba05792383a9640c Mon Sep 17 00:00:00 2001 From: Jesse Kempf Date: Wed, 30 Aug 2017 20:35:22 -0700 Subject: [PATCH] Correct Yesod-Auth's usage of "log in" vs "login" in English. "Log in" (two words) is a verb, indicating the action of, well, logging in. "Login" (one word) is a noun, indicating the credentials used to log in. --- yesod-auth/ChangeLog.md | 4 ++++ yesod-auth/Yesod/Auth/Message.hs | 10 +++++----- yesod-auth/yesod-auth.cabal | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/yesod-auth/ChangeLog.md b/yesod-auth/ChangeLog.md index 2a529171..e661abc7 100644 --- a/yesod-auth/ChangeLog.md +++ b/yesod-auth/ChangeLog.md @@ -1,3 +1,7 @@ +## 1.4.19 + +* Adjust English localization to distinguish between "log in" (verb) and "login" (noun) + ## 1.4.18 * Expose Yesod.Auth.Util.PasswordStore diff --git a/yesod-auth/Yesod/Auth/Message.hs b/yesod-auth/Yesod/Auth/Message.hs index 04d59c5e..b8e565a5 100644 --- a/yesod-auth/Yesod/Auth/Message.hs +++ b/yesod-auth/Yesod/Auth/Message.hs @@ -76,9 +76,9 @@ defaultMessage = englishMessage englishMessage :: AuthMessage -> Text englishMessage NoOpenID = "No OpenID identifier found" -englishMessage LoginOpenID = "Login via OpenID" -englishMessage LoginGoogle = "Login via Google" -englishMessage LoginYahoo = "Login via Yahoo" +englishMessage LoginOpenID = "Log in via OpenID" +englishMessage LoginGoogle = "Log in via Google" +englishMessage LoginYahoo = "Log in via Yahoo" englishMessage Email = "Email" englishMessage UserName = "User name" englishMessage Password = "Password" @@ -102,8 +102,8 @@ englishMessage NewPass = "New password" englishMessage ConfirmPass = "Confirm" englishMessage PassMismatch = "Passwords did not match, please try again" englishMessage PassUpdated = "Password updated" -englishMessage Facebook = "Login with Facebook" -englishMessage LoginViaEmail = "Login via email" +englishMessage Facebook = "Log in with Facebook" +englishMessage LoginViaEmail = "Log in via email" englishMessage InvalidLogin = "Invalid login" englishMessage NowLoggedIn = "You are now logged in" englishMessage LoginTitle = "Log In" diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal index 839a41d3..4d406329 100644 --- a/yesod-auth/yesod-auth.cabal +++ b/yesod-auth/yesod-auth.cabal @@ -1,5 +1,5 @@ name: yesod-auth -version: 1.4.18 +version: 1.4.19 license: MIT license-file: LICENSE author: Michael Snoyman, Patrick Brisbin