Ticket #31966: 31966.patch

src/wp-admin/includes/class-wp-posts-list-table.php

@@ -164 +164 @@
         }
 
         protected function get_views() {
-                global $locked_post_status, $avail_post_stati;
+                global $locked_post_status, $avail_post_stati, $post_type_object;
 
                 $post_type = $this->screen->post_type;
 
@@ -181 +181 @@
                 if ( $this->user_posts_count ) {
                         if ( isset( $_GET['author'] ) && ( $_GET['author'] == $current_user_id ) )
                                 $class = ' class="current"';
-                        $status_links['mine'] = "<a href='edit.php?post_type=$post_type&author=$current_user_id'$class>" . sprintf( _nx( 'Mine <span class="count">(%s)</span>', 'Mine <span class="count">(%s)</span>', $this->user_posts_count, 'posts' ), number_format_i18n( $this->user_posts_count ) ) . '</a>';
+                        $status_links['mine'] = "<a href='edit.php?post_type=$post_type&author=$current_user_id'$class>" . sprintf( _nx( '<span class="screen-reader-text">Show ' . $this->_args['plural'] . ' that are </span>Mine <span class="count">(%s)</span>', '<span class="screen-reader-text">Show ' . $this->_args['plural'] . ' that are </span>Mine <span class="count">(%s)</span>', $this->user_posts_count, 'posts' ), number_format_i18n( $this->user_posts_count ) ) . '</a>';
                         $allposts = '&all_posts=1';
                         $class = '';
                 }
@@ -198 +198 @@
 
                 $all_inner_html = sprintf(
                         _nx(
-                                'All <span class="count">(%s)</span>',
-                                'All <span class="count">(%s)</span>',
+                                '<span class="screen-reader-text">Show</span> All <span class="screen-reader-text">' . $this->_args['plural'] . '</span><span class="count"> (%s)</span>',
+                                '<span class="screen-reader-text">Show</span> All <span class="screen-reader-text">' . $this->_args['plural'] . '</span><span class="count"> (%s)</span>',
                                 $total_posts,
                                 'posts'
                         ),
@@ -222 +222 @@
                         if ( isset($_REQUEST['post_status']) && $status_name == $_REQUEST['post_status'] )
                                 $class = ' class="current"';
 
-                        $status_links[$status_name] = "<a href='edit.php?post_status=$status_name&amp;post_type=$post_type'$class>" . sprintf( translate_nooped_plural( $status->label_count, $num_posts->$status_name ), number_format_i18n( $num_posts->$status_name ) ) . '</a>';
+                        $status_links[$status_name] = "<a href='edit.php?post_status=$status_name&amp;post_type=$post_type'$class>" . sprintf( translate_nooped_plural( $status->label_count, $num_posts->$status_name ), $post_type_object->labels->name, number_format_i18n( $num_posts->$status_name ) ) . '</a>';
                 }
 
                 if ( ! empty( $this->sticky_posts_count ) ) {
                         $class = ! empty( $_REQUEST['show_sticky'] ) ? ' class="current"' : '';
 
-                        $sticky_link = array( 'sticky' => "<a href='edit.php?post_type=$post_type&amp;show_sticky=1'$class>" . sprintf( _nx( 'Sticky <span class="count">(%s)</span>', 'Sticky <span class="count">(%s)</span>', $this->sticky_posts_count, 'posts' ), number_format_i18n( $this->sticky_posts_count ) ) . '</a>' );
+                        $sticky_link = array( 'sticky' => "<a href='edit.php?post_type=$post_type&amp;show_sticky=1'$class>" . sprintf( _nx( '<span class="screen-reader-text">Show</span> Sticky <span class="screen-reader-text">' . $post_type_object->labels->name . '</span><span class="count"> (%s)</span>', '<span class="screen-reader-text">Show</span> Sticky <span class="screen-reader-text">' . $post_type_object->labels->name . '</span><span class="count"> (%s)</span>', $this->sticky_posts_count, 'posts' ), number_format_i18n( $this->sticky_posts_count ) ) . '</a>' );
 
                         // Sticky comes after Publish, or if not listed, after All.
                         $split = 1 + array_search( ( isset( $status_links['publish'] ) ? 'publish' : 'all' ), array_keys( $status_links ) );

src/wp-includes/post.php

@@ -112 +112 @@
                 'label'       => _x( 'Published', 'post' ),
                 'public'      => true,
                 '_builtin'    => true, /* internal use only. */
-                'label_count' => _n_noop( 'Published <span class="count">(%s)</span>', 'Published <span class="count">(%s)</span>' ),
+                'label_count' => _n_noop( '<span class="screen-reader-text">Show</span> Published <span class="screen-reader-text">%s</span><span class="count"> (%s)</span>', 
+                                                                  '<span class="screen-reader-text">Show</span> Published <span class="screen-reader-text">%s</span><span class="count"> (%s)</span>' ),
         ) );
 
         register_post_status( 'future', array(
@@ -119 +120 @@
                 'label'       => _x( 'Scheduled', 'post' ),
                 'protected'   => true,
                 '_builtin'    => true, /* internal use only. */
-                'label_count' => _n_noop('Scheduled <span class="count">(%s)</span>', 'Scheduled <span class="count">(%s)</span>' ),
+                'label_count' => _n_noop('<span class="screen-reader-text">Show</span> Scheduled <span class="screen-reader-text">%s</span><span class="count"> (%s)</span>', 
+                                                                 '<span class="screen-reader-text">Show</span> Scheduled <span class="screen-reader-text">%s</span><span class="count"> (%s)</span>' ),
         ) );
 
         register_post_status( 'draft', array(
@@ -126 +128 @@
                 'label'       => _x( 'Draft', 'post' ),
                 'protected'   => true,
                 '_builtin'    => true, /* internal use only. */
-                'label_count' => _n_noop( 'Draft <span class="count">(%s)</span>', 'Drafts <span class="count">(%s)</span>' ),
+                'label_count' => _n_noop( '<span class="screen-reader-text">Show</span> Draft <span class="screen-reader-text">%s</span><span class="count"> (%s)</span>',
+                                                                  '<span class="screen-reader-text">Show</span> Draft <span class="screen-reader-text">%s</span><span class="count"> (%s)</span>' ),
         ) );
 
         register_post_status( 'pending', array(
@@ -133 +136 @@
                 'label'       => _x( 'Pending', 'post' ),
                 'protected'   => true,
                 '_builtin'    => true, /* internal use only. */
-                'label_count' => _n_noop( 'Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>' ),
+                'label_count' => _n_noop( '<span class="screen-reader-text">Show</span> Pending <span class="screen-reader-text">%s</span><span class="count"> (%s)</span>',
+                                                                  '<span class="screen-reader-text">Show</span> Pending <span class="screen-reader-text">%s</span><span class="count"> (%s)</span>' ),
         ) );
 
         register_post_status( 'private', array(
@@ -140 +144 @@
                 'label'       => _x( 'Private', 'post' ),
                 'private'     => true,
                 '_builtin'    => true, /* internal use only. */
-                'label_count' => _n_noop( 'Private <span class="count">(%s)</span>', 'Private <span class="count">(%s)</span>' ),
+                'label_count' => _n_noop( '<span class="screen-reader-text">Show</span> Private <span class="screen-reader-text">%s</span><span class="count"> (%s)</span>',
+                                                                  '<span class="screen-reader-text">Show</span> Private <span class="screen-reader-text">%s</span><span class="count"> (%s)</span>' ),
         ) );
 
         register_post_status( 'trash', array(
@@ -147 +152 @@
                 'label'       => _x( 'Trash', 'post' ),
                 'internal'    => true,
                 '_builtin'    => true, /* internal use only. */
-                'label_count' => _n_noop( 'Trash <span class="count">(%s)</span>', 'Trash <span class="count">(%s)</span>' ),
+                'label_count' => _n_noop( '<span class="screen-reader-text">Show</span> Trash <span class="screen-reader-text">%s</span><span class="count"> (%s)</span>',
+                                                                  '<span class="screen-reader-text">Show</span> Trash <span class="screen-reader-text">%s</span><span class="count"> (%s)</span>' ),
                 'show_in_admin_status_list' => true,
         ) );