Externalize strings of PGP Keys and SSH Keys page in user profile

4 files changed, 20 insertions, 18 deletions

diff --git a/app/views/profiles/gpg_keys/_form.html.haml b/app/views/profiles/gpg_keys/_form.html.haml
index 6c4cb614a2b..225487b2638 100644
--- a/app/views/profiles/gpg_keys/_form.html.haml
+++ b/app/views/profiles/gpg_keys/_form.html.haml
@@ -3,8 +3,8 @@
     = form_errors(@gpg_key)
 
     .form-group
-      = f.label :key, class: 'label-bold'
-      = f.text_area :key, class: "form-control", rows: 8, required: true, placeholder: "Don't paste the private part of the GPG key. Paste the public part which begins with '-----BEGIN PGP PUBLIC KEY BLOCK-----'."
+      = f.label :key, s_('Profiles|Key'), class: 'label-bold'
+      = f.text_area :key, class: "form-control", rows: 8, required: true, placeholder: _("Don't paste the private part of the GPG key. Paste the public part which begins with '-----BEGIN PGP PUBLIC KEY BLOCK-----'.")
 
     .prepend-top-default
-      = f.submit 'Add key', class: "btn btn-success"
+      = f.submit s_('Profiles|Add key'), class: "btn btn-success"
diff --git a/app/views/profiles/gpg_keys/_key.html.haml b/app/views/profiles/gpg_keys/_key.html.haml
index d1fd7bc8e71..f8351644df5 100644
--- a/app/views/profiles/gpg_keys/_key.html.haml
+++ b/app/views/profiles/gpg_keys/_key.html.haml
@@ -9,17 +9,19 @@
       %code= key.fingerprint
     - if key.subkeys.present?
       .subkeys
-        %span.bold Subkeys:
+        %span.bold
+          = _('Subkeys')
+          = ':'
         %ul.subkeys-list
           - key.subkeys.each do |subkey|
             %li
               %code= subkey.fingerprint
   .float-right
     %span.key-created-at
-      created #{time_ago_with_tooltip(key.created_at)}
-    = link_to profile_gpg_key_path(key), data: { confirm: 'Are you sure? Removing this GPG key does not affect already signed commits.' }, method: :delete, class: "btn btn-danger prepend-left-10" do
-      %span.sr-only Remove
+      = s_('Profiles|Created %{time_ago}'.html_safe) % { time_ago:time_ago_with_tooltip(key.created_at)}
+    = link_to profile_gpg_key_path(key), data: { confirm: _('Are you sure? Removing this GPG key does not affect already signed commits.') }, method: :delete, class: "btn btn-danger prepend-left-10" do
+      %span.sr-only= _('Remove')
       = icon('trash')
-    = link_to revoke_profile_gpg_key_path(key), data: { confirm: 'Are you sure? All commits that were signed with this GPG key will be unverified.' }, method: :put, class: "btn btn-danger prepend-left-10" do
-      %span.sr-only Revoke
-      Revoke
+    = link_to revoke_profile_gpg_key_path(key), data: { confirm: _('Are you sure? All commits that were signed with this GPG key will be unverified.') }, method: :put, class: "btn btn-danger prepend-left-10" do
+      %span.sr-only= _('Revoke')
+      = _('Revoke')
diff --git a/app/views/profiles/gpg_keys/_key_table.html.haml b/app/views/profiles/gpg_keys/_key_table.html.haml
index b9b60c218fd..ebbd1c8f672 100644
--- a/app/views/profiles/gpg_keys/_key_table.html.haml
+++ b/app/views/profiles/gpg_keys/_key_table.html.haml
@@ -6,6 +6,6 @@
 - else
   %p.settings-message.text-center
     - if is_admin
-      There are no GPG keys associated with this account.
+      = _('There are no GPG keys associated with this account.')
     - else
-      There are no GPG keys with access to your account.
+      = _('There are no GPG keys with access to your account.')
diff --git a/app/views/profiles/gpg_keys/index.html.haml b/app/views/profiles/gpg_keys/index.html.haml
index 1d2e41cb437..f9f898a9225 100644
--- a/app/views/profiles/gpg_keys/index.html.haml
+++ b/app/views/profiles/gpg_keys/index.html.haml
@@ -1,4 +1,4 @@
-- page_title "GPG Keys"
+- page_title _('GPG Keys')
 - @content_class = "limit-container-width" unless fluid_layout
 
 .row.prepend-top-default
@@ -6,16 +6,16 @@
     %h4.prepend-top-0
       = page_title
     %p
-      GPG keys allow you to verify signed commits.
+      = _('GPG keys allow you to verify signed commits.')
   .col-lg-8
     %h5.prepend-top-0
-      Add a GPG key
+      = _('Add a GPG key')
     %p.profile-settings-content
-      Before you can add a GPG key you need to
-      = link_to 'generate it.', help_page_path('user/project/repository/gpg_signed_commits/index.md')
+      - help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/project/repository/gpg_signed_commits/index.md') }
+      = _('Before you can add a GPG key you need to %{help_link_start}Generate it.%{help_link_end}'.html_safe) % {help_link_start: help_link_start, help_link_end:'</a>'.html_safe }
     = render 'form'
     %hr
     %h5
-      Your GPG keys (#{@gpg_keys.count})
+      = _('Your GPG keys (%{count})') % { count:@gpg_keys.count}
     .append-bottom-default
       = render 'key_table'