summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-05-03 14:10:36 -0400
committerChristopher Speller <crspeller@gmail.com>2016-05-03 14:10:36 -0400
commit87989b8afd4666a72940389db716b6500d0a9ec3 (patch)
treed4b0270eb4a9adbff0dd1b6f527ddcccbc9a83d9 /i18n
parente76a30bca0690bad53a4cabd6c7c629e89c17268 (diff)
downloadchat-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')
-rw-r--r--i18n/en.json10
-rw-r--r--i18n/es.json2
-rw-r--r--i18n/fr.json2
-rw-r--r--i18n/ja.json2
-rw-r--r--i18n/pt.json2
5 files changed, 13 insertions, 5 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"
},
diff --git a/i18n/es.json b/i18n/es.json
index 5bda4b981..f83a2591c 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -1560,7 +1560,7 @@
"translation": "Revocando sessionId=%v para el userId=%v vuelve a iniciar la sesión el el mismo dispositivo"
},
{
- "id": "api.user.login_by_email.sign_in.app_error",
+ "id": "api.user.login.use_auth_service.app_error",
"translation": "Por favor inicia sesión usando {{.AuthService}}"
},
{
diff --git a/i18n/fr.json b/i18n/fr.json
index 488b49b69..d2290685c 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -1428,7 +1428,7 @@
"translation": "Session sessionId=%v de l'utilisateur userId=%v révoquée re-connexion avec le même identifiant"
},
{
- "id": "api.user.login_by_email.sign_in.app_error",
+ "id": "api.user.login.use_auth_service.app_error",
"translation": "Veuillez vous connecter en utilisant {{.AuthService}}"
},
{
diff --git a/i18n/ja.json b/i18n/ja.json
index 44b8781f0..652494b67 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -1564,7 +1564,7 @@
"translation": "userId=%vのsessionId=%vを無効化しました。同じデバイスIDでログインし直してください"
},
{
- "id": "api.user.login_by_email.sign_in.app_error",
+ "id": "api.user.login.use_auth_service.app_error",
"translation": "{{.AuthService}}を使ってサインインしてください"
},
{
diff --git a/i18n/pt.json b/i18n/pt.json
index 635e254d1..2f4b2dd37 100644
--- a/i18n/pt.json
+++ b/i18n/pt.json
@@ -1520,7 +1520,7 @@
"translation": "Revogada sessionid=%v para userid=%v logue novamente com o mesmo id de dispositivo"
},
{
- "id": "api.user.login_by_email.sign_in.app_error",
+ "id": "api.user.login.use_auth_service.app_error",
"translation": "Por favor logue usando {{.AuthService}}"
},
{