WordPress.org

Make WordPress Core

Changeset 48594


Ignore:
Timestamp:
07/24/2020 12:19:37 AM (2 months ago)
Author:
SergeyBiryukov
Message:

Administration: Capitalize Trash consistently in various messages.

When used as a noun referring to the "virtual" place, Trash should be capitalized.

Follow-up to [47233], [48352].

See #45317, #40244.

Location:
trunk/src
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/comment.php

    r48352 r48594  
    130130            case 'trash':
    131131                $caution_msg = __( 'You are about to move the following comment to the Trash:' );
    132                 $button      = __( 'Move to trash' );
     132                $button      = __( 'Move to Trash' );
    133133                break;
    134134            case 'delete':
  • trunk/src/wp-admin/edit-form-comment.php

    r48352 r48594  
    203203<div id="major-publishing-actions">
    204204<div id="delete-action">
    205 <?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url( 'comment.php?action=' . ( ! EMPTY_TRASH_DAYS ? 'deletecomment' : 'trashcomment' ) . "&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode( wp_get_referer() ), 'delete-comment_' . $comment->comment_ID ) . "'>" . ( ! EMPTY_TRASH_DAYS ? __( 'Delete Permanently' ) : __( 'Move to trash' ) ) . "</a>\n"; ?>
     205<?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url( 'comment.php?action=' . ( ! EMPTY_TRASH_DAYS ? 'deletecomment' : 'trashcomment' ) . "&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode( wp_get_referer() ), 'delete-comment_' . $comment->comment_ID ) . "'>" . ( ! EMPTY_TRASH_DAYS ? __( 'Delete Permanently' ) : __( 'Move to Trash' ) ) . "</a>\n"; ?>
    206206</div>
    207207<div id="publishing-action">
  • trunk/src/wp-admin/includes/class-wp-comments-list-table.php

    r48585 r48594  
    369369            $actions['delete'] = __( 'Delete permanently' );
    370370        } else {
    371             $actions['trash'] = __( 'Move to trash' );
     371            $actions['trash'] = __( 'Move to Trash' );
    372372        }
    373373
  • trunk/src/wp-admin/includes/class-wp-media-list-table.php

    r48424 r48594  
    175175                $actions['delete']  = __( 'Delete permanently' );
    176176            } else {
    177                 $actions['trash'] = __( 'Move to trash' );
     177                $actions['trash'] = __( 'Move to Trash' );
    178178            }
    179179        } else {
  • trunk/src/wp-admin/includes/class-wp-posts-list-table.php

    r48586 r48594  
    418418                $actions['delete'] = __( 'Delete permanently' );
    419419            } else {
    420                 $actions['trash'] = __( 'Move to trash' );
     420                $actions['trash'] = __( 'Move to Trash' );
    421421            }
    422422        }
  • trunk/src/wp-admin/includes/meta-boxes.php

    r48583 r48594  
    335335                $delete_text = __( 'Delete permanently' );
    336336            } else {
    337                 $delete_text = __( 'Move to trash' );
     337                $delete_text = __( 'Move to Trash' );
    338338            }
    339339            ?>
     
    439439    if ( current_user_can( 'delete_post', $post->ID ) ) {
    440440        if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
    441             echo "<a class='submitdelete deletion' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Move to trash' ) . '</a>';
     441            echo "<a class='submitdelete deletion' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Move to Trash' ) . '</a>';
    442442        } else {
    443443            $delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
  • trunk/src/wp-includes/media-template.php

    r48352 r48594  
    519519                    <?php if ( MEDIA_TRASH ) : ?>
    520520                        <# if ( 'trash' === data.status ) { #>
    521                             <button type="button" class="button-link untrash-attachment"><?php _e( 'Restore from trash' ); ?></button>
     521                            <button type="button" class="button-link untrash-attachment"><?php _e( 'Restore from Trash' ); ?></button>
    522522                        <# } else { #>
    523                             <button type="button" class="button-link trash-attachment"><?php _e( 'Move to trash' ); ?></button>
     523                            <button type="button" class="button-link trash-attachment"><?php _e( 'Move to Trash' ); ?></button>
    524524                        <# } #>
    525525                    <?php else : ?>
     
    640640                    <?php if ( MEDIA_TRASH ) : ?>
    641641                    <# if ( 'trash' === data.status ) { #>
    642                         <button type="button" class="button-link untrash-attachment"><?php _e( 'Restore from trash' ); ?></button>
     642                        <button type="button" class="button-link untrash-attachment"><?php _e( 'Restore from Trash' ); ?></button>
    643643                    <# } else { #>
    644                         <button type="button" class="button-link trash-attachment"><?php _e( 'Move to trash' ); ?></button>
     644                        <button type="button" class="button-link trash-attachment"><?php _e( 'Move to Trash' ); ?></button>
    645645                    <# } #>
    646646                    <?php else : ?>
  • trunk/src/wp-includes/media.php

    r48547 r48594  
    42164216        'warnBulkTrash'               => __( "You are about to trash these items.\n  'Cancel' to stop, 'OK' to delete." ),
    42174217        'bulkSelect'                  => __( 'Bulk select' ),
    4218         'trashSelected'               => __( 'Move to trash' ),
    4219         'restoreSelected'             => __( 'Restore from trash' ),
     4218        'trashSelected'               => __( 'Move to Trash' ),
     4219        'restoreSelected'             => __( 'Restore from Trash' ),
    42204220        'deletePermanently'           => __( 'Delete permanently' ),
    42214221        'apply'                       => __( 'Apply' ),
Note: See TracChangeset for help on using the changeset viewer.