WordPress.org

Make WordPress Core

Ticket #23597: 23597.2.diff

File 23597.2.diff, 2.4 KB (added by SergeyBiryukov, 14 months ago)
  • wp-admin/includes/ajax-actions.php

     
    655655        $tags = get_terms( $taxonomy, array( 'number' => 45, 'orderby' => 'count', 'order' => 'DESC' ) ); 
    656656 
    657657        if ( empty( $tags ) ) 
    658                 wp_die( isset( $tax->no_tagcloud ) ? $tax->no_tagcloud : __('No tags found!') ); 
     658                wp_die( $tax->labels->no_tagcloud ); 
    659659 
    660660        if ( is_wp_error( $tags ) ) 
    661661                wp_die( $tags->get_error_message() ); 
  • wp-includes/taxonomy.php

     
    411411 * - separate_items_with_commas - This string isn't used on hierarchical taxonomies. Default is "Separate tags with commas", used in the meta box. 
    412412 * - 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. 
    413413 * - 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. 
     414 * - no_tagcloud - This string isn't used on hierarchical taxonomies. Default is "No tags found!", used in the meta box. 
    414415 * 
    415416 * Above, the first default value is for non-hierarchical taxonomies (like tags) and the second one is for hierarchical taxonomies (like categories). 
    416417 * 
     
    423424        if ( isset( $tax->helps ) && empty( $tax->labels['separate_items_with_commas'] ) ) 
    424425                $tax->labels['separate_items_with_commas'] = $tax->helps; 
    425426 
     427        if ( isset( $tax->no_tagcloud ) && empty( $tax->labels['no_tagcloud'] ) ) 
     428                $tax->labels['no_tagcloud'] = $tax->no_tagcloud; 
     429 
    426430        $nohier_vs_hier_defaults = array( 
    427431                'name' => array( _x( 'Tags', 'taxonomy general name' ), _x( 'Categories', 'taxonomy general name' ) ), 
    428432                'singular_name' => array( _x( 'Tag', 'taxonomy singular name' ), _x( 'Category', 'taxonomy singular name' ) ), 
     
    439443                'separate_items_with_commas' => array( __( 'Separate tags with commas' ), null ), 
    440444                'add_or_remove_items' => array( __( 'Add or remove tags' ), null ), 
    441445                'choose_from_most_used' => array( __( 'Choose from the most used tags' ), null ), 
     446                'no_tagcloud' => array( __( 'No tags found!' ), null ), 
    442447        ); 
    443448        $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name']; 
    444449