kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Remove superfluous i18n namespaces

Browse source
This commit is contained in:
James Ramsay 2018-01-03 08:46:06 -05:00
parent c69a2d6e37
commit 6c8daa6827
No known key found for this signature in database
GPG key ID: D0DDB642E0E655B4
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/views/projects/compare/_form.html.haml
View file

@ -9,7 +9,7 @@
= 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] || s_("CompareBranches|Select branch/tag")
.dropdown-toggle-text.str-truncated= params[:to] || _("Select branch/tag")
= render 'shared/ref_dropdown'
.compare-ellipsis.inline ...
.form-group.dropdown.compare-form-group.from.js-compare-from-dropdown
@ -18,11 +18,11 @@
= 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] || s_("CompareBranches|Select branch/tag")
.dropdown-toggle-text.str-truncated= params[:from] || _("Select branch/tag")
= render 'shared/ref_dropdown'
 
= button_tag s_("CompareBranches|Compare"), class: "btn btn-create commits-compare-btn"
- if @merge_request.present?
= link_to s_("CompareBranches|View open merge request"), project_merge_request_path(@project, @merge_request), class: 'prepend-left-10 btn'
= link_to _("View open merge request"), project_merge_request_path(@project, @merge_request), class: 'prepend-left-10 btn'
- elsif create_mr_button?
= link_to s_("CompareBranches|Create merge request"), create_mr_path, class: 'prepend-left-10 btn'
= link_to _("Create merge request"), create_mr_path, class: 'prepend-left-10 btn'

4
app/views/projects/compare/index.html.haml
View file

@ -10,9 +10,9 @@
%code.ref-name master
- example_sha = capture_haml do
%code.ref-name 4eedf23
= (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
= (_("Choose a branch/tag (e.g. %{master}) or enter a commit (e.g. %{sha}) to see what's changed or to create a merge request.") % { master: example_master, sha: example_sha }).html_safe
%br
= (s_("ComparBranches|Changes are shown as if the <b>source</b> revision was being merged into the <b>target</b> revision.")).html_safe
= (_("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"

2
app/views/projects/compare/show.html.haml
View file

@ -22,4 +22,4 @@
%span.ref-name= params[:to]
= (s_("CompareBranches|%{source_branch} and %{target_branch} are the same.") % { source_branch: sourceBranch, target_branch: targetBranch }).html_safe
- else
= s_("CompareBranches|You'll need to use different branch names to get a valid comparison.")
= _("You'll need to use different branch names to get a valid comparison.")