WordPress.org

Make WordPress Core

Changeset 15190


Ignore:
Timestamp:
06/10/2010 04:07:33 PM (8 years ago)
Author:
nacin
Message:

Move 'helps' argument to the taxonomy labels object. Also move over help_nojs and help_cloud, both introduced in 3.0. This adds three new core labels for non-hierarchical taxonomies, for tweaking the meta box strings. fixes #13805.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/meta-boxes.php

    r15183 r15190  
    251251    $tax_name = esc_attr($taxonomy);
    252252    $taxonomy = get_taxonomy($taxonomy);
    253 
    254     $helps      = isset( $taxonomy->helps      ) ? esc_attr( $taxonomy->helps ) : esc_attr__('Separate tags with commas.');
    255     $help_nojs  = isset( $taxonomy->help_nojs  ) ? $taxonomy->help_nojs         : __('Add or remove tags');
    256     $help_cloud = isset( $taxonomy->help_cloud ) ? $taxonomy->help_cloud        : __('Choose from the most used tags');
    257 
    258253    $disabled = !current_user_can($taxonomy->cap->assign_terms) ? 'disabled="disabled"' : '';
    259254?>
     
    261256    <div class="jaxtag">
    262257    <div class="nojs-tags hide-if-js">
    263     <p><?php echo $help_nojs; ?></p>
     258    <p><?php echo $taxonomy->labels->add_or_remove_items; ?></p>
    264259    <textarea name="<?php echo "tax_input[$tax_name]"; ?>" rows="3" cols="20" class="the-tags" id="tax-input-<?php echo $tax_name; ?>" <?php echo $disabled; ?>><?php echo esc_attr(get_terms_to_edit( $post->ID, $tax_name )); ?></textarea></div>
    265260    <?php if ( current_user_can($taxonomy->cap->assign_terms) ) : ?>
     
    270265        <input type="button" class="button tagadd" value="<?php esc_attr_e('Add'); ?>" tabindex="3" /></p>
    271266    </div>
    272     <p class="howto"><?php echo $helps; ?></p>
     267    <p class="howto"><?php echo esc_attr( $taxonomy->labels->separate_items_with_commas ); ?></p>
    273268    <?php endif; ?>
    274269    </div>
     
    276271</div>
    277272<?php if ( current_user_can($taxonomy->cap->assign_terms) ) : ?>
    278 <p class="hide-if-no-js"><a href="#titlediv" class="tagcloud-link" id="link-<?php echo $tax_name; ?>"><?php echo $help_cloud; ?></a></p>
     273<p class="hide-if-no-js"><a href="#titlediv" class="tagcloud-link" id="link-<?php echo $tax_name; ?>"><?php echo $taxonomy->labels->choose_from_most_used; ?></a></p>
    279274<?php else : ?>
    280275<p><em><?php _e('You cannot modify this taxonomy.'); ?></em></p>
  • trunk/wp-includes/post.php

    r15188 r15190  
    967967function _get_custom_object_labels( $object, $nohier_vs_hier_defaults ) {
    968968
    969     if ( isset( $object->label ) ) {
     969    if ( isset( $object->label ) && empty( $object->labels['name'] ) )
    970970        $object->labels['name'] = $object->label;
    971     }
    972 
    973     if ( !isset( $object->labels['singular_name'] ) && isset( $object->labels['name'] ) ) {
     971
     972    if ( !isset( $object->labels['singular_name'] ) && isset( $object->labels['name'] ) )
    974973        $object->labels['singular_name'] = $object->labels['name'];
    975     }
    976974
    977975    $defaults = array_map( create_function( '$x', $object->hierarchical? 'return $x[1];' : 'return $x[0];' ), $nohier_vs_hier_defaults );
  • trunk/wp-includes/taxonomy.php

    r15142 r15190  
    335335 * - add_new_item - Default is Add New Tag/Add New Category
    336336 * - new_item_name - Default is New Tag Name/New Category Name
     337 * - separate_items_with_commas - This string isn't used on hierarchical taxonomies. Default is "Separate tags with commas," used in the meta box.
     338 * - 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.
     339 * - 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.
    337340 *
    338341 * Above, the first default value is for non-hierarchical taxonomies (like tags) and the second one is for hierarchical taxonomies (like categories.)
     
    344347
    345348function get_taxonomy_labels( $tax ) {
     349    if ( isset( $tax->helps ) && empty( $tax->labels['separate_items_with_commas'] ) )
     350        $tax->labels['separate_items_with_commas'] = $tax->helps;
     351
    346352    $nohier_vs_hier_defaults = array(
    347353        'name' => array( _x( 'Post Tags', 'taxonomy general name' ), _x( 'Categories', 'taxonomy general name' ) ),
     
    356362        'add_new_item' => array( __( 'Add New Tag' ), __( 'Add New Category' ) ),
    357363        'new_item_name' => array( __( 'New Tag Name' ), __( 'New Category Name' ) ),
     364        'separate_items_with_commas' => array( __( 'Separate tags with commas' ), null ),
     365        'add_or_remove_items' => array( __( 'Add or remove tags' ), null ),
     366        'choose_from_most_used' => array( __( 'Choose from the most used tags' ), null ),
    358367    );
    359368
Note: See TracChangeset for help on using the changeset viewer.