Commit da09c17f authored by Dan Jensen's avatar Dan Jensen Committed by Olena Horal-Koretska

Improve SSH key expiration warning emails

parent 296c947e
%p %p
= _('Hi %{username}!') % { username: sanitize_name(@user.name) } = _('Hi %{username}!') % { username: sanitize_name(@user.name) }
%p %p
= _('Your SSH keys with the following fingerprints has expired:') = _('Your SSH keys with the following fingerprints have expired. Expired SSH keys will not be usable in future versions of GitLab:')
%table %table
%tbody %tbody
- @fingerprints.each do |fingerprint| - @fingerprints.each do |fingerprint|
......
<%= _('Hi %{username}!') % { username: sanitize_name(@user.name) } %> <%= _('Hi %{username}!') % { username: sanitize_name(@user.name) } %>
<%= _('Your SSH keys with the following fingerprints has expired:') %> <%= _('Your SSH keys with the following fingerprints have expired. Expired SSH keys will not be usable in future versions of GitLab:') %>
<% @fingerprints.each do |fingerprint| %> <% @fingerprints.each do |fingerprint| %>
- <%= fingerprint %> - <%= fingerprint %>
......
<%= _('Hi %{username}!') % { username: sanitize_name(@user.name) } %> <%= _('Hi %{username}!') % { username: sanitize_name(@user.name) } %>
<%= _('Your SSH keys with the following fingerprints are scheduled to expire soon:') %> <%= _('Your SSH keys with the following fingerprints are scheduled to expire soon. Expired SSH keys will not be usable in future versions of GitLab:') %>
<% @fingerprints.each do |fingerprint| %> <% @fingerprints.each do |fingerprint| %>
- <%= fingerprint %> - <%= fingerprint %>
......
%p %p
= _('Hi %{username}!') % { username: sanitize_name(@user.name) } = _('Hi %{username}!') % { username: sanitize_name(@user.name) }
%p %p
= _('Your SSH keys with the following fingerprints are scheduled to expire soon:') = _('Your SSH keys with the following fingerprints are scheduled to expire soon. Expired SSH keys will not be usable in future versions of GitLab:')
%table %table
%tbody %tbody
- @fingerprints.each do |fingerprint| - @fingerprints.each do |fingerprint|
......
...@@ -37741,10 +37741,10 @@ msgstr "" ...@@ -37741,10 +37741,10 @@ msgstr ""
msgid "Your SSH keys (%{count})" msgid "Your SSH keys (%{count})"
msgstr "" msgstr ""
msgid "Your SSH keys with the following fingerprints are scheduled to expire soon:" msgid "Your SSH keys with the following fingerprints are scheduled to expire soon. Expired SSH keys will not be usable in future versions of GitLab:"
msgstr "" msgstr ""
msgid "Your SSH keys with the following fingerprints has expired:" msgid "Your SSH keys with the following fingerprints have expired. Expired SSH keys will not be usable in future versions of GitLab:"
msgstr "" msgstr ""
msgid "Your To-Do List" msgid "Your To-Do List"
......
...@@ -264,7 +264,7 @@ RSpec.describe Emails::Profile do ...@@ -264,7 +264,7 @@ RSpec.describe Emails::Profile do
include_examples 'valid use case' include_examples 'valid use case'
it_behaves_like 'has the correct subject', /Your SSH key has expired/ it_behaves_like 'has the correct subject', /Your SSH key has expired/
it_behaves_like 'has the correct body text', /Your SSH keys with the following fingerprints has expired/ it_behaves_like 'has the correct body text', /Your SSH keys with the following fingerprints have expired/
end end
context 'when invalid' do context 'when invalid' do
......
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