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

Externalize strings in unlock_instructions.text.erb

See merge request gitlab-org/gitlab!58229

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

-Hello, <%= @resource.name %>!
+<%= _('Hello, %{name}!') % { name: @resource.name } %>
 
-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) } %>
 
 <%= unlock_url(@resource, unlock_token: @token) %>

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

+---
+title: Externalize strings in unlock_instructions.text.erb
+merge_request: 58229
+author: nuwe1
+type: other