PLT-2809 Followups to login page redesign (#2901)

* Rearranged controls on the login page

* Prevented login when username or password hasn't been entered

* Updated login page error messages

* Enabled sign in with username by default

5 files changed, 13 insertions, 22 deletions

diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index e3c1aac0f..79f3c5cbe 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -965,20 +965,19 @@
   "login.email": "Email",
   "login.find": "Find your other teams",
   "login.forgot": "I forgot my password",
-  "login.gitlab": "with GitLab",
-  "login.google": "with Google Apps",
+  "login.invalidPassword": "Your password is incorrect.",
+  "login.gitlab": "GitLab",
+  "login.google": "Google Apps",
   "login.ldapUsername": "LDAP Username",
-  "login.loginIdRequired": "A {type} is required",
   "login.noAccount": "Don't have an account? ",
   "login.on": "on {siteName}",
   "login.or": "or",
   "login.password": "Password",
   "login.passwordChanged": " Password updated successfully",
-  "login.passwordRequired": "A password is required",
   "login.session_expired": " Your session has expired. Please login again.",
   "login.signIn": "Sign in",
-  "login.signTo": "Sign in to:",
-  "login.userNotFound": "We couldn't find an existing account matching your login credentials.",
+  "login.signInWith": "Sign in with:",
+  "login.userNotFound": "We couldn't find an account matching your login credentials.",
   "login.username": "Username",
   "login.verified": " Email Verified",
   "login_mfa.enterToken": "To complete the sign in process, please enter a token from your smartphone's authenticator",
diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json
index 434444e94..8a2e716f4 100644
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -965,8 +965,8 @@
   "login.email": "Correo electrónico",
   "login.find": "Encuentra tus otros equipos",
   "login.forgot": "Olvide mi contraseña",
-  "login.gitlab": "con GitLab",
-  "login.google": "con Google Apps",
+  "login.gitlab": "GitLab",
+  "login.google": "Google Apps",
   "login.ldapUsername": "Usuario LDAP",
   "login.loginIdRequired": "Se requiere un {type}",
   "login.noAccount": "¿No tienes una cuenta? ",
@@ -974,10 +974,8 @@
   "login.or": "o",
   "login.password": "Contraseña",
   "login.passwordChanged": " La contraseña ha sido actualizada",
-  "login.passwordRequired": "La contraseña es obligatoria",
   "login.session_expired": " Tu sesión ha expirado. Por favor inicia sesión nuevamente.",
   "login.signIn": "Entrar",
-  "login.signTo": "Ingresar a:",
   "login.userNotFound": "No pudimos encontrar una cuenta que coincida con tus credenciales.",
   "login.username": "Nombre de usuario",
   "login.verified": " Correo electrónico Verificado",
diff --git a/webapp/i18n/fr.json b/webapp/i18n/fr.json
index 31f646d84..12f469c01 100644
--- a/webapp/i18n/fr.json
+++ b/webapp/i18n/fr.json
@@ -821,17 +821,15 @@
   "login.email": "Adresse électronique",
   "login.find": "Trouver vos autres équipes",
   "login.forgot": "Mot de passe perdu",
-  "login.gitlab": "avec GitLab",
-  "login.google": "avec Google Apps",
+  "login.gitlab": "GitLab",
+  "login.google": "Google Apps",
   "login.ldapUsername": "Utilisateur LDAP",
   "login.noAccount": "Pas de compte utilisateur ?",
   "login.on": "sur {siteName}",
   "login.or": "ou",
   "login.password": "Mot de passe",
-  "login.passwordRequired": "Le mot de passe est obligatoire",
   "login.session_expired": "Votre session a expiré. Merci de vous reconnecter.",
   "login.signIn": "Connexion",
-  "login.signTo": "Se connecter à :",
   "login.username": "Nom d'utilisateur",
   "login.verified": "Adresse électronique vérifiée",
   "member_item.makeAdmin": "Passer Administrateur",
diff --git a/webapp/i18n/ja.json b/webapp/i18n/ja.json
index e7198bd81..1b1b56302 100644
--- a/webapp/i18n/ja.json
+++ b/webapp/i18n/ja.json
@@ -915,17 +915,15 @@
   "login.email": "電子メールアドレス",
   "login.find": "参加している他のチームを探す",
   "login.forgot": "パスワードを忘れました",
-  "login.gitlab": "GitLabでログインする",
-  "login.google": "Google Appsでログインする",
+  "login.gitlab": "GitLab",
+  "login.google": "Google Apps",
   "login.ldapUsername": "LDAPユーザー名",
   "login.noAccount": "アカウントを持っていますか? ",
   "login.on": "{siteName}にて",
   "login.or": "または",
   "login.password": "パスワード",
-  "login.passwordRequired": "パスワードは必須です",
   "login.session_expired": " あなたのセッションは有効期限が切れました。再度ログインしてください。",
   "login.signIn": "利用登録",
-  "login.signTo": "利用登録先: ",
   "login.username": "LDAPユーザー名",
   "login.verified": " 電子メールアドレスが確認されました",
   "login_mfa.enterToken": "利用登録を完了するには、スマートフォンのauthenticatorからのトークンを入力してください。",
diff --git a/webapp/i18n/pt.json b/webapp/i18n/pt.json
index 5471c8a5e..6bd3d5724 100644
--- a/webapp/i18n/pt.json
+++ b/webapp/i18n/pt.json
@@ -953,8 +953,8 @@
   "login.email": "E-mail",
   "login.find": "Encontre suas outras equipes",
   "login.forgot": "Eu esqueci a minha senha",
-  "login.gitlab": "com GitLab",
-  "login.google": "com Google Apps",
+  "login.gitlab": "GitLab",
+  "login.google": "Google Apps",
   "login.ldapUsername": "Usuário LDAP",
   "login.loginIdRequired": "Um {type} é necessário",
   "login.noAccount": "Não tem uma conta? ",
@@ -962,10 +962,8 @@
   "login.or": "ou",
   "login.password": "Senha",
   "login.passwordChanged": " Senha atualizada com sucesso",
-  "login.passwordRequired": "É necessário uma senha",
   "login.session_expired": " Sua sessão expirou. Por favor faça login novamente.",
   "login.signIn": "Login",
-  "login.signTo": "Login em:",
   "login.userNotFound": "Não foi possível encontrar uma conta existente que corresponda com as suas credenciais.",
   "login.username": "Usuário",
   "login.verified": " Email Verificado",