Merge branch '340148-approve-users-in-vs-approve-users-with' into 'master'

Replace "Approve users in" with "Approve users with"

See merge request gitlab-org/gitlab!79167

app/assets/javascripts/pages/admin/application_settings/general/components/signup_form.vue

@@ -140,8 +140,8 @@ export default {
       return {
         id: 'signup-settings-modal',
         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 users 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 who are pending approval.',
           pendingUserCount,
         ),
         actionPrimary: {
@@ -157,7 +157,7 @@ export default {
         actionCancel: {
           text: __('Cancel'),
         },
-        title: s__('ApplicationSettings|Approve users in the pending approval status?'),
+        title: s__('ApplicationSettings|Approve users who are pending approval?'),
       };
     },
   },

ee/app/assets/javascripts/groups/settings/permissions/index.js

@@ -18,7 +18,7 @@ const showConfirmModal = () => {
             modalId: 'confirm-general-permissions-changes',
             title: s__('ApplicationSettings|Approve users in the pending approval status?'),
             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: {
               text: s__('ApplicationSettings|Approve users'),

ee/spec/features/admin/admin_settings_spec.rb

@@ -400,7 +400,7 @@ RSpec.describe 'Admin updates EE-only settings' do
           case button_effect
           when :shows_confirmation_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
             expect(page).to have_content 'Application settings saved successfully'
           end

ee/spec/features/groups/group_settings_spec.rb

@@ -508,7 +508,7 @@ RSpec.describe 'Edit group settings' do
           fill_in_new_user_signups_cap(new_user_signups_cap_value)
 
           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
 

locale/gitlab.pot

@@ -4243,12 +4243,15 @@ msgstr ""
 msgid "ApplicationSettings|Approve users in the pending approval status?"
 msgstr ""
 
-msgid "ApplicationSettings|By making this change, you will automatically approve %d user with the pending approval status."
-msgid_plural "ApplicationSettings|By making this change, you will automatically approve %d users with the pending approval status."
+msgid "ApplicationSettings|Approve users who are pending approval?"
+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[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 ""
 
 msgid "ApplicationSettings|Denied domains for sign-ups"