Merge branch 'email-confirmation-ui-polish' into 'master'

Improve translatability of email confirmation page

See merge request gitlab-org/gitlab!71165

app/views/devise/confirmations/almost_there.haml

 - user_email = "(#{params[:email]})" if params[:email].present?
+- request_link_start = '<a href="%{new_user_confirmation_path}">'.html_safe % { new_user_confirmation_path: new_user_confirmation_path }
+- request_link_end = '</a>'.html_safe
 
 .well-confirmation.gl-text-center.gl-mb-6
   %h1.gl-mt-0
     = _("Almost there...")
-  %p.lead.gl-mb-6
+  %p{ class: 'gl-mb-6 gl-font-lg!' }
     = _('Please check your email %{email} to confirm your account') % { email: user_email }
   %hr
 - if Gitlab::CurrentSettings.after_sign_up_text.present?
   .well-confirmation.gl-text-center
     = markdown_field(Gitlab::CurrentSettings, :after_sign_up_text)
-%p.text-center
-  = _("No confirmation email received? Please check your spam folder or")
-.gl-mb-6.prepend-top-20.gl-text-center
-  %a.gl-link{ href: new_user_confirmation_path }
-    = _("Request new confirmation email")
+%p.gl-text-center
+  = _("No confirmation email received? Check your spam folder or %{request_link_start}request new confirmation email%{request_link_end}.").html_safe % { request_link_start: request_link_start, request_link_end: request_link_end }

locale/gitlab.pot

@@ -22985,7 +22985,7 @@ msgstr ""
 msgid "No compliance frameworks are in use. Create one from the %{link} section in Group Settings."
 msgstr ""
 
-msgid "No confirmation email received? Please check your spam folder or"
+msgid "No confirmation email received? Check your spam folder or %{request_link_start}request new confirmation email%{request_link_end}."
 msgstr ""
 
 msgid "No connection could be made to a Gitaly Server, please check your logs!"
@@ -28886,9 +28886,6 @@ msgstr ""
 msgid "Request details"
 msgstr ""
 
-msgid "Request new confirmation email"
-msgstr ""
-
 msgid "Request parameter %{param} is missing."
 msgstr ""