Merge branch 'led/update-usercap-banner-write-up' into 'master'

Update user cap banner write up

See merge request gitlab-org/gitlab!77948

ee/app/views/shared/_namespace_user_cap_reached_alert.html.haml

@@ -20,7 +20,7 @@
       = sprite_icon('close', css_class: 'gl-icon')
 
     .gl-alert-body
-      = s_('NamespaceUserCap|Pending users must be reviewed and approved by a group owner. Learn more about %{user_caps_link_start}User Caps%{link_end} and %{users_pending_approval_link_start}Users Pending Approval%{link_end}.').html_safe % { user_caps_link_start: user_caps_link_start, users_pending_approval_link_start: users_pending_approval_link_start, link_end: link_end }
+      = s_('NamespaceUserCap|Pending users must be reviewed and approved by a group owner. Learn more about %{user_caps_link_start}user caps%{link_end} and %{users_pending_approval_link_start}users pending approval%{link_end}.').html_safe % { user_caps_link_start: user_caps_link_start, users_pending_approval_link_start: users_pending_approval_link_start, link_end: link_end }
 
     .gl-alert-actions
-      = link_to(s_('NamespaceUserCap|View pending user approvals'), pending_users_link, class: "btn gl-alert-action btn-md gl-button btn-confirm")
+      = link_to(s_('NamespaceUserCap|View pending approvals'), pending_users_link, class: "btn gl-alert-action btn-md gl-button btn-confirm")

ee/spec/views/shared/_namespace_user_cap_reached_alert.html.haml_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe 'shared/namespace_user_cap_reached_alert', :use_clean_rails_memor
 
     render partial
 
-    expect(rendered).to have_link('View pending user approvals', href: pending_members_group_usage_quotas_path(group))
+    expect(rendered).to have_link('View pending approvals', href: pending_members_group_usage_quotas_path(group))
   end
 
   it 'renders a link to the root namespace pending user approvals' do
@@ -38,7 +38,7 @@ RSpec.describe 'shared/namespace_user_cap_reached_alert', :use_clean_rails_memor
 
     render partial
 
-    expect(rendered).to have_link('View pending user approvals', href: pending_members_group_usage_quotas_path(group))
+    expect(rendered).to have_link('View pending approvals', href: pending_members_group_usage_quotas_path(group))
   end
 
   it 'renders a link to the project namespace pending user approvals' do
@@ -47,7 +47,7 @@ RSpec.describe 'shared/namespace_user_cap_reached_alert', :use_clean_rails_memor
 
     render partial
 
-    expect(rendered).to have_link('View pending user approvals', href: pending_members_group_usage_quotas_path(project.namespace))
+    expect(rendered).to have_link('View pending approvals', href: pending_members_group_usage_quotas_path(project.namespace))
   end
 
   def stub_cache(group)

locale/gitlab.pot

@@ -23352,10 +23352,10 @@ msgstr ""
 msgid "NamespaceStorageSize|push to your repository, create pipelines, create issues or add comments. To reduce storage capacity, delete unused repositories, artifacts, wikis, issues, and pipelines."
 msgstr ""
 
-msgid "NamespaceUserCap|Pending users must be reviewed and approved by a group owner. Learn more about %{user_caps_link_start}User Caps%{link_end} and %{users_pending_approval_link_start}Users Pending Approval%{link_end}."
+msgid "NamespaceUserCap|Pending users must be reviewed and approved by a group owner. Learn more about %{user_caps_link_start}user caps%{link_end} and %{users_pending_approval_link_start}users pending approval%{link_end}."
 msgstr ""
 
-msgid "NamespaceUserCap|View pending user approvals"
+msgid "NamespaceUserCap|View pending approvals"
 msgstr ""
 
 msgid "NamespaceUserCap|Your group has reached its billable member limit"