diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-05-03 14:10:36 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-05-03 14:10:36 -0400 |
| commit | 87989b8afd4666a72940389db716b6500d0a9ec3 (patch) | |
| tree | d4b0270eb4a9adbff0dd1b6f527ddcccbc9a83d9 /i18n/en.json | |
| parent | e76a30bca0690bad53a4cabd6c7c629e89c17268 (diff) | |
| download | chat-87989b8afd4666a72940389db716b6500d0a9ec3.tar.gz chat-87989b8afd4666a72940389db716b6500d0a9ec3.tar.bz2 chat-87989b8afd4666a72940389db716b6500d0a9ec3.zip | |
PLT-2258 Unified login screen and related APIs (#2820)
* Unified login screen and related APIs
* Refactored login API call to be less convoluted
* Removed LDAP login prompt from invite process
* Fixed existing LDAP users being able to log in if LDAP was configured, but disabled
* Gofmt
* Future proofed login API
* Updated login APIs based on feedback
* Added additional auditing to login API
* Actually removed loginById
Diffstat (limited to 'i18n/en.json')
| -rw-r--r-- | i18n/en.json | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/i18n/en.json b/i18n/en.json index 138a1ace1..9a44ca31a 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1560,7 +1560,7 @@ "translation": "Revoking sessionId=%v for userId=%v re-login with same device Id" }, { - "id": "api.user.login_by_email.sign_in.app_error", + "id": "api.user.login.use_auth_service.app_error", "translation": "Please sign in using {{.AuthService}}" }, { @@ -3444,6 +3444,14 @@ "translation": "We encountered an error while finding user profiles" }, { + "id": "store.sql_user.get_for_login.app_error", + "translation": "We couldn't find an existing account matching your credentials. This team may require an invite from the team owner to join." + }, + { + "id": "store.sql_user.get_for_login.multiple_users", + "translation": "We found multiple users matching your credentials and were unable to log you in. Please contact an administrator." + }, + { "id": "store.sql_user.get_profiles.app_error", "translation": "We encountered an error while finding user profiles" }, |