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

Externalize strings in reset_password_instructions.html.haml

See merge request gitlab-org/gitlab!58224

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

-= email_default_heading("Hello, #{@resource.name}!")
+= email_default_heading(_("Hello, %{name}!") % { name: @resource.name })
 %p
-  Someone, hopefully you, has requested to reset the password for your
-  GitLab account on #{link_to(Gitlab.config.gitlab.url, Gitlab.config.gitlab.url)}.
+  = _('Someone, hopefully you, has requested to reset the password for your GitLab account on %{link_to_gitlab}.').html_safe % { link_to_gitlab: Gitlab.config.gitlab.url }
 %p
-  If you did not perform this request, you can safely ignore this email.
+  = _('If you did not perform this request, you can safely ignore this email.')
 %p
-  Otherwise, click the link below to complete the process.
+  = _('Otherwise, click the link below to complete the process.')
 #cta
-  = link_to('Reset password', edit_password_url(@resource, reset_password_token: @token))
+  = link_to(_('Reset password'), edit_password_url(@resource, reset_password_token: @token))

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

+---
+title: Externalize strings in reset_password_instructions.html.haml
+merge_request: 58224
+author: nuwe1
+type: other

locale/gitlab.pot

@@ -16166,6 +16166,9 @@ msgstr ""
 msgid "If you did not initiate this change, please contact your administrator immediately."
 msgstr ""
 
+msgid "If you did not perform this request, you can safely ignore this email."
+msgstr ""
+
 msgid "If you did not recently sign in, you should immediately %{password_link_start}change your password%{password_link_end}."
 msgstr ""
 
@@ -22472,6 +22475,9 @@ msgstr ""
 msgid "Other visibility settings have been disabled by the administrator."
 msgstr ""
 
+msgid "Otherwise, click the link below to complete the process."
+msgstr ""
+
 msgid "Our documentation includes an example DevOps Score report."
 msgstr ""
 
@@ -29328,6 +29334,9 @@ msgstr ""
 msgid "Someone edited this test case at the same time you did. The description has been updated and you will need to make your changes again."
 msgstr ""
 
+msgid "Someone, hopefully you, has requested to reset the password for your GitLab account on %{link_to_gitlab}."
+msgstr ""
+
 msgid "Something went wrong"
 msgstr ""