Changeset 44668

Timestamp:

01/21/2019 05:35:00 PM (6 years ago)

Author:

desrosj

Message:

Privacy: Include request counts inline with the filters in the list table views.

Fixes $44952
Props eArtboard, pratikkry, birgire, garrett-eclipse.

Location:

trunk/src

Files:

• wp-admin/includes/user.php (modified) (1 diff)
• wp-includes/post.php (modified) (4 diffs)

trunk/src/wp-admin/includes/user.php

@@ -1165 +1165 @@
         $admin_url      = admin_url( 'tools.php?page=' . $this->request_type );
         $counts         = $this->get_request_counts();
+        $total_requests = absint( array_sum( (array) $counts ) );
 
         $current_link_attributes = empty( $current_status ) ? ' class="current" aria-current="page"' : '';
-        $views['all']            = '<a href="' . esc_url( $admin_url ) . "\" $current_link_attributes>" . esc_html__( 'All' ) . ' <span class="count">(' . absint( array_sum( (array) $counts ) ) . ')</span></a>';
+        $views['all']            = '<a href="' . esc_url( $admin_url ) . "\" $current_link_attributes>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%d)</span>', $total_requests, 'requests' ), number_format_i18n( $total_requests ) ) . '</a>';
 
         foreach ( $statuses as $status => $label ) {
             $current_link_attributes = $status === $current_status ? ' class="current" aria-current="page"' : '';
-            $views[ $status ]        = '<a href="' . esc_url( add_query_arg( 'filter-status', $status, $admin_url ) ) . "\" $current_link_attributes>" . esc_html( $label ) . ' <span class="count">(' . absint( $counts->$status ) . ')</span></a>';
+            $total_status_requests   = absint( $counts->$status );
+            $views[ $status ]        = '<a href="' . esc_url( add_query_arg( 'filter-status', $status, $admin_url ) ) . "\" $current_link_attributes>" . sprintf( _nx( '%1$s <span class="count">(%2$d)</span>', '%1$s <span class="count">(%2$d)</span>', $total_status_requests, 'requests' ), esc_html( $label ), number_format_i18n( $total_status_requests ) ) . '</a>';
         }
 

trunk/src/wp-includes/post.php

@@ -392 +392 @@
             'internal'            => true,
             '_builtin'            => true, /* internal use only. */
+            'label_count'         => _n_noop( 'Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>' ),
             'exclude_from_search' => false,
         )
@@ -402 +403 @@
             'internal'            => true,
             '_builtin'            => true, /* internal use only. */
+            'label_count'         => _n_noop( 'Confirmed <span class="count">(%s)</span>', 'Confirmed <span class="count">(%s)</span>' ),
             'exclude_from_search' => false,
         )
@@ -412 +414 @@
             'internal'            => true,
             '_builtin'            => true, /* internal use only. */
+            'label_count'         => _n_noop( 'Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>' ),
             'exclude_from_search' => false,
         )
@@ -422 +425 @@
             'internal'            => true,
             '_builtin'            => true, /* internal use only. */
+            'label_count'         => _n_noop( 'Completed <span class="count">(%s)</span>', 'Completed <span class="count">(%s)</span>' ),
             'exclude_from_search' => false,
         )