Merge branch 'Externalize-strings-in-_confirmation_instructions_secondary.text.erb' into 'master'

Externalize strings in _confirmation_instructions_secondary.text.erb

See merge request gitlab-org/gitlab!58218

app/views/devise/mailer/_confirmation_instructions_secondary.text.erb

-<%= @resource.user.name %>, confirm your email address now!
+<%= _(" %{name},  confirm your email address now! ") % { name: @resource.user.name } %>
 
-Use the link below to confirm your email address (<%= @resource.email %>)
+<%= _("Use the link below to confirm your email address (%{email})") % { email: @resource.email } %>
 
 <%= confirmation_url(@resource, confirmation_token: @token) %>
 
-If this email was added in error, you can remove it here: <%= profile_emails_url %>
+<%= _("If this email was added in error, you can remove it here: %{profile_emails_url}") % { profile_emails_url: profile_emails_url } %>

changelogs/unreleased/Externalize-strings-in-_confirmation_instructions_secondary-text-erb.yml

+---
+title: Externalize strings in _confirmation_instructions_secondary.text.erb
+merge_request: 58218
+author: nuwe1
+type: other

locale/gitlab.pot

@@ -16,6 +16,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+msgid " %{name},  confirm your email address now! "
+msgstr ""
+
 msgid " %{project_name}#%{issuable_iid} · created %{issuable_created} by %{author} · updated %{issuable_updated}"
 msgstr ""
 
@@ -16109,6 +16112,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: %{profile_emails_url}"
+msgstr ""
+
 msgid "If this was a mistake you can %{leave_link_start}leave the %{source_type}%{link_end}."
 msgstr ""
 
@@ -34023,6 +34029,9 @@ msgstr ""
 msgid "Use template"
 msgstr ""
 
+msgid "Use the link below to confirm your email address (%{email})"
+msgstr ""
+
 msgid "Use the search bar on the top of this page"
 msgstr ""