Fix email verification process (#2664)

- Fix email verification URL in login view
- Fix URL in email being sent for verification
- Add Email Verification on password reset
- Fix display of email in reset password
- Fix URL en team_signup_password_page
- Fix typo in webapp en loc
- Add missing es locs
- Removed extra es, fr and pt locs

2 files changed, 9 insertions, 5 deletions

diff --git a/i18n/en.json b/i18n/en.json
index 5d154001c..17f1ba7c8 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2208,6 +2208,10 @@
     "translation": "Invalid thumbnail width for file settings.  Must be a positive number."
   },
   {
+    "id": "model.config.is_valid.ldap_security.app_error",
+    "translation": "Invalid connection security for LDAP settings.  Must be '', 'TLS', or 'STARTTLS'"
+  },
+  {
     "id": "model.config.is_valid.listen_address.app_error",
     "translation": "Invalid listen address for service settings Must be set."
   },
@@ -2244,10 +2248,6 @@
     "translation": "Invalid maximum open connection for SQL settings.  Must be a positive number."
   },
   {
-    "id": "model.config.is_valid.ldap_security.app_error",
-    "translation": "Invalid connection security for LDAP settings.  Must be '', 'TLS', or 'STARTTLS'"
-  },
-  {
     "id": "model.file_info.get.gif.app_error",
     "translation": "Could not decode gif."
   },
diff --git a/i18n/es.json b/i18n/es.json
index c66e621aa..f5e98c5c7 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -2208,6 +2208,10 @@
     "translation": "El ancho para la imagen de miniatura es inválido en la configuración de archivos.  Debe ser un número positivo."
   },
   {
+    "id": "model.config.is_valid.ldap_security.app_error",
+    "translation": "Conexión segura inválida en la configuración de LDAP.  Debe ser '', 'TLS', o 'STARTTLS'"
+  },
+  {
     "id": "model.config.is_valid.listen_address.app_error",
     "translation": "Dirección dónde se escuchará el servicio en la configuracón del servicio debe ser asignada."
   },
@@ -3827,4 +3831,4 @@
     "id": "web.watcher_fail.error",
     "translation": "Falla al agregar el directorio a ser vigilado %v"
   }
-]
\ No newline at end of file
+]