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

Correct Yesod-Auth's usage of "log in" vs "login" in English.

Browse Source 
"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.
This commit is contained in:
Jesse Kempf 2017-08-30 20:35:22 -07:00
parent 498d373e2d
commit 9edca8e3b5
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yesod-auth/ChangeLog.md
View File

@ -1,3 +1,7 @@
## 1.4.19
* Adjust English localization to distinguish between "log in" (verb) and "login" (noun)
## 1.4.18 ## 1.4.18
* Expose Yesod.Auth.Util.PasswordStore * Expose Yesod.Auth.Util.PasswordStore

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

@ -76,9 +76,9 @@ defaultMessage = englishMessage
englishMessage :: AuthMessage -> Text englishMessage :: AuthMessage -> Text
englishMessage NoOpenID = "No OpenID identifier found" englishMessage NoOpenID = "No OpenID identifier found"
englishMessage LoginOpenID = "Login via OpenID" englishMessage LoginOpenID = "Log in via OpenID"
englishMessage LoginGoogle = "Login via Google" englishMessage LoginGoogle = "Log in via Google"
englishMessage LoginYahoo = "Login via Yahoo" englishMessage LoginYahoo = "Log in via Yahoo"
englishMessage Email = "Email" englishMessage Email = "Email"
englishMessage UserName = "User name" englishMessage UserName = "User name"
englishMessage Password = "Password" englishMessage Password = "Password"
@ -102,8 +102,8 @@ englishMessage NewPass = "New password"
englishMessage ConfirmPass = "Confirm" englishMessage ConfirmPass = "Confirm"
englishMessage PassMismatch = "Passwords did not match, please try again" englishMessage PassMismatch = "Passwords did not match, please try again"
englishMessage PassUpdated = "Password updated" englishMessage PassUpdated = "Password updated"
englishMessage Facebook = "Login with Facebook" englishMessage Facebook = "Log in with Facebook"
englishMessage LoginViaEmail = "Login via email" englishMessage LoginViaEmail = "Log in via email"
englishMessage InvalidLogin = "Invalid login" englishMessage InvalidLogin = "Invalid login"
englishMessage NowLoggedIn = "You are now logged in" englishMessage NowLoggedIn = "You are now logged in"
englishMessage LoginTitle = "Log In" englishMessage LoginTitle = "Log In"

2
yesod-auth/yesod-auth.cabal
View File

@ -1,5 +1,5 @@
name: yesod-auth name: yesod-auth
version: 1.4.18 version: 1.4.19
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman, Patrick Brisbin author: Michael Snoyman, Patrick Brisbin