diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-30 18:10:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-30 18:10:02 +0300 |
commit | 4b1fc3dc32e768499d81ed64ea7ed497c1785c48 (patch) | |
tree | f589b638e5f54301f46e3f2882a660e8f23817b3 /app/views/notify | |
parent | 60273ebb302dabd6e724e4b7baf9ed7b39de5c09 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/notify')
-rw-r--r-- | app/views/notify/new_gpg_key_email.html.haml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/app/views/notify/new_gpg_key_email.html.haml b/app/views/notify/new_gpg_key_email.html.haml index b857705e01f..fca0dbd168a 100644 --- a/app/views/notify/new_gpg_key_email.html.haml +++ b/app/views/notify/new_gpg_key_email.html.haml @@ -1,10 +1,9 @@ %p - Hi #{sanitize_name(@user.name)}! + = s_("Notify|Hi %{user}!") % { user: sanitize_name(@user.name) } %p - A new GPG key was added to your account: + = s_("Notify|A new GPG key was added to your account:") %p - Fingerprint: - %code= @gpg_key.fingerprint + = s_("Notify|Fingerprint: %{fingerprint}").html_safe % { fingerprint: content_tag(:code, @gpg_key.fingerprint) } %p - If this key was added in error, you can remove it under - = link_to "GPG Keys", profile_gpg_keys_url + - removal_link = link_to _("GPG Keys"), profile_gpg_keys_url + = s_("Notify|If this key was added in error, you can remove it under %{removal_link}").html_safe % { removal_link: removal_link } |