diff --git a/wp-admin/edit.php b/wp-admin/edit.php index 74b86ff863..de315dc795 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -31,6 +31,9 @@ $posts_columns = wp_manage_posts_columns(); if ( is_single() ) { printf(__('Comments on %s'), apply_filters( "the_title", $post->post_title)); } else { + $post_status_label = _c('Posts|manage posts header'); + if ( isset($_GET['post_status']) && in_array( $_GET['post_status'], array_keys($post_stati) ) ) + $post_status_label = $post_stati[$_GET['post_status']][1]; if ( $post_listing_pageable && !is_archive() && !is_search() ) $h2_noun = is_paged() ? sprintf(__( 'Previous %s' ), $post_status_label) : sprintf(__('Latest %s'), $post_status_label); else @@ -68,7 +71,7 @@ foreach ( $post_stati as $status => $label ) { $class = ' class="current"'; $status_links[] = "
  • " . - sprintf($label[1], $num_posts) . ''; + sprintf($label[2], $num_posts) . ''; } $class = empty($_GET['post_status']) ? ' class="current"' : ''; $status_links[] = "
  • All Posts"; diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php index 9fd30e6e70..13e4ee5207 100644 --- a/wp-admin/includes/post.php +++ b/wp-admin/includes/post.php @@ -488,21 +488,18 @@ function wp_edit_posts_query( $q = false ) { $q['m'] = (int) $q['m']; $q['cat'] = (int) $q['cat']; $post_stati = array( // array( adj, noun ) - 'publish' => array(__('Published'), __('Published (%s)')), - 'future' => array(__('Scheduled'), __('Scheduled (5s)')), - 'pending' => array(__('Pending Review'), __('Pending Review (%s)')), - 'draft' => array(__('Draft'), _c('Draft (%s)|manage posts header')), - 'private' => array(__('Private'), __('Private (%s)')) + 'publish' => array(__('Published'), __('Published posts'), __('Published (%s)')), + 'future' => array(__('Scheduled'), __('Scheduled posts'), __('Scheduled (%s)')), + 'pending' => array(__('Pending Review'), __('Pending posts'), __('Pending Review (%s)')), + 'draft' => array(__('Draft'), _c('Drafts|manage posts header'), _c('Draft (%s)|manage posts header')), + 'private' => array(__('Private'), __('Private posts'), __('Private (%s)')) ); $avail_post_stati = $wpdb->get_col("SELECT DISTINCT post_status FROM $wpdb->posts WHERE post_type = 'post'"); $post_status_q = ''; - $post_status_label = _c('Posts|manage posts header'); - if ( isset($q['post_status']) && in_array( $q['post_status'], array_keys($post_stati) ) ) { - $post_status_label = $post_stati[$q['post_status']][1]; + if ( isset($q['post_status']) && in_array( $q['post_status'], array_keys($post_stati) ) ) $post_status_q = '&post_status=' . $q['post_status']; - } if ( 'pending' === $q['post_status'] ) { $order = 'ASC';