Add i18n helpers to branch comparison view
This commit is contained in:
parent
2cbb2d0ece
commit
c69a2d6e37
3 changed files with 23 additions and 26 deletions
|
@ -5,22 +5,24 @@
|
|||
= link_to icon('exchange'), { from: params[:to], to: params[:from] }, class: 'commits-compare-switch has-tooltip btn btn-white', title: 'Swap revisions'
|
||||
.form-group.dropdown.compare-form-group.to.js-compare-to-dropdown
|
||||
.input-group.inline-input-group
|
||||
%span.input-group-addon Source
|
||||
%span.input-group-addon
|
||||
= s_("CompareBranches|Source")
|
||||
= hidden_field_tag :to, params[:to]
|
||||
= button_tag type: 'button', title: params[:to], class: "form-control compare-dropdown-toggle js-compare-dropdown has-tooltip git-revision-dropdown-toggle", required: true, data: { refs_url: refs_project_path(@project), toggle: "dropdown", target: ".js-compare-to-dropdown", selected: params[:to], field_name: :to } do
|
||||
.dropdown-toggle-text.str-truncated= params[:to] || 'Select branch/tag'
|
||||
.dropdown-toggle-text.str-truncated= params[:to] || s_("CompareBranches|Select branch/tag")
|
||||
= render 'shared/ref_dropdown'
|
||||
.compare-ellipsis.inline ...
|
||||
.form-group.dropdown.compare-form-group.from.js-compare-from-dropdown
|
||||
.input-group.inline-input-group
|
||||
%span.input-group-addon Target
|
||||
%span.input-group-addon
|
||||
= s_("CompareBranches|Target")
|
||||
= hidden_field_tag :from, params[:from]
|
||||
= button_tag type: 'button', title: params[:from], class: "form-control compare-dropdown-toggle js-compare-dropdown has-tooltip git-revision-dropdown-toggle", required: true, data: { refs_url: refs_project_path(@project), toggle: "dropdown", target: ".js-compare-from-dropdown", selected: params[:from], field_name: :from } do
|
||||
.dropdown-toggle-text.str-truncated= params[:from] || 'Select branch/tag'
|
||||
.dropdown-toggle-text.str-truncated= params[:from] || s_("CompareBranches|Select branch/tag")
|
||||
= render 'shared/ref_dropdown'
|
||||
|
||||
= button_tag "Compare", class: "btn btn-create commits-compare-btn"
|
||||
= button_tag s_("CompareBranches|Compare"), class: "btn btn-create commits-compare-btn"
|
||||
- if @merge_request.present?
|
||||
= link_to "View open merge request", project_merge_request_path(@project, @merge_request), class: 'prepend-left-10 btn'
|
||||
= link_to s_("CompareBranches|View open merge request"), project_merge_request_path(@project, @merge_request), class: 'prepend-left-10 btn'
|
||||
- elsif create_mr_button?
|
||||
= link_to "Create merge request", create_mr_path, class: 'prepend-left-10 btn'
|
||||
= link_to s_("CompareBranches|Create merge request"), create_mr_path, class: 'prepend-left-10 btn'
|
||||
|
|
|
@ -3,22 +3,16 @@
|
|||
- page_title "Compare"
|
||||
|
||||
%div{ class: container_class }
|
||||
%h3.page-title
|
||||
= _("Compare Git revisions")
|
||||
.sub-header-block
|
||||
Compare Git revisions.
|
||||
%br
|
||||
Choose a branch/tag (e.g.
|
||||
= succeed ')' do
|
||||
- example_master = capture_haml do
|
||||
%code.ref-name master
|
||||
or enter a commit SHA (e.g.
|
||||
= succeed ')' do
|
||||
- example_sha = capture_haml do
|
||||
%code.ref-name 4eedf23
|
||||
to see what's changed or to create a merge request.
|
||||
= (s_("CompareBranches|Choose a branch/tag (e.g. %{master}) or enter a commit (e.g. %{sha}) to what's changed or to create a merge request.") % { master: example_master, sha: example_sha }).html_safe
|
||||
%br
|
||||
Changes are shown as if the
|
||||
%b source
|
||||
revision was being merged into the
|
||||
%b target
|
||||
revision.
|
||||
= (s_("ComparBranches|Changes are shown as if the <b>source</b> revision was being merged into the <b>target</b> revision.")).html_safe
|
||||
|
||||
.prepend-top-20
|
||||
= render "form"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
- @no_container = true
|
||||
- add_to_breadcrumbs "Compare Revisions", project_compare_index_path(@project)
|
||||
- add_to_breadcrumbs _("Compare Revisions"), project_compare_index_path(@project)
|
||||
- page_title "#{params[:from]}...#{params[:to]}"
|
||||
|
||||
%div{ class: container_class }
|
||||
|
@ -13,12 +13,13 @@
|
|||
.light-well
|
||||
.center
|
||||
%h4
|
||||
There isn't anything to compare.
|
||||
= s_("CompareBranches|There isn't anything to compare.")
|
||||
%p.slead
|
||||
- if params[:to] == params[:from]
|
||||
- sourceBranch = capture_haml do
|
||||
%span.ref-name= params[:from]
|
||||
and
|
||||
- targetBranch = capture_haml do
|
||||
%span.ref-name= params[:to]
|
||||
are the same.
|
||||
= (s_("CompareBranches|%{source_branch} and %{target_branch} are the same.") % { source_branch: sourceBranch, target_branch: targetBranch }).html_safe
|
||||
- else
|
||||
You'll need to use different branch names to get a valid comparison.
|
||||
= s_("CompareBranches|You'll need to use different branch names to get a valid comparison.")
|
||||
|
|
Loading…
Reference in a new issue