From dd419b74cc8f77c11fb518913c2feb182065c60e Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Thu, 25 Jun 2015 00:15:46 +0000 Subject: [PATCH] Introduce a `no_terms` label for taxonomies. This label is used when indicating that there are no terms in the given taxonomy associated with an object. Fixes #32150 Props afercia git-svn-id: https://develop.svn.wordpress.org/trunk@32933 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/class-wp-media-list-table.php | 2 +- src/wp-admin/includes/class-wp-posts-list-table.php | 2 +- src/wp-includes/taxonomy.php | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/wp-admin/includes/class-wp-media-list-table.php b/src/wp-admin/includes/class-wp-media-list-table.php index 44e77a55cf..cc12e5fed0 100644 --- a/src/wp-admin/includes/class-wp-media-list-table.php +++ b/src/wp-admin/includes/class-wp-media-list-table.php @@ -509,7 +509,7 @@ class WP_Media_List_Table extends WP_List_Table { /* translators: used between list items, there is a space after the comma */ echo join( __( ', ' ), $out ); } else { - echo '' . get_taxonomy( $taxonomy )->labels->not_found . ''; + echo '' . get_taxonomy( $taxonomy )->labels->no_terms . ''; } return; diff --git a/src/wp-admin/includes/class-wp-posts-list-table.php b/src/wp-admin/includes/class-wp-posts-list-table.php index fe4001c8ca..ffaf17aa63 100644 --- a/src/wp-admin/includes/class-wp-posts-list-table.php +++ b/src/wp-admin/includes/class-wp-posts-list-table.php @@ -903,7 +903,7 @@ class WP_Posts_List_Table extends WP_List_Table { /* translators: used between list items, there is a space after the comma */ echo join( __( ', ' ), $out ); } else { - echo '' . $taxonomy_object->labels->not_found . ''; + echo '' . $taxonomy_object->labels->no_terms . ''; } return; } diff --git a/src/wp-includes/taxonomy.php b/src/wp-includes/taxonomy.php index 3555d71cc4..15e23ffc3b 100644 --- a/src/wp-includes/taxonomy.php +++ b/src/wp-includes/taxonomy.php @@ -472,12 +472,14 @@ function register_taxonomy( $taxonomy, $object_type, $args = array() ) { * - 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. * - 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. * * Above, the first default value is for non-hierarchical taxonomies (like tags) and the second one is for hierarchical taxonomies (like categories). * * @todo Better documentation for the labels array. * * @since 3.0.0 + * @since 4.3.0 Added the `no_terms` label. * * @param object $tax Taxonomy object. * @return object object with all the labels as member variables. @@ -508,6 +510,7 @@ function get_taxonomy_labels( $tax ) { 'add_or_remove_items' => array( __( 'Add or remove tags' ), null ), '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' ) ), ); $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];