From d7a59c466149b96e8b5fd7d54ea0e5bb94249b11 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Thu, 24 Sep 2015 17:56:50 +0000 Subject: [PATCH] Comments List Table: include count for "All". Dynamically update. Fixes #17275. git-svn-id: https://develop.svn.wordpress.org/trunk@34506 602fd350-edb4-49c9-b593-d223f7449a82 --- .../includes/class-wp-comments-list-table.php | 73 ++++++++++--------- src/wp-admin/js/edit-comments.js | 2 + 2 files changed, 42 insertions(+), 33 deletions(-) diff --git a/src/wp-admin/includes/class-wp-comments-list-table.php b/src/wp-admin/includes/class-wp-comments-list-table.php index 004329637b..ebc755167b 100644 --- a/src/wp-admin/includes/class-wp-comments-list-table.php +++ b/src/wp-admin/includes/class-wp-comments-list-table.php @@ -204,40 +204,47 @@ class WP_Comments_List_Table extends WP_List_Table { //, number_format_i18n($num_comments->moderated) ), "" . number_format_i18n($num_comments->moderated) . ""), //, number_format_i18n($num_comments->spam) ), "" . number_format_i18n($num_comments->spam) . "") $stati = array( - 'all' => _nx_noop( 'All', 'All', 'comments' ), // singular not used - 'moderated' => str_replace( '%s', '%s', - /* translators: %s: pending comments count */ - _nx_noop( - 'Pending (%s)', - 'Pending (%s)', - 'comments' - ) - ), - 'approved' => str_replace( '%s', '%s', - /* translators: %s: approved comments count */ - _nx_noop( - 'Approved (%s)', - 'Approved (%s)', - 'comments' - ) - ), - 'spam' => str_replace( '%s', '%s', - /* translators: %s: spam comments count */ - _nx_noop( - 'Spam (%s)', - 'Spam (%s)', - 'comments' - ) - ), - 'trash' => str_replace( '%s', '%s', - /* translators: %s: trashed comments count */ - _nx_noop( - 'Trash (%s)', - 'Trash (%s)', - 'comments' - ) + 'all' => str_replace( '%s', '%s', + /* translators: %s: pending comments count */ + _nx_noop( + 'All (%s)', + 'All (%s)', + 'comments' ) - ); + ), // singular not used + 'moderated' => str_replace( '%s', '%s', + /* translators: %s: pending comments count */ + _nx_noop( + 'Pending (%s)', + 'Pending (%s)', + 'comments' + ) + ), + 'approved' => str_replace( '%s', '%s', + /* translators: %s: approved comments count */ + _nx_noop( + 'Approved (%s)', + 'Approved (%s)', + 'comments' + ) + ), + 'spam' => str_replace( '%s', '%s', + /* translators: %s: spam comments count */ + _nx_noop( + 'Spam (%s)', + 'Spam (%s)', + 'comments' + ) + ), + 'trash' => str_replace( '%s', '%s', + /* translators: %s: trashed comments count */ + _nx_noop( + 'Trash (%s)', + 'Trash (%s)', + 'comments' + ) + ) + ); if ( !EMPTY_TRASH_DAYS ) unset($stati['trash']); diff --git a/src/wp-admin/js/edit-comments.js b/src/wp-admin/js/edit-comments.js index fe2a38b8e1..b92f0e7cc6 100644 --- a/src/wp-admin/js/edit-comments.js +++ b/src/wp-admin/js/edit-comments.js @@ -435,10 +435,12 @@ setCommentsList = function() { if ( pendingDiff ) { updatePending( pendingDiff, commentPostId ); + updateCountText( 'span.all-count', pendingDiff ); } if ( approvedDiff ) { updateApproved( approvedDiff, commentPostId ); + updateCountText( 'span.all-count', approvedDiff ); } if ( spamDiff ) {