Commit 91cc7057 authored by Gerardo Gutierrez's avatar Gerardo Gutierrez Committed by Vitaly Slobodin

Fixed constant wording for clearer understanding

Changelog: changed
EE: true
parent 04ed5d64
...@@ -140,8 +140,8 @@ export default { ...@@ -140,8 +140,8 @@ export default {
return { return {
id: 'signup-settings-modal', id: 'signup-settings-modal',
text: n__( text: n__(
'ApplicationSettings|By making this change, you will automatically approve %d user with the pending approval status.', 'ApplicationSettings|By making this change, you will automatically approve %d user who is pending approval.',
'ApplicationSettings|By making this change, you will automatically approve %d users with the pending approval status.', 'ApplicationSettings|By making this change, you will automatically approve %d users who are pending approval.',
pendingUserCount, pendingUserCount,
), ),
actionPrimary: { actionPrimary: {
...@@ -157,7 +157,7 @@ export default { ...@@ -157,7 +157,7 @@ export default {
actionCancel: { actionCancel: {
text: __('Cancel'), text: __('Cancel'),
}, },
title: s__('ApplicationSettings|Approve users in the pending approval status?'), title: s__('ApplicationSettings|Approve users who are pending approval?'),
}; };
}, },
}, },
......
...@@ -18,7 +18,7 @@ const showConfirmModal = () => { ...@@ -18,7 +18,7 @@ const showConfirmModal = () => {
modalId: 'confirm-general-permissions-changes', modalId: 'confirm-general-permissions-changes',
title: s__('ApplicationSettings|Approve users in the pending approval status?'), title: s__('ApplicationSettings|Approve users in the pending approval status?'),
text: s__( text: s__(
'ApplicationSettings|By making this change, you will automatically approve all users in pending approval status.', 'ApplicationSettings|By making this change, you will automatically approve all users who are pending approval.',
), ),
actionPrimary: { actionPrimary: {
text: s__('ApplicationSettings|Approve users'), text: s__('ApplicationSettings|Approve users'),
......
...@@ -400,7 +400,7 @@ RSpec.describe 'Admin updates EE-only settings' do ...@@ -400,7 +400,7 @@ RSpec.describe 'Admin updates EE-only settings' do
case button_effect case button_effect
when :shows_confirmation_modal when :shows_confirmation_modal
expect(page).to have_selector('.modal') expect(page).to have_selector('.modal')
expect(page).to have_css('.modal .modal-body', text: 'By making this change, you will automatically approve 1 user with the pending approval status.') expect(page).to have_css('.modal .modal-body', text: 'By making this change, you will automatically approve 1 user who is pending approval.')
when :submits_form when :submits_form
expect(page).to have_content 'Application settings saved successfully' expect(page).to have_content 'Application settings saved successfully'
end end
......
...@@ -508,7 +508,7 @@ RSpec.describe 'Edit group settings' do ...@@ -508,7 +508,7 @@ RSpec.describe 'Edit group settings' do
fill_in_new_user_signups_cap(new_user_signups_cap_value) fill_in_new_user_signups_cap(new_user_signups_cap_value)
expect(page).to have_selector('#confirm-general-permissions-changes') expect(page).to have_selector('#confirm-general-permissions-changes')
expect(page).to have_css('#confirm-general-permissions-changes .modal-body', text: 'By making this change, you will automatically approve all users in pending approval status.') expect(page).to have_css('#confirm-general-permissions-changes .modal-body', text: 'By making this change, you will automatically approve all users who are pending approval.')
end end
end end
......
...@@ -4243,12 +4243,15 @@ msgstr "" ...@@ -4243,12 +4243,15 @@ msgstr ""
msgid "ApplicationSettings|Approve users in the pending approval status?" msgid "ApplicationSettings|Approve users in the pending approval status?"
msgstr "" msgstr ""
msgid "ApplicationSettings|By making this change, you will automatically approve %d user with the pending approval status." msgid "ApplicationSettings|Approve users who are pending approval?"
msgid_plural "ApplicationSettings|By making this change, you will automatically approve %d users with the pending approval status." msgstr ""
msgid "ApplicationSettings|By making this change, you will automatically approve %d user who is pending approval."
msgid_plural "ApplicationSettings|By making this change, you will automatically approve %d users who are pending approval."
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
msgid "ApplicationSettings|By making this change, you will automatically approve all users in pending approval status." msgid "ApplicationSettings|By making this change, you will automatically approve all users who are pending approval."
msgstr "" msgstr ""
msgid "ApplicationSettings|Denied domains for sign-ups" msgid "ApplicationSettings|Denied domains for sign-ups"
......
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