Merge branch 'Externalise-strings-in_confirmation_instructions_account.html.haml' into 'master'

Externalize strings in _confirmation_instructions_account.html.haml

See merge request gitlab-org/gitlab!58214

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

@@ -2,15 +2,15 @@
 - if @resource.unconfirmed_email.present? || !@resource.created_recently?
   #content
     = email_default_heading(@resource.unconfirmed_email || @resource.email)
-    %p Click the link below to confirm your email address.
+    %p= _('Click the link below to confirm your email address.')
     #cta
-      = link_to 'Confirm your email address', confirmation_link
+      = link_to _('Confirm your email address'), confirmation_link
 - else
   #content
     - if Gitlab.com?
-      = email_default_heading('Thanks for signing up to GitLab!')
+      = email_default_heading(_('Thanks for signing up to GitLab!'))
     - else
-      = email_default_heading("Welcome, #{@resource.name}!")
-    %p To get started, click the link below to confirm your account.
+      = email_default_heading(_("Welcome, %{name}!") % { name: @resource.name })
+    %p= _("To get started, click the link below to confirm your account.")
     #cta
-      = link_to 'Confirm your account', confirmation_link
+      = link_to _('Confirm your account'), confirmation_link

changelogs/unreleased/Externalise-strings-in_confirmation_instructions_account-html-haml.yml

+---
+title: Externalize strings in _confirmation_instructions_account.html.haml
+merge_request: 58214
+author: nuwe1
+type: other

locale/gitlab.pot

@@ -6378,6 +6378,9 @@ msgstr ""
 msgid "Click the button below."
 msgstr ""
 
+msgid "Click the link below to confirm your email address."
+msgstr ""
+
 msgid "Click to expand it."
 msgstr ""
 
@@ -8153,6 +8156,12 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
+msgid "Confirm your account"
+msgstr ""
+
+msgid "Confirm your email address"
+msgstr ""
+
 msgid "Confirmation email sent to %{email}"
 msgstr ""
 
@@ -30618,6 +30627,9 @@ msgstr ""
 msgid "Thank you for your support request! We are tracking your request as ticket #%{issue_iid}, and will respond as soon as we can."
 msgstr ""
 
+msgid "Thanks for signing up to GitLab!"
+msgstr ""
+
 msgid "Thanks for your purchase!"
 msgstr ""
 
@@ -34907,6 +34919,9 @@ msgstr ""
 msgid "Welcome to the guided GitLab tour"
 msgstr ""
 
+msgid "Welcome, %{name}!"
+msgstr ""
+
 msgid "What are you searching for?"
 msgstr ""