Ticket #26066: 26066.diff

wp-admin/includes/dashboard.php

@@ -180 +180 @@
         <ul>
         <?php
         do_action( 'rightnow_list_start' );
-        // Using show_in_nav_menus as my arg for grabbing what post types should show, is there better?
+
         $post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'objects' );
         $post_types = (array) apply_filters( 'rightnow_post_types', $post_types );
         foreach ( $post_types as $post_type => $post_type_obj ){
                 $num_posts = wp_count_posts( $post_type );
                 if ( $num_posts && $num_posts->publish ) {
                         printf(
-                                '<li class="%1$s-count"><a href="edit.php?post_type=%1$s">%2$s %3$s</a></li>',
+                                '<li class="%1$s-count"><a href="edit.php?post_type=%1$s">%2$s</a></li>',
                                 $post_type,
-                                number_format_i18n( $num_posts->publish ),
-                                $post_type_obj->label
+                                sprintf( translate_nooped_plural( $post_type_obj->labels->num_items, $num_posts->publish ), number_format_i18n( $num_posts->publish ) )
                         );
                 }
         }

wp-includes/post.php

@@ -1490 +1490 @@
                 'not_found' => array( __('No posts found.'), __('No pages found.') ),
                 'not_found_in_trash' => array( __('No posts found in Trash.'), __('No pages found in Trash.') ),
                 'parent_item_colon' => array( null, __('Parent Page:') ),
-                'all_items' => array( __( 'All Posts' ), __( 'All Pages' ) )
+                'all_items' => array( __( 'All Posts' ), __( 'All Pages' ) ),
+                'num_items' => array( _n_noop( '%s post', '%s posts' ), _n_noop( '%s page', '%s pages' ) ),
         );
         $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];