Ticket #29824: patch.diff

wp-admin/edit-tag-form.php

@@ -81 +81 @@
 <?php wp_original_referer_field(true, 'previous'); wp_nonce_field('update-tag_' . $tag_ID); ?>
         <table class="form-table">
                 <tr class="form-field form-required">
-                        <th scope="row"><label for="name"><?php _ex('Name', 'Taxonomy Name'); ?></label></th>
+                        <th scope="row"><label for="name"><?php _ex('Name', 'term name'); ?></label></th>
                         <td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo esc_attr($tag->name); ?>" size="40" aria-required="true" />
                         <p class="description"><?php _e('The name is how it appears on your site.'); ?></p></td>
                 </tr>
 <?php if ( !global_terms_enabled() ) { ?>
                 <tr class="form-field">
-                        <th scope="row"><label for="slug"><?php _ex('Slug', 'Taxonomy Slug'); ?></label></th>
+                        <th scope="row"><label for="slug"><?php _ex('Slug'); ?></label></th>
                         <?php
                         /**
                          * Filter the editable term slug.
@@ -103 +103 @@
 <?php } ?>
 <?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
                 <tr class="form-field">
-                        <th scope="row"><label for="parent"><?php _ex('Parent', 'Taxonomy Parent'); ?></label></th>
+                        <th scope="row"><label for="parent"><?php _ex('Parent'); ?></label></th>
                         <td>
                                 <?php wp_dropdown_categories(array('hide_empty' => 0, 'hide_if_empty' => false, 'name' => 'parent', 'orderby' => 'name', 'taxonomy' => $taxonomy, 'selected' => $tag->parent, 'exclude_tree' => $tag->term_id, 'hierarchical' => true, 'show_option_none' => __('None'))); ?>
                                 <?php if ( 'category' == $taxonomy ) : ?>
@@ -113 +113 @@
                 </tr>
 <?php endif; // is_taxonomy_hierarchical() ?>
                 <tr class="form-field">
-                        <th scope="row"><label for="description"><?php _ex('Description', 'Taxonomy Description'); ?></label></th>
+                        <th scope="row"><label for="description"><?php _ex('Description'); ?></label></th>
                         <td><textarea name="description" id="description" rows="5" cols="50" class="large-text"><?php echo $tag->description; // textarea_escaped ?></textarea><br />
                         <span class="description"><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></span></td>
                 </tr>

wp-admin/edit-tags.php

@@ -448 +448 @@
 <?php wp_nonce_field('add-tag', '_wpnonce_add-tag'); ?>
 
 <div class="form-field form-required">
-        <label for="tag-name"><?php _ex('Name', 'Taxonomy Name'); ?></label>
+        <label for="tag-name"><?php _ex('Name', 'term name'); ?></label>
         <input name="tag-name" id="tag-name" type="text" value="" size="40" aria-required="true" />
         <p><?php _e('The name is how it appears on your site.'); ?></p>
 </div>
 <?php if ( ! global_terms_enabled() ) : ?>
 <div class="form-field">
-        <label for="tag-slug"><?php _ex('Slug', 'Taxonomy Slug'); ?></label>
+        <label for="tag-slug"><?php _ex('Slug'); ?></label>
         <input name="slug" id="tag-slug" type="text" value="" size="40" />
         <p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p>
 </div>
 <?php endif; // global_terms_enabled() ?>
 <?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
 <div class="form-field">
-        <label for="parent"><?php _ex('Parent', 'Taxonomy Parent'); ?></label>
+        <label for="parent"><?php _ex('Parent'); ?></label>
         <?php
         $dropdown_args = array(
                 'hide_empty'       => 0,
@@ -501 +501 @@
 </div>
 <?php endif; // is_taxonomy_hierarchical() ?>
 <div class="form-field">
-        <label for="tag-description"><?php _ex('Description', 'Taxonomy Description'); ?></label>
+        <label for="tag-description"><?php _ex('Description'); ?></label>
         <textarea name="description" id="tag-description" rows="5" cols="40"></textarea>
         <p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p>
 </div>