Changeset 14167
- Timestamp:
- 04/20/2010 02:54:36 PM (15 years ago)
- Location:
- trunk/wp-admin
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/edit-comments.php
r14142 r14167 165 165 if ( $trashed > 0 ) { 166 166 $ids = isset($_GET['ids']) ? $_GET['ids'] : 0; 167 $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 />';167 $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 />'; 168 168 } 169 169 170 170 if ( $untrashed > 0 ) 171 $messages[] = sprintf( _n( '%s comment restored from the trash', '%s comments restored from the trash', $untrashed ), $untrashed );171 $messages[] = sprintf( _n( '%s comment restored from the Trash', '%s comments restored from the Trash', $untrashed ), $untrashed ); 172 172 173 173 if ( $deleted > 0 ) -
trunk/wp-admin/edit.php
r14139 r14167 75 75 foreach( (array) $post_ids as $post_id ) { 76 76 if ( !current_user_can($post_type_object->delete_cap, $post_id) ) 77 wp_die( __('You are not allowed to move this item to the trash.') );77 wp_die( __('You are not allowed to move this item to the Trash.') ); 78 78 79 79 if ( !wp_trash_post($post_id) ) 80 wp_die( __('Error in moving to trash...') );80 wp_die( __('Error in moving to Trash.') ); 81 81 82 82 $trashed++; … … 88 88 foreach( (array) $post_ids as $post_id ) { 89 89 if ( !current_user_can($post_type_object->delete_cap, $post_id) ) 90 wp_die( __('You are not allowed to restore this item from the trash.') );90 wp_die( __('You are not allowed to restore this item from the Trash.') ); 91 91 92 92 if ( !wp_untrash_post($post_id) ) 93 wp_die( __('Error in restoring from trash...') );93 wp_die( __('Error in restoring from Trash.') ); 94 94 95 95 $untrashed++; … … 205 205 206 206 if ( isset($_GET['untrashed']) && (int) $_GET['untrashed'] ) { 207 printf( _n( 'Item restored from the trash.', '%s items restored from the trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) );207 printf( _n( 'Item restored from the Trash.', '%s items restored from the Trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) ); 208 208 unset($_GET['undeleted']); 209 209 } … … 263 263 264 264 <p class="search-box"> 265 <label class="screen-reader-text" for="post-search-input"><?php printf( _ _( 'Search %s'), $post_type_object->label ); ?>:</label>265 <label class="screen-reader-text" for="post-search-input"><?php printf( _x('Search %s', '%s: post type name'), $post_type_object->label ); ?>:</label> 266 266 <input type="text" id="post-search-input" name="s" value="<?php the_search_query(); ?>" /> 267 <input type="submit" value="<?php echo esc_attr( sprintf( _ _( 'Search %s'), $post_type_object->label ) ); ?>" class="button" />267 <input type="submit" value="<?php echo esc_attr( sprintf( _x('Search %s', '%s: post type name'), $post_type_object->label ) ); ?>" class="button" /> 268 268 </p> 269 269 -
trunk/wp-admin/post.php
r14139 r14167 219 219 220 220 if ( !current_user_can($post_type_object->delete_cap, $post_id) ) 221 wp_die( __('You are not allowed to move this item to the trash.') );221 wp_die( __('You are not allowed to move this item to the Trash.') ); 222 222 223 223 if ( ! wp_trash_post($post_id) ) 224 wp_die( __('Error in moving to trash...') );224 wp_die( __('Error in moving to Trash.') ); 225 225 226 226 wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) ); … … 232 232 233 233 if ( !current_user_can($post_type_object->delete_cap, $post_id) ) 234 wp_die( __('You are not allowed to move this item out of the trash.') );234 wp_die( __('You are not allowed to move this item out of the Trash.') ); 235 235 236 236 if ( ! wp_untrash_post($post_id) ) 237 wp_die( __('Error in restoring from trash...') );237 wp_die( __('Error in restoring from Trash.') ); 238 238 239 239 wp_redirect( add_query_arg('untrashed', 1, $sendback) ); … … 251 251 $force = ( $force || !MEDIA_TRASH ); 252 252 if ( ! wp_delete_attachment($post_id, $force) ) 253 wp_die( __('Error in deleting. ..') );253 wp_die( __('Error in deleting.') ); 254 254 } else { 255 255 if ( !wp_delete_post($post_id, $force) ) 256 wp_die( __('Error in deleting. ..') );256 wp_die( __('Error in deleting.') ); 257 257 } 258 258
Note: See TracChangeset
for help on using the changeset viewer.