Externalize strings from /app/views/projects/commit
This commit is contained in:
George Tsiolis
parent
1d22968958
commit
2998d420e4
13 changed files with 66 additions and 30 deletions
|
|
@ -1,2 +1,2 @@
|
|||
- 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 } }
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 }
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
.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 }
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
- 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
- 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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
- 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
- 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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
- page_title 'Pipelines', "#{@commit.title} (#{@commit.short_id})", 'Commits'
|
||||
- page_title _('Pipelines'), "#{@commit.title} (#{@commit.short_id})", _('Commits')
|
||||
|
||||
= render 'commit_box'
|
||||
= render 'ci_menu'
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
- @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] }
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Externalize strings from `/app/views/projects/commit`
|
||||
merge_request: 24668
|
||||
author: George Tsiolis
|
||||
type: other
|
||||
|
|
@ -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 ""
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue