Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
projects.thm.de
GitLab
Commits
2998d420
Commit
2998d420
authored
Jan 25, 2019
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Externalize strings from `/app/views/projects/commit`
parent
1d229689
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
66 additions
and
30 deletions
+66
-30
app/views/projects/commit/_ajax_signature.html.haml
app/views/projects/commit/_ajax_signature.html.haml
+1
-1
app/views/projects/commit/_ci_menu.html.haml
app/views/projects/commit/_ci_menu.html.haml
+2
-2
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+7
-10
app/views/projects/commit/_limit_exceeded_message.html.haml
app/views/projects/commit/_limit_exceeded_message.html.haml
+2
-2
app/views/projects/commit/_other_user_signature_badge.html.haml
...ews/projects/commit/_other_user_signature_badge.html.haml
+2
-2
app/views/projects/commit/_same_user_different_email_signature_badge.html.haml
...mmit/_same_user_different_email_signature_badge.html.haml
+2
-3
app/views/projects/commit/_signature_badge.html.haml
app/views/projects/commit/_signature_badge.html.haml
+2
-2
app/views/projects/commit/_unverified_signature_badge.html.haml
...ews/projects/commit/_unverified_signature_badge.html.haml
+2
-2
app/views/projects/commit/_verified_signature_badge.html.haml
...views/projects/commit/_verified_signature_badge.html.haml
+2
-3
app/views/projects/commit/pipelines.html.haml
app/views/projects/commit/pipelines.html.haml
+1
-1
app/views/projects/commit/show.html.haml
app/views/projects/commit/show.html.haml
+2
-2
changelogs/unreleased/gt-externalize-app-views-projects-commit.yml
...s/unreleased/gt-externalize-app-views-projects-commit.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+36
-0
No files found.
app/views/projects/commit/_ajax_signature.html.haml
View file @
2998d420
-
if
commit
.
has_signature?
%a
{
href:
'javascript:void(0)'
,
tabindex:
0
,
class:
commit_signature_badge_classes
(
'js-loading-gpg-badge'
),
data:
{
toggle:
'tooltip'
,
placement:
'top'
,
title:
'GPG signature (loading...)'
,
'commit-sha'
=>
commit
.
sha
}
}
%a
{
href:
'javascript:void(0)'
,
tabindex:
0
,
class:
commit_signature_badge_classes
(
'js-loading-gpg-badge'
),
data:
{
toggle:
'tooltip'
,
placement:
'top'
,
title:
_
(
'GPG signature (loading...)'
)
,
'commit-sha'
=>
commit
.
sha
}
}
app/views/projects/commit/_ci_menu.html.haml
View file @
2998d420
...
...
@@ -3,10 +3,10 @@
%ul
.nav-links.no-top.no-bottom.commit-ci-menu.nav.nav-tabs
=
nav_link
(
path:
'commit#show'
)
do
=
link_to
project_commit_path
(
@project
,
@commit
.
id
)
do
Changes
=
_
(
'
Changes
'
)
%span
.badge.badge-pill
=
@diffs
.
size
-
if
any_pipelines
=
nav_link
(
path:
'commit#pipelines'
)
do
=
link_to
pipelines_project_commit_path
(
@project
,
@commit
.
id
)
do
Pipelines
=
_
(
'
Pipelines
'
)
%span
.badge.badge-pill.js-pipelines-mr-count
=
@commit
.
pipelines
.
size
app/views/projects/commit/_commit_box.html.haml
View file @
2998d420
...
...
@@ -6,8 +6,8 @@
%strong
#{
s_
(
'CommitBoxTitle|Commit'
)
}
%span
.commit-sha
=
@commit
.
short_id
=
clipboard_button
(
text:
@commit
.
id
,
title:
_
(
"
Copy commit SHA to clipboard
"
))
%span
.d-none.d-sm-inline
authored
=
clipboard_button
(
text:
@commit
.
id
,
title:
_
(
'
Copy commit SHA to clipboard
'
))
%span
.d-none.d-sm-inline
=
_
(
'
authored
'
)
#{
time_ago_with_tooltip
(
@commit
.
authored_date
)
}
%span
=
s_
(
'ByAuthor|by'
)
=
author_avatar
(
@commit
,
size:
24
,
has_tooltip:
false
)
...
...
@@ -43,13 +43,13 @@
=
cherry_pick_commit_link
(
@commit
,
project_commit_path
(
@project
,
@commit
.
id
),
has_tooltip:
false
)
-
if
can?
(
current_user
,
:push_code
,
@project
)
%li
.clearfix
=
link_to
s_
(
"
CreateTag|Tag
"
),
new_project_tag_path
(
@project
,
ref:
@commit
)
=
link_to
s_
(
'
CreateTag|Tag
'
),
new_project_tag_path
(
@project
,
ref:
@commit
)
%li
.divider
%li
.dropdown-header
#{
_
(
'Download'
)
}
-
unless
@commit
.
parents
.
length
>
1
%li
=
link_to
s_
(
"
DownloadCommit|Email Patches
"
),
project_commit_path
(
@project
,
@commit
,
format: :patch
),
class:
"qa-email-patches"
%li
=
link_to
s_
(
"
DownloadCommit|Plain Diff
"
),
project_commit_path
(
@project
,
@commit
,
format: :diff
),
class:
"qa-plain-diff"
%li
=
link_to
s_
(
'
DownloadCommit|Email Patches
'
),
project_commit_path
(
@project
,
@commit
,
format: :patch
),
class:
"qa-email-patches"
%li
=
link_to
s_
(
'
DownloadCommit|Plain Diff
'
),
project_commit_path
(
@project
,
@commit
,
format: :diff
),
class:
"qa-plain-diff"
.commit-box
{
data:
{
project_path:
project_path
(
@project
)
}
}
%h3
.commit-title
...
...
@@ -95,8 +95,5 @@
.well-segment
=
icon
(
'info-circle fw'
)
This
commit
is
part
of
merge
request
=
succeed
'.'
do
=
link_to
@merge_request
.
to_reference
,
diffs_project_merge_request_path
(
@project
,
@merge_request
,
commit_id:
@commit
.
id
)
Comments
created
here
will
be
created
in
the
context
of
that
merge
request.
-
link_to_merge_request
=
link_to
(
@merge_request
.
to_reference
,
diffs_project_merge_request_path
(
@project
,
@merge_request
,
commit_id:
@commit
.
id
))
=
_
(
'This commit is part of merge request %{link_to_merge_request}. Comments created here will be created in the context of that merge request.'
).
html_safe
%
{
link_to_merge_request:
link_to_merge_request
}
app/views/projects/commit/_limit_exceeded_message.html.haml
View file @
2998d420
.has-tooltip
{
class:
"limit-box limit-box-#{objects} prepend-left-5"
,
data:
{
title:
"
Project has too many
#
{label_for_message} to search
"
}
}
.has-tooltip
{
class:
"limit-box limit-box-#{objects} prepend-left-5"
,
data:
{
title:
_
(
'
Project
has
too
many
%
{
label_for_message
}
to
search
'
)
%
{
label_for_message:
label_for_message
}
}
}
.limit-icon
-
if
objects
==
:branch
=
sprite_icon
(
'fork'
,
size:
12
)
-
else
=
icon
(
'tag'
)
.limit-message
%span
#
{
label_for_message
.
capitalize
}
unavailable
%span
=
_
(
'%
{label_for_message} unavailable
'
)
%
{
label_for_message:
label_for_message
.
capitalize
}
app/views/projects/commit/_other_user_signature_badge.html.haml
View file @
2998d420
-
title
=
capture
do
This commit was signed with a different user's verified signature.
=
_
(
"
This commit was signed with a different user's verified signature.
"
)
-
locals
=
{
signature:
signature
,
title:
title
,
label:
'Unverified'
,
css_class:
'invalid'
,
icon:
'status_notfound_borderless'
,
show_user:
true
}
-
locals
=
{
signature:
signature
,
title:
title
,
label:
_
(
'Unverified'
)
,
css_class:
'invalid'
,
icon:
'status_notfound_borderless'
,
show_user:
true
}
=
render
partial:
'projects/commit/signature_badge'
,
locals:
locals
app/views/projects/commit/_same_user_different_email_signature_badge.html.haml
View file @
2998d420
-
title
=
capture
do
This commit was signed with a verified signature, but the committer email
is
<strong>
not verified
</strong>
to belong to the same user.
=
_
(
'This commit was signed with a verified signature, but the committer email is <strong>not verified</strong> to belong to the same user.'
).
html_safe
-
locals
=
{
signature:
signature
,
title:
title
,
label:
'Unverified'
,
css_class:
[
'invalid'
],
icon:
'status_notfound_borderless'
,
show_user:
true
}
-
locals
=
{
signature:
signature
,
title:
title
,
label:
_
(
'Unverified'
)
,
css_class:
[
'invalid'
],
icon:
'status_notfound_borderless'
,
show_user:
true
}
=
render
partial:
'projects/commit/signature_badge'
,
locals:
locals
app/views/projects/commit/_signature_badge.html.haml
View file @
2998d420
...
...
@@ -19,10 +19,10 @@
.clearfix
=
render
partial:
'projects/commit/signature_badge_user'
,
locals:
{
signature:
signature
}
GPG Key ID:
=
_
(
'
GPG Key ID:
'
)
%span
.monospace
=
signature
.
gpg_key_primary_keyid
=
link_to
(
'Learn more about signing commits'
,
help_page_path
(
'user/project/repository/gpg_signed_commits/index.md'
),
class:
'gpg-popover-help-link'
)
=
link_to
(
_
(
'Learn more about signing commits'
)
,
help_page_path
(
'user/project/repository/gpg_signed_commits/index.md'
),
class:
'gpg-popover-help-link'
)
%a
{
href:
'javascript:void(0)'
,
tabindex:
0
,
class:
css_classes
,
data:
{
toggle:
'popover'
,
html:
'true'
,
placement:
'top'
,
title:
title
,
content:
content
}
}
=
label
app/views/projects/commit/_unverified_signature_badge.html.haml
View file @
2998d420
-
title
=
capture
do
This commit was signed with an
<strong>
unverified
</strong>
signature.
=
_
(
'
This commit was signed with an <strong>unverified</strong> signature.
'
).
html_safe
-
locals
=
{
signature:
signature
,
title:
title
,
label:
'Unverified'
,
css_class:
'invalid'
,
icon:
'status_notfound_borderless'
}
-
locals
=
{
signature:
signature
,
title:
title
,
label:
_
(
'Unverified'
)
,
css_class:
'invalid'
,
icon:
'status_notfound_borderless'
}
=
render
partial:
'projects/commit/signature_badge'
,
locals:
locals
app/views/projects/commit/_verified_signature_badge.html.haml
View file @
2998d420
-
title
=
capture
do
This commit was signed with a
<strong>
verified
</strong>
signature and the
committer email is verified to belong to the same user.
=
_
(
'This commit was signed with a <strong>verified</strong> signature and the committer email is verified to belong to the same user.'
).
html_safe
-
locals
=
{
signature:
signature
,
title:
title
,
label:
'Verified'
,
css_class:
'valid'
,
icon:
'status_success_borderless'
,
show_user:
true
}
-
locals
=
{
signature:
signature
,
title:
title
,
label:
_
(
'Verified'
)
,
css_class:
'valid'
,
icon:
'status_success_borderless'
,
show_user:
true
}
=
render
partial:
'projects/commit/signature_badge'
,
locals:
locals
app/views/projects/commit/pipelines.html.haml
View file @
2998d420
-
page_title
'Pipelines'
,
"
#{
@commit
.
title
}
(
#{
@commit
.
short_id
}
)"
,
'Commits'
-
page_title
_
(
'Pipelines'
)
,
"
#{
@commit
.
title
}
(
#{
@commit
.
short_id
}
)"
,
_
(
'Commits'
)
=
render
'commit_box'
=
render
'ci_menu'
...
...
app/views/projects/commit/show.html.haml
View file @
2998d420
-
@no_container
=
true
-
add_to_breadcrumbs
"
Commits
"
,
project_commits_path
(
@project
)
-
add_to_breadcrumbs
_
(
'
Commits
'
)
,
project_commits_path
(
@project
)
-
breadcrumb_title
@commit
.
short_id
-
container_class
=
!
fluid_layout
&&
diff_view
==
:inline
?
'container-limited'
:
''
-
limited_container_width
=
fluid_layout
?
''
:
'limit-container-width'
-
@content_class
=
limited_container_width
-
page_title
"
#{
@commit
.
title
}
(
#{
@commit
.
short_id
}
)"
,
"
Commits
"
-
page_title
"
#{
@commit
.
title
}
(
#{
@commit
.
short_id
}
)"
,
_
(
'
Commits
'
)
-
page_description
@commit
.
description
.container-fluid
{
class:
[
limited_container_width
,
container_class
]
}
...
...
changelogs/unreleased/gt-externalize-app-views-projects-commit.yml
0 → 100644
View file @
2998d420
---
title
:
Externalize strings from `/app/views/projects/commit`
merge_request
:
24668
author
:
George Tsiolis
type
:
other
locale/gitlab.pot
View file @
2998d420
...
...
@@ -117,6 +117,9 @@ msgstr ""
msgid "%{issuableType} will be removed! Are you sure?"
msgstr ""
msgid "%{label_for_message} unavailable"
msgstr ""
msgid "%{link_start}Read more%{link_end} about role permissions"
msgstr ""
...
...
@@ -1323,6 +1326,9 @@ msgstr ""
msgid "ChangeTypeAction|This will create a new commit in order to revert the existing changes."
msgstr ""
msgid "Changes"
msgstr ""
msgid "Changes are shown as if the <b>source</b> revision was being merged into the <b>target</b> revision."
msgstr ""
...
...
@@ -3483,9 +3489,15 @@ msgstr ""
msgid "From the Kubernetes cluster details view, install Runner from the applications list"
msgstr ""
msgid "GPG Key ID:"
msgstr ""
msgid "GPG Keys"
msgstr ""
msgid "GPG signature (loading...)"
msgstr ""
msgid "General"
msgstr ""
...
...
@@ -4324,6 +4336,9 @@ msgstr ""
msgid "Learn more about protected branches"
msgstr ""
msgid "Learn more about signing commits"
msgstr ""
msgid "Learn more in the"
msgstr ""
...
...
@@ -5842,6 +5857,9 @@ msgstr ""
msgid "Project export started. A download link will be sent by email."
msgstr ""
msgid "Project has too many %{label_for_message} to search"
msgstr ""
msgid "Project members"
msgstr ""
...
...
@@ -7381,6 +7399,21 @@ msgstr ""
msgid "This branch has changed since you started editing. Would you like to create a new branch?"
msgstr ""
msgid "This commit is part of merge request %{link_to_merge_request}. Comments created here will be created in the context of that merge request."
msgstr ""
msgid "This commit was signed with a <strong>verified</strong> signature and the committer email is verified to belong to the same user."
msgstr ""
msgid "This commit was signed with a different user's verified signature."
msgstr ""
msgid "This commit was signed with a verified signature, but the committer email is <strong>not verified</strong> to belong to the same user."
msgstr ""
msgid "This commit was signed with an <strong>unverified</strong> signature."
msgstr ""
msgid "This container registry has been scheduled for deletion."
msgstr ""
...
...
@@ -8636,6 +8669,9 @@ msgstr ""
msgid "attach a new file"
msgstr ""
msgid "authored"
msgstr ""
msgid "branch name"
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