From c7cc7c44fe81151818a4f67e58721c0a68440b53 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 23 Oct 2015 16:47:57 +0000 Subject: [PATCH] After [34891], rename new post type and taxonomy label keys to match the default strings. See #32147. git-svn-id: https://develop.svn.wordpress.org/trunk@35376 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/edit-tags.php | 4 ++-- src/wp-admin/edit.php | 6 +++--- src/wp-includes/post-functions.php | 12 ++++++------ src/wp-includes/taxonomy-functions.php | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/wp-admin/edit-tags.php b/src/wp-admin/edit-tags.php index 748ae176ea..6ff9e37419 100644 --- a/src/wp-admin/edit-tags.php +++ b/src/wp-admin/edit-tags.php @@ -55,8 +55,8 @@ if ( 'post' != $post_type ) { add_screen_option( 'per_page', array( 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page' ) ); get_current_screen()->set_screen_reader_content( array( - 'heading_pagination' => $tax->labels->pagination, - 'heading_list' => $tax->labels->list, + 'heading_pagination' => $tax->labels->items_list_navigation, + 'heading_list' => $tax->labels->items_list, ) ); $location = false; diff --git a/src/wp-admin/edit.php b/src/wp-admin/edit.php index 192b36aeca..62c70e2bc3 100644 --- a/src/wp-admin/edit.php +++ b/src/wp-admin/edit.php @@ -249,9 +249,9 @@ if ( 'post' == $post_type ) { } get_current_screen()->set_screen_reader_content( array( - 'heading_views' => $post_type_object->labels->views, - 'heading_pagination' => $post_type_object->labels->pagination, - 'heading_list' => $post_type_object->labels->list, + 'heading_views' => $post_type_object->labels->filter_items_list, + 'heading_pagination' => $post_type_object->labels->items_list_navigation, + 'heading_list' => $post_type_object->labels->items_list, ) ); add_screen_option( 'per_page', array( 'default' => 20, 'option' => 'edit_' . $post_type . '_per_page' ) ); diff --git a/src/wp-includes/post-functions.php b/src/wp-includes/post-functions.php index d514cea48f..f662691270 100644 --- a/src/wp-includes/post-functions.php +++ b/src/wp-includes/post-functions.php @@ -1330,9 +1330,9 @@ function _post_type_meta_capabilities( $capabilities = null ) { * - remove_featured_image - Default is Remove featured image. * - use_featured_image - Default is Use as featured image. * - menu_name - Default is the same as `name`. - * - views - String for the table views hidden heading. - * - pagination - String for the table pagination hidden heading. - * - list - String for the table hidden heading. + * - filter_items_list - String for the table views hidden heading. + * - items_list_navigation - String for the table pagination hidden heading. + * - items_list - String for the table hidden heading. * * Above, the first default value is for non-hierarchical post types (like posts) * and the second one is for hierarchical post types (like pages). @@ -1367,9 +1367,9 @@ function get_post_type_labels( $post_type_object ) { 'set_featured_image' => array( __( 'Set featured image' ), __( 'Set featured image' ) ), 'remove_featured_image' => array( __( 'Remove featured image' ), __( 'Remove featured image' ) ), 'use_featured_image' => array( __( 'Use as featured image' ), __( 'Use as featured image' ) ), - 'views' => array( __( 'Filter posts list' ), __( 'Filter pages list' ) ), - 'pagination' => array( __( 'Posts list navigation' ), __( 'Pages list navigation' ) ), - 'list' => array( __( 'Posts list' ), __( 'Pages list' ) ), + 'filter_items_list' => array( __( 'Filter posts list' ), __( 'Filter pages list' ) ), + 'items_list_navigation' => array( __( 'Posts list navigation' ), __( 'Pages list navigation' ) ), + 'items_list' => array( __( 'Posts list' ), __( 'Pages list' ) ), ); $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name']; diff --git a/src/wp-includes/taxonomy-functions.php b/src/wp-includes/taxonomy-functions.php index 891951bb9e..9c0425b015 100644 --- a/src/wp-includes/taxonomy-functions.php +++ b/src/wp-includes/taxonomy-functions.php @@ -494,8 +494,8 @@ function register_taxonomy( $taxonomy, $object_type, $args = array() ) { * - 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. * - not_found - Default is "No tags found"/"No categories found", used in the meta box and taxonomy list table. * - no_terms - Default is "No tags"/"No categories", used in the posts and media list tables. - * - pagination - String for the table pagination hidden heading. - * - list - String for the table hidden heading. + * - items_list_navigation - String for the table pagination hidden heading. + * - items_list - String for the table hidden heading. * * Above, the first default value is for non-hierarchical taxonomies (like tags) and the second one is for hierarchical taxonomies (like categories). * @@ -534,8 +534,8 @@ function get_taxonomy_labels( $tax ) { 'choose_from_most_used' => array( __( 'Choose from the most used tags' ), null ), 'not_found' => array( __( 'No tags found.' ), __( 'No categories found.' ) ), 'no_terms' => array( __( 'No tags' ), __( 'No categories' ) ), - 'pagination' => array( __( 'Tags list navigation' ), __( 'Categories list navigation' ) ), - 'list' => array( __( 'Tags list' ), __( 'Categories list' ) ), + 'items_list_navigation' => array( __( 'Tags list navigation' ), __( 'Categories list navigation' ) ), + 'items_list' => array( __( 'Tags list' ), __( 'Categories list' ) ), ); $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];