Merge branch 'Externalize-stings-in-password_change.html.haml' into 'master'

Externalize strings in password_change.html.haml

See merge request gitlab-org/gitlab!58219

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

-= email_default_heading("Hello, #{@resource.name}!")
+= email_default_heading(_("Hello, %{name}!") % { name: @resource.name })
 %p
-  The password for your GitLab account on
-  #{link_to(Gitlab.config.gitlab.url, Gitlab.config.gitlab.url)}
-  has successfully been changed.
+  = _('The password for your GitLab account on %{link_to_gitlab} has successfully been changed.').html_safe % { link_to_gitlab: link_to(Gitlab.config.gitlab.url, Gitlab.config.gitlab.url) }
 %p
-  If you did not initiate this change, please contact your administrator
-  immediately.
+  = _('If you did not initiate this change, please contact your administrator immediately.')

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

-Hello, <%= @resource.name %>!
+<%= _('Hello, %{name}!') % { name: @resource.name } %>
 
-The password for your GitLab account on <%= Gitlab.config.gitlab.url %>
-has successfully been changed.
+<%= _('The password for your GitLab account on %{gitlab_url} has successfully been changed.') % { gitlab_url: Gitlab.config.gitlab.url } %>
 
-If you did not initiate this change, please contact your administrator
-immediately.
+<%= _('If you did not initiate this change, please contact your administrator immediately.') %>

changelogs/unreleased/Externalize-stings-in-password_change-html-haml.yml

+---
+title: Externalise strings in password_change files
+merge_request: 58219
+author: nuwe1
+type: other

locale/gitlab.pot

@@ -16130,6 +16130,9 @@ msgstr ""
 msgid "If you add %{codeStart}needs%{codeEnd} to jobs in your pipeline you'll be able to view the %{codeStart}needs%{codeEnd} relationships between jobs in this tab as a %{linkStart}Directed Acyclic Graph (DAG)%{linkEnd}."
 msgstr ""
 
+msgid "If you did not initiate this change, please contact your administrator immediately."
+msgstr ""
+
 msgid "If you did not recently sign in, you should immediately %{password_link_start}change your password%{password_link_end}."
 msgstr ""
 
@@ -31272,6 +31275,12 @@ msgstr ""
 msgid "The password for the Jenkins server."
 msgstr ""
 
+msgid "The password for your GitLab account on %{gitlab_url} has successfully been changed."
+msgstr ""
+
+msgid "The password for your GitLab account on %{link_to_gitlab} has successfully been changed."
+msgstr ""
+
 msgid "The phase of the development lifecycle."
 msgstr ""