From 30a10d35a8406f4af96fcc8200c4e2173856837d Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Mon, 12 Dec 2016 08:16:10 -0500
Subject: PLT-4767 Implement MFA Enforcement (#4662)

* Create MFA setup page and remove MFA setup from account settings modal

* Add enforce MFA to system console and force redirect

* Lockdown mfa required API routes, add localization, other changes

* Minor fixes

* Fix typo

* Fix some unit tests

* Fix more unit tests

* Minor fix

* Updating UI for MFA screen (#4670)

* Updating UI for MFA screen

* Updating styles for MFA page

* Add the ability to switch between email/sso with MFA enabled

* Added mfa change email

* Minor UI updates for MFA enforcement

* Fix unit test

* Fix client unit test

* Allow switching email to ldap and back when MFA is enabled

* Fix unit test

* Revert config.json
---
 i18n/en.json | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'i18n')

diff --git a/i18n/en.json b/i18n/en.json
index 84d5be7de..37acda939 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -711,6 +711,10 @@
     "id": "api.context.session_expired.app_error",
     "translation": "Invalid or expired session, please login again."
   },
+  {
+    "id": "api.context.mfa_required.app_error",
+    "translation": "Multi-factor authentication is required on this server."
+  },
   {
     "id": "api.context.system_permissions.app_error",
     "translation": "You do not have the appropriate permissions (system)"
@@ -1987,6 +1991,26 @@
     "id": "api.templates.password_change_subject",
     "translation": "Your password has been updated for {{.TeamDisplayName}} on {{ .SiteName }}"
   },
+  {
+    "id": "api.templates.mfa_activated_body.info",
+    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.mfa_deactivated_body.info",
+    "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.mfa_activated_body.title",
+    "translation": "Multi-factor authentication was added"
+  },
+  {
+    "id": "api.templates.mfa_deactivated_body.title",
+    "translation": "Multi-factor authentication was removed"
+  },
+  {
+    "id": "api.templates.mfa_change_subject",
+    "translation": "Your MFA has been updated on {{ .SiteName }}"
+  },
   {
     "id": "api.templates.post_body.button",
     "translation": "Go To Post"
-- 
cgit v1.2.3-1-g7c22