Merge branch 'Externalize-strings-in-_confirmation_instructions_secondary.html.haml' into 'master'

Externalize strings in _confirmation_instructions_secondary.html.haml

See merge request gitlab-org/gitlab!58216

app/views/devise/mailer/_confirmation_instructions_secondary.html.haml

 #content
-  = email_default_heading("#{sanitize_name(@resource.user.name)}, confirm your email address now!")
-  %p Click the link below to confirm your email address (#{@resource.email})
+  = email_default_heading(_("%{name}, confirm your email address now!") % { name: sanitize_name(@resource.user.name) })
+  %p= _('Click the link below to confirm your email address (%{email})') % { email: @resource.email }
   #cta
-    = link_to 'Confirm your email address', confirmation_url(@resource, confirmation_token: @token)
+    = link_to _('Confirm your email address'), confirmation_url(@resource, confirmation_token: @token)
   %p
-    If this email was added in error, you can remove it here:
-    = link_to "Emails", profile_emails_url
+    = _('If this email was added in error, you can remove it here:')
+    = link_to _("Emails"), profile_emails_url

changelogs/unreleased/Externalize-strings-in-_confirmation_instructions_secondary-html-haml.yml

+---
+title: Externalize strings in _confirmation_instructions_secondary.html.haml
+merge_request: 58216
+author: nuwe1
+type: other

locale/gitlab.pot

@@ -730,6 +730,9 @@ msgstr ""
 msgid "%{name}(%{url}) has run out of Shared Runner Pipeline minutes so no new jobs or pipelines in its projects will run."
 msgstr ""
 
+msgid "%{name}, confirm your email address now!"
+msgstr ""
+
 msgid "%{no_of_days} day"
 msgid_plural "%{no_of_days} days"
 msgstr[0] ""
@@ -6545,6 +6548,9 @@ msgstr ""
 msgid "Click the button below."
 msgstr ""
 
+msgid "Click the link below to confirm your email address (%{email})"
+msgstr ""
+
 msgid "Click the link below to confirm your email address."
 msgstr ""
 
@@ -16136,6 +16142,9 @@ msgstr ""
 msgid "If there is no previous license or if the previous license has expired, some GitLab functionality will be blocked until a new, valid license is uploaded."
 msgstr ""
 
+msgid "If this email was added in error, you can remove it here:"
+msgstr ""
+
 msgid "If this email was added in error, you can remove it here: %{profile_emails_url}"
 msgstr ""