Merge branch 'fox-comment-icons-commits' into 'master'

Use sprite_icon for comment icons on Commits

See merge request gitlab-org/gitlab!31696

app/helpers/notes_helper.rb

@@ -61,8 +61,8 @@ module NotesHelper
       class: 'add-diff-note js-add-diff-note-button',
       type: 'submit', name: 'button',
       data: diff_view_line_data(line_code, position, line_type),
-      title: 'Add a comment to this line' do
-      icon('comment-o')
+      title: _('Add a comment to this line') do
+      sprite_icon('comment', size: 12)
     end
   end
 

app/views/projects/commit/_commit_box.html.haml

@@ -22,8 +22,8 @@
 
   .header-action-buttons
     - if defined?(@notes_count) && @notes_count > 0
-      %span.btn.disabled.btn-grouped.d-none.d-sm-block.append-right-10
-        = icon('comment')
+      %span.btn.disabled.btn-grouped.d-none.d-sm-block.append-right-10.has-tooltip{ title: n_("%d comment on this commit", "%d comments on this commit", @notes_count) % @notes_count }
+        = sprite_icon('comment')
         = @notes_count
     = link_to project_tree_path(@project, @commit), class: "btn btn-default append-right-10 d-none d-sm-none d-md-inline" do
       #{ _('Browse files') }

app/views/projects/diffs/_file.html.haml

@@ -14,7 +14,7 @@
       .file-actions.d-none.d-sm-block
         - if blob&.readable_text?
           = link_to '#', class: 'js-toggle-diff-comments btn active has-tooltip', title: _("Toggle comments for this file"), disabled: @diff_notes_disabled do
-            = icon('comment')
+            = sprite_icon('comment', size: 16)
           \
           - if editable_diff?(diff_file)
             - link_opts = @merge_request.persisted? ? { from_merge_request_iid: @merge_request.iid } : {}

changelogs/unreleased/fox-comment-icons-commits.yml

+---
+title: Use sprites for comment icons on Commits
+merge_request: 31696
+author:
+type: changed

locale/gitlab.pot

@@ -96,6 +96,11 @@ msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "%d comment on this commit"
+msgid_plural "%d comments on this commit"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "%d commit"
 msgid_plural "%d commits"
 msgstr[0] ""
@@ -1218,6 +1223,9 @@ msgstr ""
 msgid "Add a bullet list"
 msgstr ""
 
+msgid "Add a comment to this line"
+msgstr ""
+
 msgid "Add a general comment to this %{noteableDisplayName}."
 msgstr ""