WordPress.org

Make WordPress Core

Changeset 14167


Ignore:
Timestamp:
04/20/10 14:54:36 (4 years ago)
Author:
nbachiyski
Message:

Trash should always be in titlecase for consistency

Location:
trunk/wp-admin
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/edit-comments.php

    r14142 r14167  
    165165        if ( $trashed > 0 ) { 
    166166            $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 />'; 
    168168        } 
    169169 
    170170        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 ); 
    172172 
    173173        if ( $deleted > 0 ) 
  • trunk/wp-admin/edit.php

    r14139 r14167  
    7575            foreach( (array) $post_ids as $post_id ) { 
    7676                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.') ); 
    7878 
    7979                if ( !wp_trash_post($post_id) ) 
    80                     wp_die( __('Error in moving to trash...') ); 
     80                    wp_die( __('Error in moving to Trash.') ); 
    8181 
    8282                $trashed++; 
     
    8888            foreach( (array) $post_ids as $post_id ) { 
    8989                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.') ); 
    9191 
    9292                if ( !wp_untrash_post($post_id) ) 
    93                     wp_die( __('Error in restoring from trash...') ); 
     93                    wp_die( __('Error in restoring from Trash.') ); 
    9494 
    9595                $untrashed++; 
     
    205205 
    206206if ( 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'] ) ); 
    208208    unset($_GET['undeleted']); 
    209209} 
     
    263263 
    264264<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> 
    266266    <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" /> 
    268268</p> 
    269269 
  • trunk/wp-admin/post.php

    r14139 r14167  
    219219 
    220220    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.') ); 
    222222 
    223223    if ( ! wp_trash_post($post_id) ) 
    224         wp_die( __('Error in moving to trash...') ); 
     224        wp_die( __('Error in moving to Trash.') ); 
    225225 
    226226    wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) ); 
     
    232232 
    233233    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.') ); 
    235235 
    236236    if ( ! wp_untrash_post($post_id) ) 
    237         wp_die( __('Error in restoring from trash...') ); 
     237        wp_die( __('Error in restoring from Trash.') ); 
    238238 
    239239    wp_redirect( add_query_arg('untrashed', 1, $sendback) ); 
     
    251251        $force = ( $force || !MEDIA_TRASH ); 
    252252        if ( ! wp_delete_attachment($post_id, $force) ) 
    253             wp_die( __('Error in deleting...') ); 
     253            wp_die( __('Error in deleting.') ); 
    254254    } else { 
    255255        if ( !wp_delete_post($post_id, $force) ) 
    256             wp_die( __('Error in deleting...') ); 
     256            wp_die( __('Error in deleting.') ); 
    257257    } 
    258258 
Note: See TracChangeset for help on using the changeset viewer.