From 5777e5a949d6dce572c5d0df6d244d1709984060 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 25 Feb 2013 19:39:38 +0000 Subject: [PATCH] Rename 'no_tagcloud' taxonomy label to 'not_found', for consistency with the post type label of the same key. fixes #23597. git-svn-id: http://core.svn.wordpress.org/trunk@23484 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/ajax-actions.php | 2 +- wp-includes/taxonomy.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wp-admin/includes/ajax-actions.php b/wp-admin/includes/ajax-actions.php index dd6baad382..0fabe2a50d 100644 --- a/wp-admin/includes/ajax-actions.php +++ b/wp-admin/includes/ajax-actions.php @@ -655,7 +655,7 @@ function wp_ajax_get_tagcloud() { $tags = get_terms( $taxonomy, array( 'number' => 45, 'orderby' => 'count', 'order' => 'DESC' ) ); if ( empty( $tags ) ) - wp_die( $tax->labels->no_tagcloud ); + wp_die( $tax->labels->not_found ); if ( is_wp_error( $tags ) ) wp_die( $tags->get_error_message() ); diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php index 94b345d5cc..d9a9845cbe 100644 --- a/wp-includes/taxonomy.php +++ b/wp-includes/taxonomy.php @@ -411,7 +411,7 @@ function register_taxonomy( $taxonomy, $object_type, $args = array() ) { * - 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. - * - no_tagcloud - This string isn't used on hierarchical taxonomies. Default is "No tags found!", used in the meta box. + * - not_found - This string isn't used on hierarchical taxonomies. Default is "No tags found", used in the meta box. * * Above, the first default value is for non-hierarchical taxonomies (like tags) and the second one is for hierarchical taxonomies (like categories). * @@ -424,8 +424,8 @@ function get_taxonomy_labels( $tax ) { if ( isset( $tax->helps ) && empty( $tax->labels['separate_items_with_commas'] ) ) $tax->labels['separate_items_with_commas'] = $tax->helps; - if ( isset( $tax->no_tagcloud ) && empty( $tax->labels['no_tagcloud'] ) ) - $tax->labels['no_tagcloud'] = $tax->no_tagcloud; + if ( isset( $tax->no_tagcloud ) && empty( $tax->labels['not_found'] ) ) + $tax->labels['not_found'] = $tax->no_tagcloud; $nohier_vs_hier_defaults = array( 'name' => array( _x( 'Tags', 'taxonomy general name' ), _x( 'Categories', 'taxonomy general name' ) ), @@ -443,7 +443,7 @@ function get_taxonomy_labels( $tax ) { '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 ), - 'no_tagcloud' => array( __( 'No tags found!' ), null ), + 'not_found' => array( __( 'No tags found.' ), null ), ); $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];