diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-02-03 07:33:43 -0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-02-03 07:33:43 -0500 |
| commit | 4a09adeb391b23c7e850fec96a2e8a731b70d755 (patch) | |
| tree | ca9cc2410dc17de823d923c9e0ff74fea16d2a82 /web/static | |
| parent | d31ae207389b7402debbcaa40bb691e86023f1ba (diff) | |
| parent | b013f02209c7c128a35d1c54f2d4a7d6a9701f72 (diff) | |
| download | chat-4a09adeb391b23c7e850fec96a2e8a731b70d755.tar.gz chat-4a09adeb391b23c7e850fec96a2e8a731b70d755.tar.bz2 chat-4a09adeb391b23c7e850fec96a2e8a731b70d755.zip | |
Merge pull request #1991 from rgarmsen2295/plt-976
PLT-976 Adds ability to sign in with username
Diffstat (limited to 'web/static')
| -rw-r--r-- | web/static/i18n/en.json | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index 2412a1bae..de955349e 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -127,6 +127,10 @@ "admin.email.true": "true", "admin.email.false": "false", "admin.email.allowSignupDescription": "When true, Mattermost allows team creation and account signup using email and password. This value should be false only when you want to limit signup to a single-sign-on service like OAuth or LDAP.", + "admin.email.allowEmailSignInTitle": "Allow Sign In With Email: ", + "admin.email.allowEmailSignInDescription": "When true, Mattermost allows users to sign in using their email and password.", + "admin.email.allowUsernameSignInTitle": "Allow Sign In With Username: ", + "admin.email.allowUsernameSignInDescription": "When true, Mattermost allows users to sign in using their username and password. This setting is typically only used when email verification is disabled.", "admin.email.notificationsTitle": "Send Email Notifications: ", "admin.email.notificationsDescription": "Typically set to true in production. When true, Mattermost attempts to send email notifications. Developers may set this field to false to skip email setup for faster development.<br />Setting this to true removes the Preview Mode banner (requires logging out and logging back in after setting is changed).", "admin.email.requireVerificationTitle": "Require Email Verification: ", @@ -551,6 +555,14 @@ "login_email.email": "Email", "login_email.pwd": "Password", "login_email.signin": "Sign in", + "login_username.badTeam": "Bad team name", + "login_username.usernameReq": "A username is required", + "login_username.pwdReq": "A password is required", + "login_username.verifyEmailError": "Please verify your email address. Check your inbox for an email.", + "login_username.userNotFoundError": "We couldn't find an existing account matching your username for this team.", + "login_username.username": "Username", + "login_username.pwd": "Password", + "login_username.signin": "Sign in", "login_ldap.badTeam": "Bad team name", "login_ldap.idlReq": "An LDAP ID is required", "login_ldap.pwdReq": "An LDAP password is required", |