Merge branch '300639-audit-events-review-ui-text' into 'master'

Review and revise Audit Events UI text

See merge request gitlab-org/gitlab!60703

ee/app/views/admin/audit_logs/index.html.haml

 - page_title _('Audit Events')
 
+%h3.page-title= _('Instance audit events')
+%p.light
+  = _('Track important events in your GitLab instance.')
+  = link_to _('What are instance audit events?'), help_page_path('administration/audit_events.md', anchor: 'instance-events'), target: '_blank', rel: 'noopener noreferrer'
+
 #js-audit-log-app{ data: { form_path: admin_audit_logs_path,
   events: @events.to_json,
   is_last_page: @is_last_page.to_json,

ee/app/views/groups/audit_events/index.html.haml

 - page_title _('Audit Events')
 
-%h3.page-title= _('Group Audit Events')
-%p.light= _('Group-level events in %{group_name} (no project-level events)') % { group_name: @group.name }
+%h3.page-title= _('Group audit events')
+%p.light
+  = _("Track important events in your group.")
+  = link_to _('What are group audit events?'), help_page_path('administration/audit_events.md', anchor: 'group-events'), target: '_blank', rel: 'noopener noreferrer'
 
 #js-group-audit-events-app{ data: { form_path: group_audit_events_path(@group),
   events: @events.to_json,

ee/app/views/projects/audit_events/index.html.haml

@@ -3,9 +3,10 @@
 
 - if feature_available
   %h3.page-title
-    = _('Project Audit Events')
+    = _('Project audit events')
   %p.light
-    = _('Events in %{project_path}') % { project_path: @project.full_path }
+    = _('Track important events in your project.')
+    = link_to _('What are project audit events?'), help_page_path('administration/audit_events.md', anchor: 'project-events'), target: '_blank', rel: 'noopener noreferrer'
 
   #js-project-audit-events-app{ data: { form_path: project_audit_events_path(@project),
   events: @events.to_json,

ee/spec/features/projects/audit_events_spec.rb

@@ -60,10 +60,10 @@ RSpec.describe 'Projects > Audit Events', :js do
       expect(page).to have_link('Audit Events')
     end
 
-    it 'does not have Project Audit Events in the header' do
+    it 'does not have Project audit events in the header' do
       visit project_audit_events_path(project)
 
-      expect(page).not_to have_content('Project Audit Events')
+      expect(page).not_to have_content('Project audit events')
     end
   end
 
@@ -73,10 +73,10 @@ RSpec.describe 'Projects > Audit Events', :js do
     expect(page).to have_link('Audit Events')
   end
 
-  it 'has Project Audit Events in the header' do
+  it 'has Project audit events in the header' do
     visit project_audit_events_path(project)
 
-    expect(page).to have_content('Project Audit Events')
+    expect(page).to have_content('Project audit events')
   end
 
   describe 'adding an SSH key' do

locale/gitlab.pot

@@ -12979,9 +12979,6 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-msgid "Events in %{project_path}"
-msgstr ""
-
 msgid "Every %{action} attempt has failed: %{job_error_message}. Please try again."
 msgstr ""
 
@@ -15253,9 +15250,6 @@ msgstr ""
 msgid "Group %{group_name} was successfully created."
 msgstr ""
 
-msgid "Group Audit Events"
-msgstr ""
-
 msgid "Group Git LFS status:"
 msgstr ""
 
@@ -15286,6 +15280,9 @@ msgstr ""
 msgid "Group applications"
 msgstr ""
 
+msgid "Group audit events"
+msgstr ""
+
 msgid "Group avatar"
 msgstr ""
 
@@ -15394,9 +15391,6 @@ msgstr ""
 msgid "Group was successfully updated."
 msgstr ""
 
-msgid "Group-level events in %{group_name} (no project-level events)"
-msgstr ""
-
 msgid "Group: %{group_name}"
 msgstr ""
 
@@ -17377,6 +17371,9 @@ msgstr ""
 msgid "Instance administrators group already exists"
 msgstr ""
 
+msgid "Instance audit events"
+msgstr ""
+
 msgid "Instance overview"
 msgstr ""
 
@@ -25208,9 +25205,6 @@ msgstr ""
 msgid "Project Access Tokens"
 msgstr ""
 
-msgid "Project Audit Events"
-msgstr ""
-
 msgid "Project Badges"
 msgstr ""
 
@@ -25238,6 +25232,9 @@ msgstr ""
 msgid "Project and wiki repositories"
 msgstr ""
 
+msgid "Project audit events"
+msgstr ""
+
 msgid "Project avatar"
 msgstr ""
 
@@ -34189,6 +34186,15 @@ msgstr ""
 msgid "Track groups of issues that share a theme, across projects and milestones"
 msgstr ""
 
+msgid "Track important events in your GitLab instance."
+msgstr ""
+
+msgid "Track important events in your group."
+msgstr ""
+
+msgid "Track important events in your project."
+msgstr ""
+
 msgid "Track time with quick actions"
 msgstr ""
 
@@ -36550,6 +36556,15 @@ msgstr ""
 msgid "Welcome, %{name}!"
 msgstr ""
 
+msgid "What are group audit events?"
+msgstr ""
+
+msgid "What are instance audit events?"
+msgstr ""
+
+msgid "What are project audit events?"
+msgstr ""
+
 msgid "What are you searching for?"
 msgstr ""