From 6c8daa6827353564dac45f495b5953cb3b4b273b Mon Sep 17 00:00:00 2001 From: James Ramsay Date: Wed, 3 Jan 2018 08:46:06 -0500 Subject: [PATCH] Remove superfluous i18n namespaces --- app/views/projects/compare/_form.html.haml | 8 ++++---- app/views/projects/compare/index.html.haml | 4 ++-- app/views/projects/compare/show.html.haml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/views/projects/compare/_form.html.haml b/app/views/projects/compare/_form.html.haml index ebeeeff5e76..d0c8a699608 100644 --- a/app/views/projects/compare/_form.html.haml +++ b/app/views/projects/compare/_form.html.haml @@ -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' diff --git a/app/views/projects/compare/index.html.haml b/app/views/projects/compare/index.html.haml index b3b9aa55b7c..9b0095f5f0f 100644 --- a/app/views/projects/compare/index.html.haml +++ b/app/views/projects/compare/index.html.haml @@ -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 source revision was being merged into the target revision.")).html_safe + = (_("Changes are shown as if the source revision was being merged into the target revision.")).html_safe .prepend-top-20 = render "form" diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml index b892d4d8ba5..0939b2a3b07 100644 --- a/app/views/projects/compare/show.html.haml +++ b/app/views/projects/compare/show.html.haml @@ -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.")