Commit 13cd5b59 authored by Clement Ho's avatar Clement Ho

Merge branch 'i18n-pgp_ssh_keys-of-user-profile' into 'master'

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

See merge request gitlab-org/gitlab-ce!28653
parents c7e5d046 8d746d14
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
= form_errors(@gpg_key) = form_errors(@gpg_key)
.form-group .form-group
= f.label :key, class: 'label-bold' = 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-----'." = 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 .prepend-top-default
= f.submit 'Add key', class: "btn btn-success" = f.submit s_('Profiles|Add key'), class: "btn btn-success"
...@@ -9,17 +9,19 @@ ...@@ -9,17 +9,19 @@
%code= key.fingerprint %code= key.fingerprint
- if key.subkeys.present? - if key.subkeys.present?
.subkeys .subkeys
%span.bold Subkeys: %span.bold
= _('Subkeys')
= ':'
%ul.subkeys-list %ul.subkeys-list
- key.subkeys.each do |subkey| - key.subkeys.each do |subkey|
%li %li
%code= subkey.fingerprint %code= subkey.fingerprint
.float-right .float-right
%span.key-created-at %span.key-created-at
created #{time_ago_with_tooltip(key.created_at)} = 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 = 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 %span.sr-only= _('Remove')
= icon('trash') = 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 = 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 %span.sr-only= _('Revoke')
Revoke = _('Revoke')
...@@ -6,6 +6,6 @@ ...@@ -6,6 +6,6 @@
- else - else
%p.settings-message.text-center %p.settings-message.text-center
- if is_admin - if is_admin
There are no GPG keys associated with this account. = _('There are no GPG keys associated with this account.')
- else - else
There are no GPG keys with access to your account. = _('There are no GPG keys with access to your account.')
- page_title "GPG Keys" - page_title _('GPG Keys')
- @content_class = "limit-container-width" unless fluid_layout - @content_class = "limit-container-width" unless fluid_layout
.row.prepend-top-default .row.prepend-top-default
...@@ -6,16 +6,16 @@ ...@@ -6,16 +6,16 @@
%h4.prepend-top-0 %h4.prepend-top-0
= page_title = page_title
%p %p
GPG keys allow you to verify signed commits. = _('GPG keys allow you to verify signed commits.')
.col-lg-8 .col-lg-8
%h5.prepend-top-0 %h5.prepend-top-0
Add a GPG key = _('Add a GPG key')
%p.profile-settings-content %p.profile-settings-content
Before you can add a GPG key you need to - 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') }
= link_to 'generate it.', 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' = render 'form'
%hr %hr
%h5 %h5
Your GPG keys (#{@gpg_keys.count}) = _('Your GPG keys (%{count})') % { count:@gpg_keys.count}
.append-bottom-default .append-bottom-default
= render 'key_table' = render 'key_table'
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
= form_errors(@key) = form_errors(@key)
.form-group .form-group
= f.label :key, class: 'label-bold' = f.label :key, s_('Profiles|Key'), class: 'label-bold'
%p= _("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.") %p= _("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.")
= f.text_area :key, class: "form-control js-add-ssh-key-validation-input qa-key-public-key-field", rows: 8, required: true, placeholder: s_('Profiles|Typically starts with "ssh-rsa …"') = f.text_area :key, class: "form-control js-add-ssh-key-validation-input qa-key-public-key-field", rows: 8, required: true, placeholder: s_('Profiles|Typically starts with "ssh-rsa …"')
.form-group .form-group
= f.label :title, class: 'label-bold' = f.label :title, _('Title'), class: 'label-bold'
= f.text_field :title, class: "form-control input-lg qa-key-title-field", required: true, placeholder: s_('Profiles|e.g. My MacBook key') = f.text_field :title, class: "form-control input-lg qa-key-title-field", required: true, placeholder: s_('Profiles|e.g. My MacBook key')
%p.form-text.text-muted= _('Name your individual key via a title') %p.form-text.text-muted= _('Name your individual key via a title')
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
= key.last_used_at ? time_ago_with_tooltip(key.last_used_at) : 'n/a' = key.last_used_at ? time_ago_with_tooltip(key.last_used_at) : 'n/a'
.float-right .float-right
%span.key-created-at %span.key-created-at
created #{time_ago_with_tooltip(key.created_at)} = s_('Profiles|Created %{time_ago}'.html_safe) % { time_ago:time_ago_with_tooltip(key.created_at)}
= link_to path_to_key(key, is_admin), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-transparent prepend-left-10" do = link_to path_to_key(key, is_admin), data: { confirm: _('Are you sure?')}, method: :delete, class: "btn btn-transparent prepend-left-10" do
%span.sr-only Remove %span.sr-only= _('Remove')
= icon('trash') = icon('trash')
...@@ -3,25 +3,25 @@ ...@@ -3,25 +3,25 @@
.col-md-4 .col-md-4
.card .card
.card-header .card-header
SSH Key = _('SSH Key')
%ul.content-list %ul.content-list
%li %li
%span.light Title: %span.light= _('Title:')
%strong= @key.title %strong= @key.title
%li %li
%span.light Created on: %span.light= _('Created on:')
%strong= @key.created_at.to_s(:medium) %strong= @key.created_at.to_s(:medium)
%li %li
%span.light Last used on: %span.light= _('Last used on:')
%strong= @key.last_used_at.try(:to_s, :medium) || 'N/A' %strong= @key.last_used_at.try(:to_s, :medium) || 'N/A'
.col-md-8 .col-md-8
= form_errors(@key, type: 'key') unless @key.valid? = form_errors(@key, type: 'key') unless @key.valid?
%p %p
%span.light Fingerprint: %span.light= _('Fingerprint:')
%code.key-fingerprint= @key.fingerprint %code.key-fingerprint= @key.fingerprint
%pre.well-pre %pre.well-pre
= @key.key = @key.key
.col-md-12 .col-md-12
.float-right .float-right
= link_to 'Remove', path_to_key(@key, is_admin), data: {confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove delete-key qa-delete-key-button" = link_to _('Remove'), path_to_key(@key, is_admin), data: {confirm: _('Are you sure?')}, method: :delete, class: "btn btn-remove delete-key qa-delete-key-button"
...@@ -6,6 +6,6 @@ ...@@ -6,6 +6,6 @@
- else - else
%p.settings-message.text-center %p.settings-message.text-center
- if is_admin - if is_admin
There are no SSH keys associated with this account. = _('There are no SSH keys associated with this account.')
- else - else
There are no SSH keys with access to your account. = _('There are no SSH keys with access to your account.')
- page_title "SSH Keys" - page_title _('SSH Keys')
- @content_class = "limit-container-width" unless fluid_layout - @content_class = "limit-container-width" unless fluid_layout
.row.prepend-top-default .row.prepend-top-default
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
%h4.prepend-top-0 %h4.prepend-top-0
= page_title = page_title
%p %p
SSH keys allow you to establish a secure connection between your computer and GitLab. = _('SSH keys allow you to establish a secure connection between your computer and GitLab.')
.col-lg-8 .col-lg-8
%h5.prepend-top-0 %h5.prepend-top-0
Add an SSH key = _('Add an SSH key')
%p.profile-settings-content %p.profile-settings-content
- generate_link_url = help_page_path("ssh/README", anchor: 'generating-a-new-ssh-key-pair') - generate_link_url = help_page_path("ssh/README", anchor: 'generating-a-new-ssh-key-pair')
- existing_link_url = help_page_path("ssh/README", anchor: 'locating-an-existing-ssh-key-pair') - existing_link_url = help_page_path("ssh/README", anchor: 'locating-an-existing-ssh-key-pair')
...@@ -19,6 +19,6 @@ ...@@ -19,6 +19,6 @@
= render 'form' = render 'form'
%hr %hr
%h5 %h5
Your SSH keys (#{@keys.count}) = _('Your SSH keys (%{count})') % { count:@keys.count }
.append-bottom-default .append-bottom-default
= render 'key_table' = render 'key_table'
- add_to_breadcrumbs "SSH Keys", profile_keys_path - add_to_breadcrumbs "SSH Keys", profile_keys_path
- breadcrumb_title @key.title - breadcrumb_title @key.title
- page_title @key.title, "SSH Keys" - page_title @key.title, _('SSH Keys')
- @content_class = "limit-container-width" unless fluid_layout - @content_class = "limit-container-width" unless fluid_layout
= render "key_details" = render "key_details"
---
title: Externalize strings of PGP Keys and SSH Keys page in user profile
merge_request: 28653
author: Antony Liu
type: other
...@@ -517,6 +517,9 @@ msgstr "" ...@@ -517,6 +517,9 @@ msgstr ""
msgid "Add README" msgid "Add README"
msgstr "" msgstr ""
msgid "Add a GPG key"
msgstr ""
msgid "Add a bullet list" msgid "Add a bullet list"
msgstr "" msgstr ""
...@@ -541,6 +544,9 @@ msgstr "" ...@@ -541,6 +544,9 @@ msgstr ""
msgid "Add a todo" msgid "Add a todo"
msgstr "" msgstr ""
msgid "Add an SSH key"
msgstr ""
msgid "Add bold text" msgid "Add bold text"
msgstr "" msgstr ""
...@@ -1138,6 +1144,12 @@ msgstr "" ...@@ -1138,6 +1144,12 @@ msgstr ""
msgid "Are you sure?" msgid "Are you sure?"
msgstr "" msgstr ""
msgid "Are you sure? All commits that were signed with this GPG key will be unverified."
msgstr ""
msgid "Are you sure? Removing this GPG key does not affect already signed commits."
msgstr ""
msgid "Artifacts" msgid "Artifacts"
msgstr "" msgstr ""
...@@ -3559,6 +3571,9 @@ msgstr "" ...@@ -3559,6 +3571,9 @@ msgstr ""
msgid "Domain verification is an essential security measure for public GitLab sites. Users are required to demonstrate they control a domain before it is enabled" msgid "Domain verification is an essential security measure for public GitLab sites. Users are required to demonstrate they control a domain before it is enabled"
msgstr "" msgstr ""
msgid "Don't paste the private part of the GPG key. Paste the public part which begins with '-----BEGIN PGP PUBLIC KEY BLOCK-----'."
msgstr ""
msgid "Don't show again" msgid "Don't show again"
msgstr "" msgstr ""
...@@ -4440,6 +4455,9 @@ msgstr "" ...@@ -4440,6 +4455,9 @@ msgstr ""
msgid "Fingerprint" msgid "Fingerprint"
msgstr "" msgstr ""
msgid "Fingerprint:"
msgstr ""
msgid "Fingerprints" msgid "Fingerprints"
msgstr "" msgstr ""
...@@ -4572,6 +4590,9 @@ msgstr "" ...@@ -4572,6 +4590,9 @@ msgstr ""
msgid "GPG Keys" msgid "GPG Keys"
msgstr "" msgstr ""
msgid "GPG keys allow you to verify signed commits."
msgstr ""
msgid "GPG signature (loading...)" msgid "GPG signature (loading...)"
msgstr "" msgstr ""
...@@ -5668,6 +5689,9 @@ msgstr "" ...@@ -5668,6 +5689,9 @@ msgstr ""
msgid "Last used" msgid "Last used"
msgstr "" msgstr ""
msgid "Last used on:"
msgstr ""
msgid "LastPushEvent|You pushed to" msgid "LastPushEvent|You pushed to"
msgstr "" msgstr ""
...@@ -7384,6 +7408,9 @@ msgstr "" ...@@ -7384,6 +7408,9 @@ msgstr ""
msgid "Profiles|Invalid username" msgid "Profiles|Invalid username"
msgstr "" msgstr ""
msgid "Profiles|Key"
msgstr ""
msgid "Profiles|Learn more" msgid "Profiles|Learn more"
msgstr "" msgstr ""
...@@ -8465,6 +8492,9 @@ msgstr "" ...@@ -8465,6 +8492,9 @@ msgstr ""
msgid "Runs a number of housekeeping tasks within the current repository, such as compressing file revisions and removing unreachable objects." msgid "Runs a number of housekeeping tasks within the current repository, such as compressing file revisions and removing unreachable objects."
msgstr "" msgstr ""
msgid "SSH Key"
msgstr ""
msgid "SSH Keys" msgid "SSH Keys"
msgstr "" msgstr ""
...@@ -8474,6 +8504,9 @@ msgstr "" ...@@ -8474,6 +8504,9 @@ msgstr ""
msgid "SSH host keys" msgid "SSH host keys"
msgstr "" msgstr ""
msgid "SSH keys allow you to establish a secure connection between your computer and GitLab."
msgstr ""
msgid "SSH public key" msgid "SSH public key"
msgstr "" msgstr ""
...@@ -9358,6 +9391,9 @@ msgstr "" ...@@ -9358,6 +9391,9 @@ msgstr ""
msgid "Subgroups and projects" msgid "Subgroups and projects"
msgstr "" msgstr ""
msgid "Subkeys"
msgstr ""
msgid "Submit as spam" msgid "Submit as spam"
msgstr "" msgstr ""
...@@ -9906,6 +9942,18 @@ msgstr "" ...@@ -9906,6 +9942,18 @@ msgstr ""
msgid "The value lying at the midpoint of a series of observed values. E.g., between 3, 5, 9, the median is 5. Between 3, 5, 7, 8, the median is (5+7)/2 = 6." msgid "The value lying at the midpoint of a series of observed values. E.g., between 3, 5, 9, the median is 5. Between 3, 5, 7, 8, the median is (5+7)/2 = 6."
msgstr "" msgstr ""
msgid "There are no GPG keys associated with this account."
msgstr ""
msgid "There are no GPG keys with access to your account."
msgstr ""
msgid "There are no SSH keys associated with this account."
msgstr ""
msgid "There are no SSH keys with access to your account."
msgstr ""
msgid "There are no archived projects yet" msgid "There are no archived projects yet"
msgstr "" msgstr ""
...@@ -10405,6 +10453,9 @@ msgstr "" ...@@ -10405,6 +10453,9 @@ msgstr ""
msgid "Title" msgid "Title"
msgstr "" msgstr ""
msgid "Title:"
msgstr ""
msgid "Titles and Filenames" msgid "Titles and Filenames"
msgstr "" msgstr ""
...@@ -11619,6 +11670,9 @@ msgstr "" ...@@ -11619,6 +11670,9 @@ msgstr ""
msgid "Your Conversational Development Index gives an overview of how you are using GitLab from a feature perspective. View how you compare with other organizations, discover features you are not using, and learn best practices through blog posts and white papers." msgid "Your Conversational Development Index gives an overview of how you are using GitLab from a feature perspective. View how you compare with other organizations, discover features you are not using, and learn best practices through blog posts and white papers."
msgstr "" msgstr ""
msgid "Your GPG keys (%{count})"
msgstr ""
msgid "Your Groups" msgid "Your Groups"
msgstr "" msgstr ""
...@@ -11631,6 +11685,9 @@ msgstr "" ...@@ -11631,6 +11685,9 @@ msgstr ""
msgid "Your Projects' Activity" msgid "Your Projects' Activity"
msgstr "" msgstr ""
msgid "Your SSH keys (%{count})"
msgstr ""
msgid "Your Todos" msgid "Your Todos"
msgstr "" msgstr ""
......
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