<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[12228] trunk/wp-admin: Some admin copy improvements fixes.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12228">12228</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-11-19 22:16:16 +0000 (Thu, 19 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Some admin copy improvements fixes. <a href="http://trac.wordpress.org/ticket/6362">#6362</a> props xenlab and ninjaWR.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincategoriesphp">trunk/wp-admin/categories.php</a></li>
<li><a href="#trunkwpadmineditcategoryformphp">trunk/wp-admin/edit-category-form.php</a></li>
<li><a href="#trunkwpadmineditlinkcategoriesphp">trunk/wp-admin/edit-link-categories.php</a></li>
<li><a href="#trunkwpadmineditlinkcategoryformphp">trunk/wp-admin/edit-link-category-form.php</a></li>
<li><a href="#trunkwpadminedittagformphp">trunk/wp-admin/edit-tag-form.php</a></li>
<li><a href="#trunkwpadminedittagsphp">trunk/wp-admin/edit-tags.php</a></li>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincategoriesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/categories.php (12227 => 12228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/categories.php 2009-11-19 22:04:53 UTC (rev 12227)
+++ trunk/wp-admin/categories.php 2009-11-19 22:16:16 UTC (rev 12228)
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx"> <div class="form-field">
</span><span class="cx"> <label for="category_description"><?php _e('Description') ?></label>
</span><span class="cx"> <textarea name="category_description" id="category_description" rows="5" cols="40"></textarea>
</span><del>- <p><?php _e('The description is not prominent by default, however some themes may show it.'); ?></p>
</del><ins>+ <p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <p class="submit"><input type="submit" class="button" name="submit" value="<?php esc_attr_e('Add Category'); ?>" /></p>
</span></span></pre></div>
<a id="trunkwpadmineditcategoryformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-category-form.php (12227 => 12228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-category-form.php 2009-11-19 22:04:53 UTC (rev 12227)
+++ trunk/wp-admin/edit-category-form.php 2009-11-19 22:16:16 UTC (rev 12228)
</span><span class="lines">@@ -57,7 +57,6 @@
</span><span class="cx"> <tr class="form-field form-required">
</span><span class="cx"> <th scope="row" valign="top"><label for="cat_name"><?php _e('Category Name') ?></label></th>
</span><span class="cx"> <td><input name="cat_name" id="cat_name" type="text" value="<?php echo esc_attr($category->name); ?>" size="40" aria-required="true" /><br />
</span><del>- <span class="description"><?php _e('The name is used to identify the category almost everywhere, for example under the post or in the category widget.'); ?></span></td>
</del><span class="cx"> </tr>
</span><span class="cx"> <tr class="form-field">
</span><span class="cx"> <th scope="row" valign="top"><label for="category_nicename"><?php _e('Category Slug') ?></label></th>
</span><span class="lines">@@ -74,7 +73,7 @@
</span><span class="cx"> <tr class="form-field">
</span><span class="cx"> <th scope="row" valign="top"><label for="category_description"><?php _e('Description') ?></label></th>
</span><span class="cx"> <td><textarea name="category_description" id="category_description" rows="5" cols="50" style="width: 97%;"><?php echo esc_html($category->description); ?></textarea><br />
</span><del>- <span class="description"><?php _e('The description is not prominent by default, however some themes may show it.'); ?></span></td>
</del><ins>+ <span class="description"><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></span></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <?php do_action('edit_category_form_fields', $category); ?>
</span><span class="cx"> </table>
</span></span></pre></div>
<a id="trunkwpadmineditlinkcategoriesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-link-categories.php (12227 => 12228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-link-categories.php 2009-11-19 22:04:53 UTC (rev 12227)
+++ trunk/wp-admin/edit-link-categories.php 2009-11-19 22:16:16 UTC (rev 12228)
</span><span class="lines">@@ -209,6 +209,7 @@
</span><span class="cx"> <div class="form-field">
</span><span class="cx"> <label for="description"><?php _e('Description (optional)') ?></label>
</span><span class="cx"> <textarea name="description" id="description" rows="5" cols="40"></textarea>
</span><ins>+ <p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <p class="submit"><input type="submit" class="button" name="submit" value="<?php esc_attr_e('Add Category'); ?>" /></p>
</span></span></pre></div>
<a id="trunkwpadmineditlinkcategoryformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-link-category-form.php (12227 => 12228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-link-category-form.php 2009-11-19 22:04:53 UTC (rev 12227)
+++ trunk/wp-admin/edit-link-category-form.php 2009-11-19 22:16:16 UTC (rev 12228)
</span><span class="lines">@@ -79,7 +79,8 @@
</span><span class="cx"> </tr>
</span><span class="cx"> <tr class="form-field">
</span><span class="cx"> <th scope="row" valign="top"><label for="description"><?php _e('Description (optional)') ?></label></th>
</span><del>- <td><textarea name="description" id="description" rows="5" cols="50" style="width: 97%;"><?php echo $category->description; ?></textarea></td>
</del><ins>+ <td><textarea name="description" id="description" rows="5" cols="50" style="width: 97%;"><?php echo $category->description; ?></textarea><br />
+ <span class="description"><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></span></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <?php do_action('edit_link_category_form_fields', $category); ?>
</span><span class="cx"> </table>
</span></span></pre></div>
<a id="trunkwpadminedittagformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tag-form.php (12227 => 12228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tag-form.php 2009-11-19 22:04:53 UTC (rev 12227)
+++ trunk/wp-admin/edit-tag-form.php 2009-11-19 22:16:16 UTC (rev 12228)
</span><span class="lines">@@ -33,8 +33,7 @@
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr class="form-field form-required">
</span><span class="cx"> <th scope="row" valign="top"><label for="name"><?php _e('Tag name') ?></label></th>
</span><del>- <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 the tag appears on your site.'); ?></p></td>
</del><ins>+ <td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo esc_attr($tag->name); ?>" size="40" aria-required="true" /></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <tr class="form-field">
</span><span class="cx"> <th scope="row" valign="top"><label for="slug"><?php _e('Tag slug') ?></label></th>
</span></span></pre></div>
<a id="trunkwpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tags.php (12227 => 12228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php 2009-11-19 22:04:53 UTC (rev 12227)
+++ trunk/wp-admin/edit-tags.php 2009-11-19 22:16:16 UTC (rev 12228)
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx"> <div class="form-field">
</span><span class="cx"> <label for="description"><?php _e('Description') ?></label>
</span><span class="cx"> <textarea name="description" id="description" rows="5" cols="40"></textarea>
</span><del>- <p><?php _e('The description is not prominent by default, however some themes may show it.'); ?></p>
</del><ins>+ <p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <p class="submit"><input type="submit" class="button" name="submit" id="submit" value="<?php esc_attr_e('Add Tag'); ?>" /></p>
</span></span></pre></div>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (12227 => 12228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2009-11-19 22:04:53 UTC (rev 12227)
+++ trunk/wp-admin/includes/meta-boxes.php 2009-11-19 22:16:16 UTC (rev 12228)
</span><span class="lines">@@ -375,8 +375,8 @@
</span><span class="cx"> ?>
</span><span class="cx"> <input name="advanced_view" type="hidden" value="1" />
</span><span class="cx"> <p class="meta-options">
</span><del>- <label for="comment_status" class="selectit"> <input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> /> <?php _e('Allow Comments') ?></label><br />
- <label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a>') ?></label>
</del><ins>+ <label for="comment_status" class="selectit"><input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> /><?php _e('Allow Comments on this page.') ?></label><br />
+ <label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /><?php printf( __('Allow <a href="%s" target="_blank">trackbacks and pingbacks</a> on this page.'),_c('http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments','Url to codex article on Managing Comments')); ?></label>
</ins><span class="cx"> </p>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="lines">@@ -479,7 +479,7 @@
</span><span class="cx"> <h5><?php _e('Parent') ?></h5>
</span><span class="cx"> <label class="screen-reader-text" for="parent_id"><?php _e('Page Parent') ?></label>
</span><span class="cx"> <?php wp_dropdown_pages(array('exclude_tree' => $post->ID, 'selected' => $post->post_parent, 'name' => 'parent_id', 'show_option_none' => __('Main Page (no parent)'), 'sort_column'=> 'menu_order, post_title')); ?>
</span><del>-<p><?php _e('You can arrange your pages in hierarchies, for example you could have an &#8220;About&#8221; page that has &#8220;Life Story&#8221; and &#8220;My Dog&#8221; pages under it. There are no limits to how deeply nested you can make pages.'); ?></p>
</del><ins>+<p><?php _e('You can arrange your pages in hierarchies. For example, you could have an &#8220;About&#8221; page that has &#8220;Life Story&#8221; and &#8220;My Dog&#8221; pages under it. There are no limits to how deeply nested you can make pages.'); ?></p>
</ins><span class="cx"> <?php
</span><span class="cx"> if ( 0 != count( get_page_templates() ) ) { ?>
</span><span class="cx"> <h5><?php _e('Template') ?></h5>
</span><span class="lines">@@ -492,7 +492,7 @@
</span><span class="cx"> } ?>
</span><span class="cx"> <h5><?php _e('Order') ?></h5>
</span><span class="cx"> <p><label class="screen-reader-text" for="menu_order"><?php _e('Page Order') ?></label><input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo esc_attr($post->menu_order) ?>" /></p>
</span><del>-<p><?php _e('Pages are usually ordered alphabetically, but you can put a number above to change the order pages appear in. (We know this is a little janky, it&#8217;ll be better in future releases.)'); ?></p>
</del><ins>+<p><?php _e('Pages are usually ordered alphabetically, but you can put a number above to change the order pages appear in.'); ?></p>
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>