Merge branch '277436-2fa-ux-text-changes' into 'master'

Update 2FA auth setup text

See merge request gitlab-org/gitlab!53677

app/views/profiles/accounts/show.html.haml

@@ -13,7 +13,7 @@
     %button.gl-alert-dismiss.js-close-2fa-enabled-success-alert{ type: 'button', aria: { label: _('Close') } }
       = sprite_icon('close', size: 16)
     .gl-alert-body
-      = _('Congratulations! You have enabled Two-factor Authentication!')
+      = html_escape(_('You have set up 2FA for your account! If you lose access to your 2FA device, you can use your recovery codes to access your account. Alternatively, if you upload an SSH key, you can %{anchorOpen}use that key to generate additional recovery codes%{anchorClose}.')) % { anchorOpen: '<a href="%{href}">'.html_safe % { href: help_page_path('user/profile/account/two_factor_authentication', anchor: 'generate-new-recovery-codes-using-ssh') }, anchorClose: '</a>'.html_safe }
 
 .row.gl-mt-3.js-search-settings-section
   .col-lg-4.profile-settings-sidebar

app/views/profiles/two_factor_auths/show.html.haml

@@ -26,8 +26,7 @@
 
       - else
         %p
-          - help_link_start = '<a href="%{url}" target="_blank">' % { url: help_page_path('user/profile/account/two_factor_authentication') }
-          - register_2fa_token = _('Install a soft token authenticator like %{free_otp_link} or Google Authenticator from your application repository and use that app to scan this QR code. More information is available in the %{help_link_start}documentation%{help_link_end}.') % { free_otp_link:'<a href="https://freeotp.github.io/">FreeOTP</a>', help_link_start:help_link_start, help_link_end:'</a>' }
+          - register_2fa_token = _('We recommend cloud-based mobile authenticator apps such as Authy, Duo Mobile, and LastPass. They can restore access if you lose your hardware device.')
           = register_2fa_token.html_safe
         .row.gl-mb-3
           .col-md-4

changelogs/unreleased/277436-2fa-ux-text-changes.yml

+---
+title: Change UI text for 2FA setup
+merge_request: 53677
+author:
+type: changed

locale/gitlab.pot

@@ -7567,9 +7567,6 @@ msgstr ""
 msgid "ConfluenceService|Your GitLab Wiki can be accessed here: %{wiki_link}. To re-enable your GitLab Wiki, disable this integration"
 msgstr ""
 
-msgid "Congratulations! You have enabled Two-factor Authentication!"
-msgstr ""
-
 msgid "Congratulations, your free trial is activated."
 msgstr ""
 
@@ -15747,9 +15744,6 @@ msgstr ""
 msgid "Install GitLab Runner on Kubernetes"
 msgstr ""
 
-msgid "Install a soft token authenticator like %{free_otp_link} or Google Authenticator from your application repository and use that app to scan this QR code. More information is available in the %{help_link_start}documentation%{help_link_end}."
-msgstr ""
-
 msgid "Install on clusters"
 msgstr ""
 
@@ -32543,6 +32537,9 @@ msgstr ""
 msgid "We heard back from your device. You have been authenticated."
 msgstr ""
 
+msgid "We recommend cloud-based mobile authenticator apps such as Authy, Duo Mobile, and LastPass. They can restore access if you lose your hardware device."
+msgstr ""
+
 msgid "We recommend that you buy more Pipeline minutes to avoid any interruption of service."
 msgstr ""
 
@@ -33457,6 +33454,9 @@ msgstr ""
 msgid "You have reached your project limit"
 msgstr ""
 
+msgid "You have set up 2FA for your account! If you lose access to your 2FA device, you can use your recovery codes to access your account. Alternatively, if you upload an SSH key, you can %{anchorOpen}use that key to generate additional recovery codes%{anchorClose}."
+msgstr ""
+
 msgid "You have successfully purchased a %{plan} plan subscription for %{seats}. You’ll receive a receipt via email."
 msgstr ""
 

spec/features/users/login_spec.rb

@@ -765,7 +765,7 @@ RSpec.describe 'Login' do
           click_link 'Proceed'
 
           expect(current_path).to eq(profile_account_path)
-          expect(page).to have_content('Congratulations! You have enabled Two-factor Authentication!')
+          expect(page).to have_content('You have set up 2FA for your account! If you lose access to your 2FA device, you can use your recovery codes to access your account. Alternatively, if you upload an SSH key, you can use that key to generate additional recovery codes.')
         end
       end