From 87989b8afd4666a72940389db716b6500d0a9ec3 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Tue, 3 May 2016 14:10:36 -0400
Subject: 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
---
 i18n/fr.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'i18n/fr.json')

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}}"
   },
   {
-- 
cgit v1.2.3-1-g7c22