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

Externalize strings in unlock_instructions.html.haml

See merge request gitlab-org/gitlab!58227

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

 #content
-  = email_default_heading("Hello, #{@resource.name}!")
+  = email_default_heading(_("Hello, %{name}!") % { name: @resource.name })
   %p
-    Your GitLab account has been locked due to an excessive amount of unsuccessful
-    sign in attempts. Your account will automatically unlock in #{distance_of_time_in_words(Devise.unlock_in)}
-    or you may click the link below to unlock now.
+    = _("Your GitLab account has been locked due to an excessive amount of unsuccessful sign in attempts. Your account will automatically unlock in %{duration} or you may click the link below to unlock now.") % { duration: distance_of_time_in_words(Devise.unlock_in) }
   #cta
-    = link_to('Unlock account', unlock_url(@resource, unlock_token: @token))
+    = link_to(_('Unlock account'), unlock_url(@resource, unlock_token: @token))

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

+---
+title: Externalize strings in unlock_instructions.html.haml
+merge_request: 58227
+author: nuwe1
+type: other

locale/gitlab.pot

@@ -15817,6 +15817,9 @@ msgstr ""
 msgid "Hello there"
 msgstr ""
 
+msgid "Hello, %{name}!"
+msgstr ""
+
 msgid "Hello, %{username}!"
 msgstr ""
 
@@ -33483,6 +33486,9 @@ msgstr ""
 msgid "Unlock"
 msgstr ""
 
+msgid "Unlock account"
+msgstr ""
+
 msgid "Unlock the discussion"
 msgstr ""
 
@@ -36189,6 +36195,9 @@ msgstr ""
 msgid "Your GitLab Ultimate trial will last 30 days after which point you can keep your free GitLab account forever. We just need some additional information to activate your trial."
 msgstr ""
 
+msgid "Your GitLab account has been locked due to an excessive amount of unsuccessful sign in attempts. Your account will automatically unlock in %{duration} or you may click the link below to unlock now."
+msgstr ""
+
 msgid "Your GitLab account request has been approved!"
 msgstr ""