Merge pull request #2020 from codidact/0valt/2017/0-more-comments

Author: ArtOfCode-

app/views/comment_threads/_expanded.html.erb

@@ -59,8 +59,9 @@
           <%= render 'comments/skip_deleted', inline: inline, num_skipped: skipped_deleted, thread: thread %>
           <% skipped_deleted = 0 %>
         <% end %>
-        <% if shown_comments_count > max_shown_comments && comment.id.to_i == comment_id.to_i %>
-          <%= render 'comments/skip_more', shown_count: shown_comments_count, thread: thread %>
+        <% skipped_more = thread.reply_count - shown_comments_count %>
+        <% if shown_comments_count > max_shown_comments && skipped_more.positive? && comment.id.to_i == comment_id.to_i %>
+          <%= render 'comments/skip_more', num_skipped: skipped_more, thread: thread %>
         <% end %>
         <div class="widget--body" role="listitem">
           <%= render 'comments/comment', comment: comment, pingable: pingable %>

app/views/comments/_skip_more.html.erb

@@ -2,11 +2,10 @@
     Renders widgets indicating that there more comments are not shown
 
     Variables:
-      shown_count : number of comments shown on the thread
+      num_skipped : number of comments skipped on the thread
       thread      : CommentThread to display the widget for
 %>
 
 <div class="widget--body widget--more-comments" role="listitem">
-  <% skipped_count = thread.reply_count - shown_count %>
-  <p>Skipping <%= pluralize(skipped_count, 'more comment') %></p>
+  <p>Skipping <%= pluralize(num_skipped, 'more comment') %></p>
 </div>