Commit a0b43cca authored by Luke Duncalfe's avatar Luke Duncalfe Committed by Andrew Fontaine

Add abuse actions to account lock email text

https://gitlab.com/gitlab-org/gitlab/-/issues/339154

Changelog: changed
parent 18e636ed
#content #content
= email_default_heading(_("Hello, %{name}!") % { name: @resource.name }) = email_default_heading(_("Hello, %{name}!") % { name: @resource.name })
%p %p
= _("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) } = _("Your GitLab account has been locked due to an excessive number of unsuccessful sign in attempts. You can wait for your account to automatically unlock in %{duration} or you can click the link below to unlock now.") % { duration: distance_of_time_in_words(Devise.unlock_in) }
#cta #cta
= link_to(_('Unlock account'), unlock_url(@resource, unlock_token: @token)) = link_to(_('Unlock account'), unlock_url(@resource, unlock_token: @token))
%p
= _('If you did not initiate these sign-in attempts, please reach out to your administrator or enable two-factor authentication (2FA) on your account.')
<%= _('Hello, %{name}!') % { name: @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 %{duration} or you may click the link below to unlock now.") % { duration: distance_of_time_in_words(Devise.unlock_in) } %> <%= _("Your GitLab account has been locked due to an excessive number of unsuccessful sign in attempts. You can wait for your account to automatically unlock in %{duration} or you can click the link below to unlock now.") % { duration: distance_of_time_in_words(Devise.unlock_in) } %>
<%= unlock_url(@resource, unlock_token: @token) %> <%= unlock_url(@resource, unlock_token: @token) %>
<%= _('If you did not initiate these sign-in attempts, please reach out to your administrator or enable two-factor authentication (2FA) on your account.') %>
...@@ -16907,6 +16907,9 @@ msgstr "" ...@@ -16907,6 +16907,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}." 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 "" msgstr ""
msgid "If you did not initiate these sign-in attempts, please reach out to your administrator or enable two-factor authentication (2FA) on your account."
msgstr ""
msgid "If you did not initiate this change, please contact your administrator immediately." msgid "If you did not initiate this change, please contact your administrator immediately."
msgstr "" msgstr ""
...@@ -38738,7 +38741,7 @@ msgstr "" ...@@ -38738,7 +38741,7 @@ msgstr ""
msgid "Your GPG keys (%{count})" msgid "Your GPG keys (%{count})"
msgstr "" 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." msgid "Your GitLab account has been locked due to an excessive number of unsuccessful sign in attempts. You can wait for your account to automatically unlock in %{duration} or you can click the link below to unlock now."
msgstr "" msgstr ""
msgid "Your GitLab account request has been approved!" msgid "Your GitLab account request has been approved!"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment