Commit 63c715b6 authored by Sergey Biryukov's avatar Sergey Biryukov
Browse files

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.
Built from https://develop.svn.wordpress.org/trunk@48594


git-svn-id: https://core.svn.wordpress.org/trunk@48356 1a063a9b-81f0-0310-95a4-ce76da25c4cd
parent b119abd5

wp-admin/comment.php

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ switch ( $action ) { 
				break;

			case 'trash':

				$caution_msg = __( 'You are about to move the following comment to the Trash:' );

				$button      = __( 'Move to trash' );

				$button      = __( 'Move to Trash' );

				break;

			case 'delete':

				$caution_msg = __( 'You are about to delete the following comment:' );

wp-admin/edit-form-comment.php

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ endif; 


<div id="major-publishing-actions">

<div id="delete-action">

<?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"; ?>

<?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"; ?>

</div>

<div id="publishing-action">

<?php submit_button( __( 'Update' ), 'primary large', 'save', false ); ?>

wp-admin/includes/class-wp-comments-list-table.php

+1 −1
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ class WP_Comments_List_Table extends WP_List_Table { 
		if ( in_array( $comment_status, array( 'trash', 'spam' ), true ) || ! EMPTY_TRASH_DAYS ) {

			$actions['delete'] = __( 'Delete permanently' );

		} else {

			$actions['trash'] = __( 'Move to trash' );

			$actions['trash'] = __( 'Move to Trash' );

		}



		return $actions;

wp-admin/includes/class-wp-media-list-table.php

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ class WP_Media_List_Table extends WP_List_Table { 
				$actions['untrash'] = __( 'Restore' );

				$actions['delete']  = __( 'Delete permanently' );

			} else {

				$actions['trash'] = __( 'Move to trash' );

				$actions['trash'] = __( 'Move to Trash' );

			}

		} else {

			$actions['delete'] = __( 'Delete permanently' );

wp-admin/includes/class-wp-posts-list-table.php

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ class WP_Posts_List_Table extends WP_List_Table { 
			if ( $this->is_trash || ! EMPTY_TRASH_DAYS ) {

				$actions['delete'] = __( 'Delete permanently' );

			} else {

				$actions['trash'] = __( 'Move to trash' );

				$actions['trash'] = __( 'Move to Trash' );

			}

		}