<!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>[14167] trunk/wp-admin: Trash should always be in titlecase for consistency</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14167">14167</a></dd>
<dt>Author</dt> <dd>nbachiyski</dd>
<dt>Date</dt> <dd>2010-04-20 14:54:36 +0000 (Tue, 20 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Trash should always be in titlecase for consistency</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditcommentsphp">trunk/wp-admin/edit-comments.php</a></li>
<li><a href="#trunkwpadmineditphp">trunk/wp-admin/edit.php</a></li>
<li><a href="#trunkwpadminpostphp">trunk/wp-admin/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-comments.php (14166 => 14167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-comments.php 2010-04-19 20:49:13 UTC (rev 14166)
+++ trunk/wp-admin/edit-comments.php 2010-04-20 14:54:36 UTC (rev 14167)
</span><span class="lines">@@ -164,11 +164,11 @@
</span><span class="cx">
</span><span class="cx"> if ( $trashed > 0 ) {
</span><span class="cx"> $ids = isset($_GET['ids']) ? $_GET['ids'] : 0;
</span><del>- $messages[] = sprintf( _n( '%s comment moved to the trash.', '%s comments moved to the trash.', $trashed ), $trashed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=untrash&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo') . '</a><br />';
</del><ins>+ $messages[] = sprintf( _n( '%s comment moved to the Trash.', '%s comments moved to the Trash.', $trashed ), $trashed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=untrash&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo') . '</a><br />';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $untrashed > 0 )
</span><del>- $messages[] = sprintf( _n( '%s comment restored from the trash', '%s comments restored from the trash', $untrashed ), $untrashed );
</del><ins>+ $messages[] = sprintf( _n( '%s comment restored from the Trash', '%s comments restored from the Trash', $untrashed ), $untrashed );
</ins><span class="cx">
</span><span class="cx"> if ( $deleted > 0 )
</span><span class="cx"> $messages[] = sprintf( _n( '%s comment permanently deleted', '%s comments permanently deleted', $deleted ), $deleted );
</span></span></pre></div>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (14166 => 14167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php 2010-04-19 20:49:13 UTC (rev 14166)
+++ trunk/wp-admin/edit.php 2010-04-20 14:54:36 UTC (rev 14167)
</span><span class="lines">@@ -74,10 +74,10 @@
</span><span class="cx"> $trashed = 0;
</span><span class="cx"> foreach( (array) $post_ids as $post_id ) {
</span><span class="cx"> if ( !current_user_can($post_type_object->delete_cap, $post_id) )
</span><del>- wp_die( __('You are not allowed to move this item to the trash.') );
</del><ins>+ wp_die( __('You are not allowed to move this item to the Trash.') );
</ins><span class="cx">
</span><span class="cx"> if ( !wp_trash_post($post_id) )
</span><del>- wp_die( __('Error in moving to trash...') );
</del><ins>+ wp_die( __('Error in moving to Trash.') );
</ins><span class="cx">
</span><span class="cx"> $trashed++;
</span><span class="cx"> }
</span><span class="lines">@@ -87,10 +87,10 @@
</span><span class="cx"> $untrashed = 0;
</span><span class="cx"> foreach( (array) $post_ids as $post_id ) {
</span><span class="cx"> if ( !current_user_can($post_type_object->delete_cap, $post_id) )
</span><del>- wp_die( __('You are not allowed to restore this item from the trash.') );
</del><ins>+ wp_die( __('You are not allowed to restore this item from the Trash.') );
</ins><span class="cx">
</span><span class="cx"> if ( !wp_untrash_post($post_id) )
</span><del>- wp_die( __('Error in restoring from trash...') );
</del><ins>+ wp_die( __('Error in restoring from Trash.') );
</ins><span class="cx">
</span><span class="cx"> $untrashed++;
</span><span class="cx"> }
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset($_GET['untrashed']) && (int) $_GET['untrashed'] ) {
</span><del>- printf( _n( 'Item restored from the trash.', '%s items restored from the trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) );
</del><ins>+ printf( _n( 'Item restored from the Trash.', '%s items restored from the Trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) );
</ins><span class="cx"> unset($_GET['undeleted']);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -262,9 +262,9 @@
</span><span class="cx"> </ul>
</span><span class="cx">
</span><span class="cx"> <p class="search-box">
</span><del>- <label class="screen-reader-text" for="post-search-input"><?php printf( __( 'Search %s' ), $post_type_object->label ); ?>:</label>
</del><ins>+ <label class="screen-reader-text" for="post-search-input"><?php printf( _x('Search %s', '%s: post type name'), $post_type_object->label ); ?>:</label>
</ins><span class="cx"> <input type="text" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />
</span><del>- <input type="submit" value="<?php echo esc_attr( sprintf( __( 'Search %s' ), $post_type_object->label ) ); ?>" class="button" />
</del><ins>+ <input type="submit" value="<?php echo esc_attr( sprintf( _x('Search %s', '%s: post type name'), $post_type_object->label ) ); ?>" class="button" />
</ins><span class="cx"> </p>
</span><span class="cx">
</span><span class="cx"> <input type="hidden" name="post_status" class="post_status_page" value="<?php echo !empty($_GET['post_status']) ? esc_attr($_GET['post_status']) : 'all'; ?>" />
</span></span></pre></div>
<a id="trunkwpadminpostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/post.php (14166 => 14167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/post.php 2010-04-19 20:49:13 UTC (rev 14166)
+++ trunk/wp-admin/post.php 2010-04-20 14:54:36 UTC (rev 14167)
</span><span class="lines">@@ -218,10 +218,10 @@
</span><span class="cx"> $post = & get_post($post_id);
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can($post_type_object->delete_cap, $post_id) )
</span><del>- wp_die( __('You are not allowed to move this item to the trash.') );
</del><ins>+ wp_die( __('You are not allowed to move this item to the Trash.') );
</ins><span class="cx">
</span><span class="cx"> if ( ! wp_trash_post($post_id) )
</span><del>- wp_die( __('Error in moving to trash...') );
</del><ins>+ wp_die( __('Error in moving to Trash.') );
</ins><span class="cx">
</span><span class="cx"> wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) );
</span><span class="cx"> exit();
</span><span class="lines">@@ -231,10 +231,10 @@
</span><span class="cx"> check_admin_referer('untrash-' . $post_type . '_' . $post_id);
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can($post_type_object->delete_cap, $post_id) )
</span><del>- wp_die( __('You are not allowed to move this item out of the trash.') );
</del><ins>+ wp_die( __('You are not allowed to move this item out of the Trash.') );
</ins><span class="cx">
</span><span class="cx"> if ( ! wp_untrash_post($post_id) )
</span><del>- wp_die( __('Error in restoring from trash...') );
</del><ins>+ wp_die( __('Error in restoring from Trash.') );
</ins><span class="cx">
</span><span class="cx"> wp_redirect( add_query_arg('untrashed', 1, $sendback) );
</span><span class="cx"> exit();
</span><span class="lines">@@ -250,10 +250,10 @@
</span><span class="cx"> if ( $post->post_type == 'attachment' ) {
</span><span class="cx"> $force = ( $force || !MEDIA_TRASH );
</span><span class="cx"> if ( ! wp_delete_attachment($post_id, $force) )
</span><del>- wp_die( __('Error in deleting...') );
</del><ins>+ wp_die( __('Error in deleting.') );
</ins><span class="cx"> } else {
</span><span class="cx"> if ( !wp_delete_post($post_id, $force) )
</span><del>- wp_die( __('Error in deleting...') );
</del><ins>+ wp_die( __('Error in deleting.') );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> wp_redirect( add_query_arg('deleted', 1, $sendback) );
</span></span></pre>
</div>
</div>
</body>
</html>