Ticket #15576: 15576.3.patch

wp-admin/edit-tags.php

@@ -42 +42 @@
         $submenu_file = "edit-tags.php?taxonomy=$taxonomy";
 }
 
-add_screen_option( 'per_page', array('label' => $title, 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page') );
+add_screen_option( 'per_page', array( 'label' => $tax->labels->per_page, 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page' ) );
 
 switch ( $wp_list_table->current_action() ) {
 

wp-admin/edit.php

@@ -186 +186 @@
         );
 }
 
-add_screen_option( 'per_page', array('label' => $title, 'default' => 20) );
+add_screen_option( 'per_page', array( 'label' => $post_type_object->labels->per_page, 'default' => 20 ) );
 
 require_once('./admin-header.php');
 ?>

wp-includes/post.php

@@ -1172 +1172 @@
  * - parent_item_colon - This string isn't used on non-hierarchical types. In hierarchical ones the default is Parent Page:
  * - all_items - String for the submenu. Default is All Posts/All Pages
  * - menu_name - Default is the same as <code>name</code>
+ * - per_page - Name for use in Screen Options. Default is the same as <code>name</code>
  *
  * Above, the first default value is for non-hierarchical post types (like posts) and the second one is for hierarchical post types (like pages).
  *
@@ -1192 +1193 @@
                 '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:') ),
+                'per_page' => array( _x( 'Posts', 'posts per page (screen options)' ), _x( 'Pages', 'pages per page (screen options)' ) ),
                 'all_items' => array( __( 'All Posts' ), __( 'All Pages' ) )
         );
         $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
@@ -1218 +1220 @@
         if ( !isset( $object->labels['menu_name'] ) && isset( $object->labels['name'] ) )
                 $object->labels['menu_name'] = $object->labels['name'];
 
+        if ( !isset( $object->labels['per_page'] ) && isset( $object->labels['name'] ) )
+                $object->labels['per_page'] = $object->labels['name'];
+
         if ( !isset( $object->labels['all_items'] ) && isset( $object->labels['menu_name'] ) )
                 $object->labels['all_items'] = $object->labels['menu_name'];
 

wp-includes/taxonomy.php

@@ -385 +385 @@
  * - separate_items_with_commas - This string isn't used on hierarchical taxonomies. Default is "Separate tags with commas," used in the meta box.
  * - add_or_remove_items - This string isn't used on hierarchical taxonomies. Default is "Add or remove tags," used in the meta box when JavaScript is disabled.
  * - choose_from_most_used - This string isn't used on hierarchical taxonomies. Default is "Choose from the most used tags," used in the meta box.
+ * - per_page - Name for use in Screen Options. Default is the same as <code>name</code>
  *
  * Above, the first default value is for non-hierarchical taxonomies (like tags) and the second one is for hierarchical taxonomies (like categories.)
  *
@@ -413 +414 @@
                 'separate_items_with_commas' => array( __( 'Separate tags with commas' ), null ),
                 'add_or_remove_items' => array( __( 'Add or remove tags' ), null ),
                 'choose_from_most_used' => array( __( 'Choose from the most used tags' ), null ),
+                'per_page' => array( _x( 'Tags', 'tags per page (screen options)' ), _x( 'Categories', 'categories per page (screen options)' ) ),
         );
         $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];