Changeset 15190 for trunk/wp-admin/includes/meta-boxes.php

Timestamp:

06/10/2010 04:07:33 PM (15 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.

File:

• trunk/wp-admin/includes/meta-boxes.php (modified) (4 diffs)

trunk/wp-admin/includes/meta-boxes.php

@@ -251 +251 @@
     $tax_name = esc_attr($taxonomy);
     $taxonomy = get_taxonomy($taxonomy);
-
-    $helps      = isset( $taxonomy->helps      ) ? esc_attr( $taxonomy->helps ) : esc_attr__('Separate tags with commas.');
-    $help_nojs  = isset( $taxonomy->help_nojs  ) ? $taxonomy->help_nojs         : __('Add or remove tags');
-    $help_cloud = isset( $taxonomy->help_cloud ) ? $taxonomy->help_cloud        : __('Choose from the most used tags');
-
     $disabled = !current_user_can($taxonomy->cap->assign_terms) ? 'disabled="disabled"' : '';
 ?>
@@ -261 +256 @@
     <div class="jaxtag">
     <div class="nojs-tags hide-if-js">
-    <p><?php echo $help_nojs; ?></p>
+    <p><?php echo $taxonomy->labels->add_or_remove_items; ?></p>
     <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>
     <?php if ( current_user_can($taxonomy->cap->assign_terms) ) : ?>
@@ -270 +265 @@
         <input type="button" class="button tagadd" value="<?php esc_attr_e('Add'); ?>" tabindex="3" /></p>
     </div>
-    <p class="howto"><?php echo $helps; ?></p>
+    <p class="howto"><?php echo esc_attr( $taxonomy->labels->separate_items_with_commas ); ?></p>
     <?php endif; ?>
     </div>
@@ -276 +271 @@
 </div>
 <?php if ( current_user_can($taxonomy->cap->assign_terms) ) : ?>
-<p class="hide-if-no-js"><a href="#titlediv" class="tagcloud-link" id="link-<?php echo $tax_name; ?>"><?php echo $help_cloud; ?></a></p>
+<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>
 <?php else : ?>
 <p><em><?php _e('You cannot modify this taxonomy.'); ?></em></p>