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

Externalize strings in reset_password_instructions.text.erb

See merge request gitlab-org/gitlab!58226

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

-Hello, <%= @resource.name %>!
+<%= _("Hello, %{name}!") % { name: @resource.name } %>
 
-Someone, hopefully you, has requested to reset the password for your GitLab
-account on <%= Gitlab.config.gitlab.url %>
+<%= _("Someone, hopefully you, has requested to reset the password for your GitLab account on %{link_to_gitlab}.") % { link_to_gitlab: Gitlab.config.gitlab.url } %>
 
-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.") %>
 
-Otherwise, click the link below to complete the process:
+<%= _("Otherwise, click the link below to complete the process:") %>
 
 <%= edit_password_url(@resource, reset_password_token: @token) %>

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

+---
+title: Externalise strings in reset_password_instructions.text.erb
+merge_request: 58226
+author: nuwe1
+type: other

locale/gitlab.pot

@@ -22571,6 +22571,9 @@ msgstr ""
 msgid "Otherwise, click the link below to complete the process."
 msgstr ""
 
+msgid "Otherwise, click the link below to complete the process:"
+msgstr ""
+
 msgid "Our documentation includes an example DevOps Score report."
 msgstr ""