<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[29821] trunk/src/wp-admin: * Use correct context for 'Name' and 'Parent' strings on taxonomy screens.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/29821">29821</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/29821","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-10-02 20:00:11 +0000 (Thu, 02 Oct 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>* Use correct context for 'Name' and 'Parent' strings on taxonomy screens.
* Remove unnecessary context for 'Slug' and 'Description' strings.
props andg.
fixes <a href="https://core.trac.wordpress.org/ticket/29824">#29824</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminedittagformphp">trunk/src/wp-admin/edit-tag-form.php</a></li>
<li><a href="#trunksrcwpadminedittagsphp">trunk/src/wp-admin/edit-tags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminedittagformphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-tag-form.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-tag-form.php 2014-10-02 19:39:14 UTC (rev 29820)
+++ trunk/src/wp-admin/edit-tag-form.php 2014-10-02 20:00:11 UTC (rev 29821)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,13 +81,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_original_referer_field(true, 'previous'); wp_nonce_field('update-tag_' . $tag_ID); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field form-required term-name-wrap">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><label for="name"><?php _ex('Name', 'Taxonomy Name'); ?></label></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="name"><?php _ex( 'Name', 'term name' ); ?></label></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo esc_attr($tag->name); ?>" size="40" aria-required="true" />
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="description"><?php _e('The name is how it appears on your site.'); ?></p></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( !global_terms_enabled() ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field term-slug-wrap">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><label for="slug"><?php _ex('Slug', 'Taxonomy Slug'); ?></label></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="slug"><?php _e( 'Slug' ); ?></label></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the editable term slug.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field term-parent-wrap">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><label for="parent"><?php _ex('Parent', 'Taxonomy Parent'); ?></label></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="parent"><?php _ex( 'Parent', 'term parent' ); ?></label></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?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'))); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( 'category' == $taxonomy ) : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,7 +113,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // is_taxonomy_hierarchical() ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field term-description-wrap">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><label for="description"><?php _ex('Description', 'Taxonomy Description'); ?></label></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="description"><?php _e( 'Description' ); ?></label></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><textarea name="description" id="description" rows="5" cols="50" class="large-text"><?php echo $tag->description; // textarea_escaped ?></textarea>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="description"><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span></span></pre></div>
<a id="trunksrcwpadminedittagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-tags.php 2014-10-02 19:39:14 UTC (rev 29820)
+++ trunk/src/wp-admin/edit-tags.php 2014-10-02 20:00:11 UTC (rev 29821)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -448,20 +448,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nonce_field('add-tag', '_wpnonce_add-tag'); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="form-field form-required term-name-wrap">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="tag-name"><?php _ex('Name', 'Taxonomy Name'); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="tag-name"><?php _ex( 'Name', 'term name' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input name="tag-name" id="tag-name" type="text" value="" size="40" aria-required="true" />
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e('The name is how it appears on your site.'); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! global_terms_enabled() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="form-field term-slug-wrap">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="tag-slug"><?php _ex('Slug', 'Taxonomy Slug'); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="tag-slug"><?php _e( 'Slug' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input name="slug" id="tag-slug" type="text" value="" size="40" />
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e('The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // global_terms_enabled() ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="form-field term-parent-wrap">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="parent"><?php _ex('Parent', 'Taxonomy Parent'); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="parent"><?php _ex( 'Parent', 'term parent' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $dropdown_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -501,7 +501,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // is_taxonomy_hierarchical() ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="form-field term-description-wrap">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="tag-description"><?php _ex('Description', 'Taxonomy Description'); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="tag-description"><?php _e( 'Description' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> <textarea name="description" id="tag-description" rows="5" cols="40"></textarea>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>