Skip to content

G
gitlab-ce
Commit 1d2d2995 authored by Paul Slaughter's avatar Paul Slaughter
Browse files
Options

Merge request approvals settings i18n 

- Updated gitlab.pot
parent 58df5921
Show whitespace changes
Inline Side-by-side
Showing with 61 additions and 17 deletions
ee/app/views/projects/_merge_request_approvals_settings.html.haml
View file @ 1d2d2995
......@@ -3,14 +3,14 @@
%section.settings.merge-requests-feature.no-animate#js-merge-request-approval-settings{ class: [('expanded' if expanded), ('hidden' if @project.project_feature.send(:merge_requests_access_level) == 0)] }
.settings-header
%h4
Merge request approvals
= _("Merge request approvals")
%button.btn.js-settings-toggle{ type: 'button' }
= expanded ? 'Collapse' : 'Expand'
= expanded ? _("Collapse") : _("Expand")
%p
Customize your merge request approval settings.
= _("Customize your merge request approval settings.")
= link_to icon('question-circle'), help_page_path("user/project/merge_requests/merge_request_approvals"), target: '_blank'
.settings-content
= form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { class: "merge-request-approval-settings-form" }, authenticity_token: true do |f|
%input{ name: 'update_section', type: 'hidden', value: 'js-merge-request-approval-settings' }
= render 'projects/merge_request_approvals_settings_form', form: f, project: @project
= f.submit 'Save changes', class: "btn btn-success"
= f.submit _("Save changes"), class: "btn btn-success"
ee/app/views/projects/_merge_request_approvals_settings_form.html.haml
View file @ 1d2d2995
......@@ -2,21 +2,21 @@
.form-group
= form.label :approver_ids, class: 'label-bold' do
Approvers
= _("Approvers")
= hidden_field_tag "project[approver_ids]"
= hidden_field_tag "project[approver_group_ids]"
.input-group.input-btn-group
= hidden_field_tag :approver_user_and_group_ids, '', { class: 'js-select-user-and-group input-large', tabindex: 1, 'data-name': 'project', :style => "max-width: unset;" }
%button.btn.btn-success.js-add-approvers{ type: 'button', title: 'Add approvers(s)' }
Add
= _("Add")
.form-text.text-muted
Add users or groups who are allowed to approve every merge request
= _("Add users or groups who are allowed to approve every merge request")
.card.prepend-top-10.js-current-approvers
.load-wrapper.hidden
= icon('spinner spin', class: 'approver-list-loader')
.card-header
Approvers
= _("Approvers")
%span.badge.badge-pill
- ids = []
- project.approvers.each do |user|
......@@ -31,46 +31,48 @@
%li.approver.settings-flex-row.js-approver{ data: { id: approver.user_id } }
= link_to approver.user.name, approver.user
.float-right
%button{ href: project_approver_path(project, approver), data: { confirm: "Are you sure you want to remove approver #{approver.user.name}"}, class: "btn btn-remove js-approver-remove", title: 'Remove approver' }
- confirm_message = _("Are you sure you want to remove approver %{name}?") % { name: approver.user.name }
%button{ href: project_approver_path(project, approver), data: { confirm: confirm_message }, class: "btn btn-remove js-approver-remove", title: _("Remove approver") }
= icon("trash")
- project.approver_groups.each do |approver_group|
%li.approver-group.settings-flex-row.js-approver-group{ data: { id: approver_group.group.id } }
%span
%span.light
Group:
= _("Group:")
= link_to approver_group.group.name, approver_group.group
%span.badge.badge-pill
= approver_group.group.members.count
.float-right
%button{ href: project_approver_group_path(project, approver_group), data: { confirm: "Are you sure you want to remove group #{approver_group.group.name}" }, class: "btn btn-remove js-approver-remove", title: 'Remove group' }
- confirm_message = _("Are you sure you want to remove group %{name}?") % { name: approver_group.group.name }
%button{ href: project_approver_group_path(project, approver_group), data: { confirm: confirm_message }, class: "btn btn-remove js-approver-remove", title: _("Remove group") }
= icon("trash")
- if project.approvers.empty? && project.approver_groups.empty?
%li There are no approvers
%li= _("There are no approvers")
.form-group
= form.label :approvals_before_merge, class: 'label-bold' do
Approvals required
= _("Approvals required")
= form.number_field :approvals_before_merge, class: "form-control", min: 0
.form-text.text-muted
Set number of approvers required before open merge requests can be merged
= _("Set number of approvers required before open merge requests can be merged")
.form-group
.form-check
= form.check_box(:disable_overriding_approvers_per_merge_request, { checked: can_override_approvers, class: 'form-check-input' }, false, true)
= form.label :disable_overriding_approvers_per_merge_request, class: 'form-check-label' do
%strong Can override approvers and approvals required per merge request
%strong= _("Can override approvers and approvals required per merge request")
= link_to icon('question-circle'), help_page_path("user/project/merge_requests/merge_request_approvals", anchor: 'overriding-the-merge-request-approvals-default-settings'), target: '_blank'
.form-group.reset-approvals-on-push
.form-check
= form.check_box :reset_approvals_on_push, class: 'form-check-input'
= form.label :reset_approvals_on_push, class: 'form-check-label' do
%strong Remove all approvals in a merge request when new commits are pushed to its source branch
%strong= _("Remove all approvals in a merge request when new commits are pushed to its source branch")
.form-group.self-approval
.form-check
= form.check_box :merge_requests_author_approval, class: 'form-check-input'
= form.label :merge_requests_author_approval, class: 'form-check-label' do
%strong Enable self approval of merge requests
%strong= _("Enable self approval of merge requests")
= link_to icon('question-circle'), help_page_path("user/project/merge_requests/merge_request_approvals",
anchor: 'allowing-merge-request-authors-to-approve-their-own-merge-requests'), target: '_blank'
locale/gitlab.pot
View file @ 1d2d2995
......@@ -447,6 +447,9 @@ msgstr ""
msgid "Add user(s) to the group:"
msgstr ""
msgid "Add users or groups who are allowed to approve every merge request"
msgstr ""
msgid "Add users to group"
msgstr ""
......@@ -776,6 +779,12 @@ msgstr ""
msgid "Applications"
msgstr ""
msgid "Approvals required"
msgstr ""
msgid "Approvers"
msgstr ""
msgid "Apr"
msgstr ""
......@@ -803,6 +812,12 @@ msgstr ""
msgid "Are you sure you want to remove %{group_name}?"
msgstr ""
msgid "Are you sure you want to remove approver %{name}?"
msgstr ""
msgid "Are you sure you want to remove group %{name}?"
msgstr ""
msgid "Are you sure you want to remove this identity?"
msgstr ""
......@@ -1405,6 +1420,9 @@ msgstr ""
msgid "Callback URL"
msgstr ""
msgid "Can override approvers and approvals required per merge request"
msgstr ""
msgid "Can't find HEAD commit for this branch"
msgstr ""
......@@ -2555,6 +2573,9 @@ msgstr ""
msgid "Customize how Google Code email addresses and usernames are imported into GitLab. In the next step, you'll be able to select the projects you want to import."
msgstr ""
msgid "Customize your merge request approval settings."
msgstr ""
msgid "Customize your pipeline configuration, view your pipeline status and coverage report."
msgstr ""
......@@ -3025,6 +3046,9 @@ msgstr ""
msgid "Enable reCAPTCHA or Akismet and set IP limits."
msgstr ""
msgid "Enable self approval of merge requests"
msgstr ""
msgid "Enable the Performance Bar for a given group."
msgstr ""
......@@ -4099,6 +4123,9 @@ msgstr ""
msgid "Group name"
msgstr ""
msgid "Group:"
msgstr ""
msgid "Group: %{group_name}"
msgstr ""
......@@ -5085,6 +5112,9 @@ msgstr ""
msgid "Merge request"
msgstr ""
msgid "Merge request approvals"
msgstr ""
msgid "Merge requests"
msgstr ""
......@@ -6837,6 +6867,12 @@ msgstr ""
msgid "Remove Runner"
msgstr ""
msgid "Remove all approvals in a merge request when new commits are pushed to its source branch"
msgstr ""
msgid "Remove approver"
msgstr ""
msgid "Remove avatar"
msgstr ""
......@@ -7388,6 +7424,9 @@ msgstr ""
msgid "Set notification email for abuse reports."
msgstr ""
msgid "Set number of approvers required before open merge requests can be merged"
msgstr ""
msgid "Set requirements for a user to sign-in. Enable mandatory two-factor authentication."
msgstr ""
......@@ -8118,6 +8157,9 @@ msgstr ""
msgid "The value lying at the midpoint of a series of observed values. E.g., between 3, 5, 9, the median is 5. Between 3, 5, 7, 8, the median is (5+7)/2 = 6."
msgstr ""
msgid "There are no approvers"
msgstr ""
msgid "There are no archived projects yet"
msgstr ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7