diff options
-rw-r--r-- | app/views/projects/commit/_change.html.haml | 7 | ||||
-rw-r--r-- | app/views/projects/commit/_commit_box.html.haml | 28 | ||||
-rw-r--r-- | locale/gitlab.pot | 50 |
3 files changed, 67 insertions, 18 deletions
diff --git a/app/views/projects/commit/_change.html.haml b/app/views/projects/commit/_change.html.haml index b7cfefe6443..663cd065b28 100644 --- a/app/views/projects/commit/_change.html.haml +++ b/app/views/projects/commit/_change.html.haml @@ -2,17 +2,20 @@ - when 'revert' - label = n_('ChangeTypeAction|Revert') - branch_label = s_('ChangeTypeActionLabel|Revert in branch') + - revert_merge_request = _('Revert this merge-request') + - revert_commit = _('Revert this commit') + - title = commit.merged_merge_request(current_user) ? revert_merge_request : revert_commit - when 'cherry-pick' - label = s_('ChangeTypeAction|Cherry-pick') - branch_label = s_('ChangeTypeActionLabel|Pick into branch') -- change_type = commit.change_type_title(current_user) + - title = commit.merged_merge_request(current_user) ? _('Cherry-pick this merge-request') : _('Cherry-pick this commit') .modal{ id: "modal-#{type}-commit" } .modal-dialog .modal-content .modal-header %a.close{ href: "#", "data-dismiss" => "modal" } × - %h3.page-title== _("%{action} this %{change_type}") + %h3.page-title= title .modal-body = form_tag [type.underscore, @project.namespace.becomes(Namespace), @project, commit], method: :post, remote: false, class: "form-horizontal js-#{type}-form js-requires-input" do .form-group.branch diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml index aab50310234..da4cbd05869 100644 --- a/app/views/projects/commit/_commit_box.html.haml +++ b/app/views/projects/commit/_commit_box.html.haml @@ -1,17 +1,17 @@ .page-content-header .header-main-content %strong - Commit + #{ _('Commit') } %span.commit-sha= @commit.short_id - = clipboard_button(text: @commit.id, title: "Copy commit SHA to clipboard") + = clipboard_button(text: @commit.id, title: _("Copy commit SHA to clipboard")) %span.hidden-xs authored #{time_ago_with_tooltip(@commit.authored_date)} - %span by + %span= _('ByAuthor|by') = author_avatar(@commit, size: 24) %strong = commit_author_link(@commit, avatar: true, size: 24) - if @commit.different_committer? - %span.light Committed by + %span.light= _('Committed by') %strong = commit_committer_link(@commit, avatar: true, size: 24) #{time_ago_with_tooltip(@commit.committed_date)} @@ -22,15 +22,15 @@ = icon('comment') = @notes_count = link_to namespace_project_tree_path(@project.namespace, @project, @commit), class: "btn btn-default append-right-10 hidden-xs hidden-sm" do - Browse files + #{ _('Browse files') } .dropdown.inline %a.btn.btn-default.dropdown-toggle{ data: { toggle: "dropdown" } } - %span Options + %span= _('Options') = icon('caret-down') %ul.dropdown-menu.dropdown-menu-align-right %li.visible-xs-block.visible-sm-block = link_to namespace_project_tree_path(@project.namespace, @project, @commit) do - Browse Files + _('Browse Files') - unless @commit.has_been_reverted?(current_user) %li.clearfix = revert_commit_link(@commit, namespace_project_commit_path(@project.namespace, @project, @commit.id), has_tooltip: false) @@ -38,13 +38,13 @@ = cherry_pick_commit_link(@commit, namespace_project_commit_path(@project.namespace, @project, @commit.id), has_tooltip: false) - if can_collaborate_with_project? %li.clearfix - = link_to "Tag", new_namespace_project_tag_path(@project.namespace, @project, ref: @commit) + = link_to s_("CreateTag|Tag"), new_namespace_project_tag_path(@project.namespace, @project, ref: @commit) %li.divider %li.dropdown-header - Download + #{ _('Download') } - unless @commit.parents.length > 1 - %li= link_to "Email Patches", namespace_project_commit_path(@project.namespace, @project, @commit, format: :patch) - %li= link_to "Plain Diff", namespace_project_commit_path(@project.namespace, @project, @commit, format: :diff) + %li= link_to _("Email Patches"), namespace_project_commit_path(@project.namespace, @project, @commit, format: :patch) + %li= link_to _("Plain Diff"), namespace_project_commit_path(@project.namespace, @project, @commit, format: :diff) .commit-box %h3.commit-title @@ -57,7 +57,7 @@ .well-segment.branch-info .icon-container.commit-icon = custom_icon("icon_commit") - %span.cgray= pluralize(@commit.parents.count, "parent") + %span.cgray= n_('parent', 'parents', @commit.parents.count) - @commit.parents.each do |parent| = link_to parent.short_id, namespace_project_commit_path(@project.namespace, @project, parent), class: "commit-sha" %span.commit-info.branches @@ -69,11 +69,11 @@ .status-icon-container{ class: "ci-status-icon-#{@commit.status}" } = link_to namespace_project_pipeline_path(@project.namespace, @project, last_pipeline.id) do = ci_icon_for_status(last_pipeline.status) - Pipeline + #{ _('Pipeline') } = link_to "##{last_pipeline.id}", namespace_project_pipeline_path(@project.namespace, @project, last_pipeline.id) = ci_label_for_status(last_pipeline.status) - if last_pipeline.stages_count.nonzero? - with #{"stage".pluralize(last_pipeline.stages_count)} + #{ n_('with stage', 'with stages', last_pipeline.stages_count) } .mr-widget-pipeline-graph = render 'shared/mini_pipeline_graph', pipeline: last_pipeline, klass: 'js-commit-pipeline-graph' in diff --git a/locale/gitlab.pot b/locale/gitlab.pot index b59cd0df8ff..81769b9dddc 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: gitlab 1.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-12 00:33-0500\n" -"PO-Revision-Date: 2017-06-12 00:33-0500\n" +"POT-Creation-Date: 2017-06-12 09:07+0200\n" +"PO-Revision-Date: 2017-06-12 09:07+0200\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: \n" @@ -65,6 +65,9 @@ msgstr "" msgid "Branches" msgstr "" +msgid "Browse files" +msgstr "" + msgid "ByAuthor|by" msgstr "" @@ -95,6 +98,12 @@ msgstr "" msgid "Charts" msgstr "" +msgid "Cherry-pick this commit" +msgstr "" + +msgid "Cherry-pick this merge-request" +msgstr "" + msgid "CiStatusLabel|canceled" msgstr "" @@ -166,6 +175,9 @@ msgstr "" msgid "Commits|History" msgstr "" +msgid "Committed by" +msgstr "" + msgid "Compare" msgstr "" @@ -199,6 +211,9 @@ msgstr "" msgid "CreateNewFork|Fork" msgstr "" +msgid "CreateTag|Tag" +msgstr "" + msgid "Cron Timezone" msgstr "" @@ -261,6 +276,9 @@ msgstr "" msgid "Don't show again" msgstr "" +msgid "Download" +msgstr "" + msgid "Download tar" msgstr "" @@ -285,6 +303,9 @@ msgstr "" msgid "Edit Pipeline Schedule %{id}" msgstr "" +msgid "Email Patches" +msgstr "" + msgid "Every day (at 4:00am)" msgstr "" @@ -494,9 +515,15 @@ msgstr "" msgid "OpenedNDaysAgo|Opened" msgstr "" +msgid "Options" +msgstr "" + msgid "Owner" msgstr "" +msgid "Pipeline" +msgstr "" + msgid "Pipeline Health" msgstr "" @@ -533,6 +560,9 @@ msgstr "" msgid "PipelineSchedules|Target" msgstr "" +msgid "Plain Diff" +msgstr "" + msgid "Project '%{project_name}' queued for deletion." msgstr "" @@ -623,6 +653,12 @@ msgstr "" msgid "Request Access" msgstr "" +msgid "Revert this commit" +msgstr "" + +msgid "Revert this merge-request" +msgstr "" + msgid "Save pipeline schedule" msgstr "" @@ -975,5 +1011,15 @@ msgstr[1] "" msgid "notification emails" msgstr "" +msgid "parent" +msgid_plural "parents" +msgstr[0] "" +msgstr[1] "" + msgid "pipeline schedules documentation" msgstr "" + +msgid "with stage" +msgid_plural "with stages" +msgstr[0] "" +msgstr[1] "" |