Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
68016729
Commit
68016729
authored
Jan 28, 2019
by
Luke Bennett
Committed by
Luke Bennett
Mar 08, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Externalize admin deploy keys strings
Externalizes most strings in the deploy key settings of the admin area.
parent
93689357
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
58 additions
and
19 deletions
+58
-19
app/views/admin/deploy_keys/edit.html.haml
app/views/admin/deploy_keys/edit.html.haml
+4
-4
app/views/admin/deploy_keys/index.html.haml
app/views/admin/deploy_keys/index.html.haml
+10
-10
app/views/shared/deploy_keys/_form.html.haml
app/views/shared/deploy_keys/_form.html.haml
+6
-5
changelogs/unreleased/deploy-keys-ext.yml
changelogs/unreleased/deploy-keys-ext.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+33
-0
No files found.
app/views/admin/deploy_keys/edit.html.haml
View file @
68016729
-
page_title
'Edit Deploy Key'
-
page_title
_
(
'Edit Deploy Key'
)
%h3
.page-title
Edit public deploy key
%h3
.page-title
=
_
(
'Edit public deploy key'
)
%hr
%hr
%div
%div
=
form_for
[
:admin
,
@deploy_key
],
html:
{
class:
'deploy-key-form'
}
do
|
f
|
=
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
}
=
render
partial:
'shared/deploy_keys/form'
,
locals:
{
form:
f
,
deploy_key:
@deploy_key
}
.form-actions
.form-actions
=
f
.
submit
'Save changes'
,
class:
'btn-success btn'
=
f
.
submit
_
(
'Save changes'
)
,
class:
'btn-success btn'
=
link_to
'Cancel'
,
admin_deploy_keys_path
,
class:
'btn btn-cancel'
=
link_to
_
(
'Cancel'
)
,
admin_deploy_keys_path
,
class:
'btn btn-cancel'
app/views/admin/deploy_keys/index.html.haml
View file @
68016729
-
page_title
"Deploy Keys"
-
page_title
_
(
'Deploy Keys'
)
%h3
.page-title.deploy-keys-title
%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
.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?
-
if
@deploy_keys
.
any?
.table-holder.deploy-keys-list
.table-holder.deploy-keys-list
%table
.table
%table
.table
%thead
%thead
%tr
%tr
%th
.col-sm-2
Title
%th
.col-sm-2
=
_
(
'Title'
)
%th
.col-sm-4
Fingerprint
%th
.col-sm-4
=
_
(
'Fingerprint'
)
%th
.col-sm-2
Projects with write access
%th
.col-sm-2
=
_
(
'Projects with write access'
)
%th
.col-sm-2
Added at
%th
.col-sm-2
=
_
(
'Added at'
)
%th
.col-sm-2
%th
.col-sm-2
%tbody
%tbody
-
@deploy_keys
.
each
do
|
deploy_key
|
-
@deploy_keys
.
each
do
|
deploy_key
|
...
@@ -27,8 +27,8 @@
...
@@ -27,8 +27,8 @@
=
link_to
project
.
full_name
,
admin_project_path
(
project
),
class:
'label deploy-project-label'
=
link_to
project
.
full_name
,
admin_project_path
(
project
),
class:
'label deploy-project-label'
%td
%td
%span
.cgray
%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
%td
.float-right
.float-right
=
link_to
'Edit'
,
edit_admin_deploy_key_path
(
deploy_key
),
class:
'btn btn-sm'
=
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
_
(
'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
View file @
68016729
...
@@ -13,9 +13,10 @@
...
@@ -13,9 +13,10 @@
=
form
.
label
:key
,
class:
'col-form-label col-sm-2'
=
form
.
label
:key
,
class:
'col-form-label col-sm-2'
.col-sm-10
.col-sm-10
%p
.light
%p
.light
Paste a machine public key here. Read more about how to generate it
-
link_start
=
"<a href='
#{
help_page_path
(
'ssh/README'
)
}
' target='_blank' rel='noreferrer noopener'>"
.
html_safe
=
link_to
'here'
,
help_page_path
(
'ssh/README'
)
-
link_end
=
'</a>'
=
form
.
text_area
:key
,
class:
'form-control thin-area'
,
rows:
5
=
_
(
'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
-
else
=
form
.
label
:fingerprint
,
class:
'col-form-label col-sm-2'
=
form
.
label
:fingerprint
,
class:
'col-form-label col-sm-2'
.col-sm-10
.col-sm-10
...
@@ -28,6 +29,6 @@
...
@@ -28,6 +29,6 @@
.col-sm-10
.col-sm-10
=
deploy_keys_project_form
.
label
:can_push
do
=
deploy_keys_project_form
.
label
:can_push
do
=
deploy_keys_project_form
.
check_box
:can_push
=
deploy_keys_project_form
.
check_box
:can_push
%strong
Write access allowed
%strong
=
_
(
'Write access allowed'
)
%p
.light.append-bottom-0
%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
0 → 100644
View file @
68016729
---
title
:
Externalize admin deploy keys strings
merge_request
:
author
:
type
:
other
locale/gitlab.pot
View file @
68016729
...
@@ -578,6 +578,9 @@ msgstr ""
...
@@ -578,6 +578,9 @@ msgstr ""
msgid "Add users to group"
msgid "Add users to group"
msgstr ""
msgstr ""
msgid "Added at"
msgstr ""
msgid "Adding new applications is disabled in your GitLab instance. Please contact your GitLab administrator to get the permission"
msgid "Adding new applications is disabled in your GitLab instance. Please contact your GitLab administrator to get the permission"
msgstr ""
msgstr ""
...
@@ -763,6 +766,9 @@ msgstr ""
...
@@ -763,6 +766,9 @@ msgstr ""
msgid "Allow requests to the local network from hooks and services."
msgid "Allow requests to the local network from hooks and services."
msgstr ""
msgstr ""
msgid "Allow this key to push to repository as well? (Default only allows pull access.)"
msgstr ""
msgid "Allow users to request access"
msgid "Allow users to request access"
msgstr ""
msgstr ""
...
@@ -3562,6 +3568,9 @@ msgstr ""
...
@@ -3562,6 +3568,9 @@ msgstr ""
msgid "Edit %{name}"
msgid "Edit %{name}"
msgstr ""
msgstr ""
msgid "Edit Deploy Key"
msgstr ""
msgid "Edit Label"
msgid "Edit Label"
msgstr ""
msgstr ""
...
@@ -3598,6 +3607,9 @@ msgstr ""
...
@@ -3598,6 +3607,9 @@ msgstr ""
msgid "Edit issues"
msgid "Edit issues"
msgstr ""
msgstr ""
msgid "Edit public deploy key"
msgstr ""
msgid "Elasticsearch"
msgid "Elasticsearch"
msgstr ""
msgstr ""
...
@@ -4389,6 +4401,9 @@ msgstr ""
...
@@ -4389,6 +4401,9 @@ msgstr ""
msgid "Find the newly extracted <code>Takeout/Google Code Project Hosting/GoogleCodeProjectHosting.json</code> file."
msgid "Find the newly extracted <code>Takeout/Google Code Project Hosting/GoogleCodeProjectHosting.json</code> file."
msgstr ""
msgstr ""
msgid "Fingerprint"
msgstr ""
msgid "Fingerprints"
msgid "Fingerprints"
msgstr ""
msgstr ""
...
@@ -6607,6 +6622,9 @@ msgstr ""
...
@@ -6607,6 +6622,9 @@ msgstr ""
msgid "New branch unavailable"
msgid "New branch unavailable"
msgstr ""
msgstr ""
msgid "New deploy key"
msgstr ""
msgid "New directory"
msgid "New directory"
msgstr ""
msgstr ""
...
@@ -7098,6 +7116,9 @@ msgstr ""
...
@@ -7098,6 +7116,9 @@ msgstr ""
msgid "Past due"
msgid "Past due"
msgstr ""
msgstr ""
msgid "Paste a machine public key here. Read more about how to generate it %{link_start}here%{link_end}"
msgstr ""
msgid "Paste epic link"
msgid "Paste epic link"
msgstr ""
msgstr ""
...
@@ -7869,6 +7890,9 @@ msgstr ""
...
@@ -7869,6 +7890,9 @@ msgstr ""
msgid "Projects that belong to a group are prefixed with the group namespace. Existing projects may be moved into a group."
msgid "Projects that belong to a group are prefixed with the group namespace. Existing projects may be moved into a group."
msgstr ""
msgstr ""
msgid "Projects with write access"
msgstr ""
msgid "ProjectsDropdown|Frequently visited"
msgid "ProjectsDropdown|Frequently visited"
msgstr ""
msgstr ""
...
@@ -8085,6 +8109,9 @@ msgstr ""
...
@@ -8085,6 +8109,9 @@ msgstr ""
msgid "Public - The project can be accessed without any authentication."
msgid "Public - The project can be accessed without any authentication."
msgstr ""
msgstr ""
msgid "Public deploy keys (%{deploy_keys_count})"
msgstr ""
msgid "Public pipelines"
msgid "Public pipelines"
msgstr ""
msgstr ""
...
@@ -11273,6 +11300,9 @@ msgstr ""
...
@@ -11273,6 +11300,9 @@ msgstr ""
msgid "Write a comment or drag your files here…"
msgid "Write a comment or drag your files here…"
msgstr ""
msgstr ""
msgid "Write access allowed"
msgstr ""
msgid "Write milestone description..."
msgid "Write milestone description..."
msgstr ""
msgstr ""
...
@@ -11519,6 +11549,9 @@ msgstr ""
...
@@ -11519,6 +11549,9 @@ msgstr ""
msgid "a deleted user"
msgid "a deleted user"
msgstr ""
msgstr ""
msgid "added %{created_at_timeago}"
msgstr ""
msgid "ago"
msgid "ago"
msgstr ""
msgstr ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment