Merge branch 'deploy-keys-ext' into 'master'

Externalize admin deploy keys strings

See merge request gitlab-org/gitlab-ce!24712

app/views/admin/deploy_keys/edit.html.haml

-- page_title 'Edit Deploy Key'
-%h3.page-title Edit public deploy key
+- page_title _('Edit Deploy Key')
+%h3.page-title= _('Edit public deploy key')
 %hr
 
 %div
   = form_for [:admin, @deploy_key], html: { class: 'deploy-key-form' } do |f|
     = render partial: 'shared/deploy_keys/form', locals: { form: f, deploy_key: @deploy_key }
     .form-actions
-      = f.submit 'Save changes', class: 'btn-success btn'
-      = link_to 'Cancel', admin_deploy_keys_path, class: 'btn btn-cancel'
+      = f.submit _('Save changes'), class: 'btn-success btn'
+      = link_to _('Cancel'), admin_deploy_keys_path, class: 'btn btn-cancel'

app/views/admin/deploy_keys/index.html.haml

-- page_title "Deploy Keys"
+- page_title _('Deploy Keys')
 
 %h3.page-title.deploy-keys-title
-  Public deploy keys (#{@deploy_keys.count})
+  = _('Public deploy keys (%{deploy_keys_count})') % { deploy_keys_count: @deploy_keys.count }
   .float-right
-    = link_to 'New deploy key', new_admin_deploy_key_path, class: 'btn btn-success btn-sm btn-inverted'
+    = link_to _('New deploy key'), new_admin_deploy_key_path, class: 'btn btn-success btn-sm btn-inverted'
 
 - if @deploy_keys.any?
   .table-holder.deploy-keys-list
     %table.table
       %thead
         %tr
-          %th.col-sm-2 Title
-          %th.col-sm-4 Fingerprint
-          %th.col-sm-2 Projects with write access
-          %th.col-sm-2 Added at
+          %th.col-sm-2= _('Title')
+          %th.col-sm-4= _('Fingerprint')
+          %th.col-sm-2= _('Projects with write access')
+          %th.col-sm-2= _('Added at')
           %th.col-sm-2
       %tbody
         - @deploy_keys.each do |deploy_key|
@@ -27,8 +27,8 @@
                 = link_to project.full_name, admin_project_path(project), class: 'label deploy-project-label'
             %td
               %span.cgray
-                added #{time_ago_with_tooltip(deploy_key.created_at)}
+                = _('added %{created_at_timeago}').html_safe % { created_at_timeago: time_ago_with_tooltip(deploy_key.created_at) }
             %td
               .float-right
-                = link_to 'Edit', edit_admin_deploy_key_path(deploy_key), class: 'btn btn-sm'
-                = link_to 'Remove', admin_deploy_key_path(deploy_key), data: { confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-sm btn-remove delete-key'
+                = link_to _('Edit'), edit_admin_deploy_key_path(deploy_key), class: 'btn btn-sm'
+                = link_to _('Remove'), admin_deploy_key_path(deploy_key), data: { confirm: _('Are you sure?') }, method: :delete, class: 'btn btn-sm btn-remove delete-key'

app/views/shared/deploy_keys/_form.html.haml

@@ -13,9 +13,10 @@
     = form.label :key, class: 'col-form-label col-sm-2'
     .col-sm-10
       %p.light
-        Paste a machine public key here. Read more about how to generate it
-        = link_to 'here', help_page_path('ssh/README')
-      = form.text_area :key, class: 'form-control thin-area', rows: 5
+        - link_start = "<a href='#{help_page_path('ssh/README')}' target='_blank' rel='noreferrer noopener'>".html_safe
+        - link_end = '</a>'
+        = _('Paste a machine public key here. Read more about how to generate it %{link_start}here%{link_end}').html_safe % { link_start: link_start, link_end: link_end.html_safe }
+      = form.text_area :key, class: 'form-control thin_area', rows: 5
   - else
     = form.label :fingerprint, class: 'col-form-label col-sm-2'
     .col-sm-10
@@ -28,6 +29,6 @@
       .col-sm-10
         = deploy_keys_project_form.label :can_push do
           = deploy_keys_project_form.check_box :can_push
-          %strong Write access allowed
+          %strong= _('Write access allowed')
         %p.light.append-bottom-0
-          Allow this key to push to repository as well? (Default only allows pull access.)
+          = _('Allow this key to push to repository as well? (Default only allows pull access.)')

changelogs/unreleased/deploy-keys-ext.yml

+---
+title: Externalize admin deploy keys strings
+merge_request:
+author:
+type: other

locale/gitlab.pot

@@ -447,6 +447,9 @@ msgstr ""
 msgid "Add users to group"
 msgstr ""
 
+msgid "Added at"
+msgstr ""
+
 msgid "Adding new applications is disabled in your GitLab instance. Please contact your GitLab administrator to get the permission"
 msgstr ""
 
@@ -612,6 +615,9 @@ msgstr ""
 msgid "Allow requests to the local network from hooks and services."
 msgstr ""
 
+msgid "Allow this key to push to repository as well? (Default only allows pull access.)"
+msgstr ""
+
 msgid "Allow users to request access"
 msgstr ""
 
@@ -2929,6 +2935,9 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
+msgid "Edit Deploy Key"
+msgstr ""
+
 msgid "Edit Label"
 msgstr ""
 
@@ -2965,6 +2974,9 @@ msgstr ""
 msgid "Edit issues"
 msgstr ""
 
+msgid "Edit public deploy key"
+msgstr ""
+
 msgid "Email"
 msgstr ""
 
@@ -3531,6 +3543,9 @@ msgstr ""
 msgid "Find the newly extracted <code>Takeout/Google Code Project Hosting/GoogleCodeProjectHosting.json</code> file."
 msgstr ""
 
+msgid "Fingerprint"
+msgstr ""
+
 msgid "Fingerprints"
 msgstr ""
 
@@ -4997,6 +5012,9 @@ msgstr ""
 msgid "New branch unavailable"
 msgstr ""
 
+msgid "New deploy key"
+msgstr ""
+
 msgid "New directory"
 msgstr ""
 
@@ -5407,6 +5425,9 @@ msgstr ""
 msgid "Past due"
 msgstr ""
 
+msgid "Paste a machine public key here. Read more about how to generate it %{link_start}here%{link_end}"
+msgstr ""
+
 msgid "Paste your public SSH key, which is usually contained in the file '~/.ssh/id_rsa.pub' and begins with 'ssh-rsa'. Don't use your private SSH key."
 msgstr ""
 
@@ -6094,6 +6115,9 @@ msgstr ""
 msgid "Projects that belong to a group are prefixed with the group namespace. Existing projects may be moved into a group."
 msgstr ""
 
+msgid "Projects with write access"
+msgstr ""
+
 msgid "ProjectsDropdown|Frequently visited"
 msgstr ""
 
@@ -6205,6 +6229,9 @@ msgstr ""
 msgid "Public - The project can be accessed without any authentication."
 msgstr ""
 
+msgid "Public deploy keys (%{deploy_keys_count})"
+msgstr ""
+
 msgid "Public pipelines"
 msgstr ""
 
@@ -8663,6 +8690,9 @@ msgstr ""
 msgid "Write a comment or drag your files here…"
 msgstr ""
 
+msgid "Write access allowed"
+msgstr ""
+
 msgid "Write milestone description..."
 msgstr ""
 
@@ -8891,6 +8921,9 @@ msgstr ""
 msgid "a deleted user"
 msgstr ""
 
+msgid "added %{created_at_timeago}"
+msgstr ""
+
 msgid "ago"
 msgstr ""