Merge branch 'mycroft-note-badge' into 'master'

Revise tooltip text of note role badge

Closes #251092

See merge request gitlab-org/gitlab!42771

app/assets/javascripts/notes/components/note_actions.vue

@@ -160,7 +160,7 @@ export default {
       });
     },
     displayMemberBadgeText() {
-      return sprintf(__('This user is a %{access} of the %{name} project.'), {
+      return sprintf(__('This user has the %{access} role in the %{name} project.'), {
         access: this.accessLevel.toLowerCase(),
         name: this.projectName,
       });

app/helpers/issuables_helper.rb

@@ -206,7 +206,7 @@ module IssuablesHelper
     end
 
     if access = project.team.human_max_access(issuable.author_id)
-      output << content_tag(:span, access, class: "user-access-role has-tooltip d-none d-xl-inline-block gl-ml-3 ", title: _("This user is a %{access} of the %{name} project.") % { access: access.downcase, name: project.name })
+      output << content_tag(:span, access, class: "user-access-role has-tooltip d-none d-xl-inline-block gl-ml-3 ", title: _("This user has the %{access} role in the %{name} project.") % { access: access.downcase, name: project.name })
     elsif project.team.contributor?(issuable.author_id)
       output << content_tag(:span, _("Contributor"), class: "user-access-role has-tooltip d-none d-xl-inline-block gl-ml-3", title: _("This user has previously committed to the %{name} project.") % { name: project.name })
     end

app/views/projects/notes/_actions.html.haml

@@ -2,7 +2,7 @@
 - if note.noteable_author?(@noteable)
   %span{ class: 'note-role user-access-role has-tooltip d-none d-md-inline-block', title: _("This user is the author of this %{noteable}.") % { noteable: @noteable.human_class_name } }= _("Author")
 - if access
-  %span{ class: 'note-role user-access-role has-tooltip', title: _("This user is a %{access} of the %{name} project.") % { access: access.downcase, name: note.project_name } }= access
+  %span{ class: 'note-role user-access-role has-tooltip', title: _("This user has the %{access} role in the %{name} project.") % { access: access.downcase, name: note.project_name } }= access
 - elsif note.contributor?
   %span{ class: 'note-role user-access-role has-tooltip', title: _("This user has previously committed to the %{name} project.") % { name: note.project_name } }= _("Contributor")
 

changelogs/unreleased/revise-tooltip-text-of-note-role-badge.yml

+---
+title: Revise tooltip text of note role badge
+merge_request: 42771
+author: Mycroft Kang @TaehyeokKang
+type: Bug fix

locale/gitlab.pot

@@ -26293,7 +26293,7 @@ msgstr ""
 msgid "This user has previously committed to the %{name} project."
 msgstr ""
 
-msgid "This user is a %{access} of the %{name} project."
+msgid "This user has the %{access} role in the %{name} project."
 msgstr ""
 
 msgid "This user is the author of this %{noteable}."