Merge branch '65427-improve-system-notes-for-zoom-links-ee' into 'master'

EE Port:  Resolve "Improve system notes for Zoom links"

See merge request gitlab-org/gitlab-ee!15454

app/services/system_note_service.rb

@@ -598,11 +598,11 @@ module SystemNoteService
   end
 
   def zoom_link_added(issue, project, author)
-    create_note(NoteSummary.new(issue, project, author, _('a Zoom call was added to this issue'), action: 'pinned_embed'))
+    create_note(NoteSummary.new(issue, project, author, _('added a Zoom call to this issue'), action: 'pinned_embed'))
   end
 
   def zoom_link_removed(issue, project, author)
-    create_note(NoteSummary.new(issue, project, author, _('a Zoom call was removed from this issue'), action: 'pinned_embed'))
+    create_note(NoteSummary.new(issue, project, author, _('removed a Zoom call from this issue'), action: 'pinned_embed'))
   end
 
   private

changelogs/unreleased/65427-improve-system-notes-for-zoom-links.yml

+---
+title: Improve system notes for Zoom links
+merge_request: 31410
+author: Jacopo Beschi @jacopo-beschi
+type: changed

locale/gitlab.pot

@@ -17629,18 +17629,15 @@ msgstr ""
 msgid "Your request for access has been queued for review."
 msgstr ""
 
-msgid "a Zoom call was added to this issue"
-msgstr ""
-
-msgid "a Zoom call was removed from this issue"
-msgstr ""
-
 msgid "a deleted user"
 msgstr ""
 
 msgid "added %{created_at_timeago}"
 msgstr ""
 
+msgid "added a Zoom call to this issue"
+msgstr ""
+
 msgid "ago"
 msgstr ""
 
@@ -18595,6 +18592,9 @@ msgstr ""
 msgid "remove weight"
 msgstr ""
 
+msgid "removed a Zoom call from this issue"
+msgstr ""
+
 msgid "rendered diff"
 msgstr ""
 

spec/services/issues/update_service_spec.rb

@@ -229,10 +229,10 @@ describe Issues::UpdateService, :mailer do
     it 'creates zoom_link_added system note when a zoom link is added to the description' do
       update_issue(description: 'Changed description https://zoom.us/j/5873603787')
 
-      note = find_note('a Zoom call was added')
+      note = find_note('added a Zoom call')
 
       expect(note).not_to be_nil
-      expect(note.note).to eq('a Zoom call was added to this issue')
+      expect(note.note).to eq('added a Zoom call to this issue')
     end
 
     context 'when issue turns confidential' do

spec/services/system_note_service_spec.rb

@@ -521,7 +521,7 @@ describe SystemNoteService do
     end
 
     it 'sets the zoom link added note text' do
-      expect(subject.note).to eq('a Zoom call was added to this issue')
+      expect(subject.note).to eq('added a Zoom call to this issue')
     end
   end
 
@@ -533,7 +533,7 @@ describe SystemNoteService do
     end
 
     it 'sets the zoom link removed note text' do
-      expect(subject.note).to eq('a Zoom call was removed from this issue')
+      expect(subject.note).to eq('removed a Zoom call from this issue')
     end
   end