about summary refs log tree commit diff
path: root/config/locales/simple_form.en.yml
diff options
context:
space:
mode:
authorPatrick Figel <patrick@figel.email>2017-04-15 13:26:03 +0200
committerEugen <eugen@zeonfederated.com>2017-04-15 13:26:03 +0200
commitdf4ff9a8e13d776e1670c232655db0275a353a0f (patch)
treea7bdb4c0240e169bac01bf67b76f685e9a9b4a67 /config/locales/simple_form.en.yml
parent67ad84b7ebf080d6a6cbcb7d299e02c2a51d955e (diff)
Add recovery code support for two-factor auth (#1773)
* Add recovery code support for two-factor auth

When users enable two-factor auth, the app now generates ten
single-use recovery codes. Users are encouraged to print the codes
and store them in a safe place.

The two-factor prompt during login now accepts both OTP codes and
recovery codes.

The two-factor settings UI allows users to regenerated lost
recovery codes. Users who have set up two-factor auth prior to
this feature being added can use it to generate recovery codes
for the first time.

Fixes #563 and fixes #987

* Set OTP_SECRET in test enviroment

* add missing .html to view file names
Diffstat (limited to 'config/locales/simple_form.en.yml')
-rw-r--r--config/locales/simple_form.en.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 74649da51..c25407f2b 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -10,6 +10,8 @@ en:
         note: At most 160 characters
       imports:
         data: CSV file exported from another Mastodon instance
+      sessions:
+        otp: Enter the Two-factor code from your phone or use one of your recovery codes.
     labels:
       defaults:
         avatar: Avatar