diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-18 00:07:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-18 00:07:50 +0300 |
| commit | 360ee1db0bf3bba2fc7aad7f230ec80829561227 (patch) | |
| tree | ca7484ad394da3eb719c8070857e6f20eb1d9f51 /app/views/profiles/two_factor_auths | |
| parent | ec76d14980534d45d25ef65134a756c733fe4877 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/profiles/two_factor_auths')
| -rw-r--r-- | app/views/profiles/two_factor_auths/show.html.haml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/app/views/profiles/two_factor_auths/show.html.haml b/app/views/profiles/two_factor_auths/show.html.haml index 2d40a566608..5a3e94afc63 100644 --- a/app/views/profiles/two_factor_auths/show.html.haml +++ b/app/views/profiles/two_factor_auths/show.html.haml @@ -8,7 +8,7 @@ .row.gl-mt-3 .col-lg-4 %h4.gl-mt-0 - = _('Register Two-Factor Authenticator') + = _('Register a one-time password authenticator') %p = _('Use a one-time password authenticator on your mobile device or computer to enable two-factor authentication (2FA).') .col-lg-8 @@ -76,13 +76,15 @@ .col-lg-4 %h4.gl-mt-0 - if webauthn_enabled - = _('Register WebAuthn Device') + = _('Register a WebAuthn device') - else - = _('Register Universal Two-Factor (U2F) Device') + = _('Register a universal two-factor (U2F) device') %p - = _('Set up a hardware device as a second factor to sign in.') + = _('Set up a hardware device to enable two-factor authentication (2FA).') %p - - if webauthn_enabled + - if webauthn_enabled && Feature.enabled?(:webauthn_without_totp) + = _("Not all browsers support WebAuthn. You must save your recovery codes after you first register a two-factor authenticator to be able to sign in, even from an unsupported browser.") + - elsif webauthn_enabled = _("Not all browsers support WebAuthn. Therefore, we require that you set up a two-factor authentication app first. That way you'll always be able to sign in - even from an unsupported browser.") - else = _("Not all browsers support U2F devices. Therefore, we require that you set up a two-factor authentication app first. That way you'll always be able to sign in - even when you're using an unsupported browser.") |