From 703a978a77eb680323363309c5af1f53d67c1f8d Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 24 Jul 2020 00:21:03 +0000 Subject: [PATCH] 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: http://core.svn.wordpress.org/trunk@48356 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/comment.php | 2 +- wp-admin/edit-form-comment.php | 2 +- wp-admin/includes/class-wp-comments-list-table.php | 2 +- wp-admin/includes/class-wp-media-list-table.php | 2 +- wp-admin/includes/class-wp-posts-list-table.php | 2 +- wp-admin/includes/meta-boxes.php | 4 ++-- wp-includes/media-template.php | 8 ++++---- wp-includes/media.php | 4 ++-- wp-includes/version.php | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/wp-admin/comment.php b/wp-admin/comment.php index 0687f07888..bdba4604a8 100644 --- a/wp-admin/comment.php +++ b/wp-admin/comment.php @@ -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:' ); diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php index e7fe548a80..38f6c7b9b0 100644 --- a/wp-admin/edit-form-comment.php +++ b/wp-admin/edit-form-comment.php @@ -202,7 +202,7 @@ endif;
-comment_ID&_wp_original_http_referer=" . urlencode( wp_get_referer() ), 'delete-comment_' . $comment->comment_ID ) . "'>" . ( ! EMPTY_TRASH_DAYS ? __( 'Delete Permanently' ) : __( 'Move to trash' ) ) . "\n"; ?> +comment_ID&_wp_original_http_referer=" . urlencode( wp_get_referer() ), 'delete-comment_' . $comment->comment_ID ) . "'>" . ( ! EMPTY_TRASH_DAYS ? __( 'Delete Permanently' ) : __( 'Move to Trash' ) ) . "\n"; ?>
diff --git a/wp-admin/includes/class-wp-comments-list-table.php b/wp-admin/includes/class-wp-comments-list-table.php index 8e90297891..c7ffb4d9f2 100644 --- a/wp-admin/includes/class-wp-comments-list-table.php +++ b/wp-admin/includes/class-wp-comments-list-table.php @@ -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; diff --git a/wp-admin/includes/class-wp-media-list-table.php b/wp-admin/includes/class-wp-media-list-table.php index b0fbfaea22..cb06d8915d 100644 --- a/wp-admin/includes/class-wp-media-list-table.php +++ b/wp-admin/includes/class-wp-media-list-table.php @@ -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' ); diff --git a/wp-admin/includes/class-wp-posts-list-table.php b/wp-admin/includes/class-wp-posts-list-table.php index 843cb3658c..4dd0928736 100644 --- a/wp-admin/includes/class-wp-posts-list-table.php +++ b/wp-admin/includes/class-wp-posts-list-table.php @@ -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' ); } } diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php index 35a0ab3149..f1cec18c5e 100644 --- a/wp-admin/includes/meta-boxes.php +++ b/wp-admin/includes/meta-boxes.php @@ -334,7 +334,7 @@ function post_submit_meta_box( $post, $args = array() ) { if ( ! EMPTY_TRASH_DAYS ) { $delete_text = __( 'Delete permanently' ); } else { - $delete_text = __( 'Move to trash' ); + $delete_text = __( 'Move to Trash' ); } ?> @@ -438,7 +438,7 @@ function attachment_submit_meta_box( $post ) { ID ) ) { if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) { - echo "" . __( 'Move to trash' ) . ''; + echo "" . __( 'Move to Trash' ) . ''; } else { $delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : ''; echo "" . __( 'Delete permanently' ) . ''; diff --git a/wp-includes/media-template.php b/wp-includes/media-template.php index 7a0057df8a..71eabb3eaf 100644 --- a/wp-includes/media-template.php +++ b/wp-includes/media-template.php @@ -518,9 +518,9 @@ function wp_print_media_templates() { <# if ( ! data.uploading && data.can.remove ) { #> | <# if ( 'trash' === data.status ) { #> - + <# } else { #> - + <# } #> @@ -639,9 +639,9 @@ function wp_print_media_templates() { <# if ( ! data.uploading && data.can.remove ) { #> <# if ( 'trash' === data.status ) { #> - + <# } else { #> - + <# } #> diff --git a/wp-includes/media.php b/wp-includes/media.php index 8a3844e75e..3a11006347 100644 --- a/wp-includes/media.php +++ b/wp-includes/media.php @@ -4215,8 +4215,8 @@ function wp_enqueue_media( $args = array() ) { 'warnBulkDelete' => __( "You are about to permanently delete these items from your site.\nThis action cannot be undone.\n 'Cancel' to stop, 'OK' to delete." ), 'warnBulkTrash' => __( "You are about to trash these items.\n 'Cancel' to stop, 'OK' to delete." ), 'bulkSelect' => __( 'Bulk select' ), - 'trashSelected' => __( 'Move to trash' ), - 'restoreSelected' => __( 'Restore from trash' ), + 'trashSelected' => __( 'Move to Trash' ), + 'restoreSelected' => __( 'Restore from Trash' ), 'deletePermanently' => __( 'Delete permanently' ), 'apply' => __( 'Apply' ), 'filterByDate' => __( 'Filter by date' ), diff --git a/wp-includes/version.php b/wp-includes/version.php index ef57d62540..1886ed6e97 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.5-beta3-48593'; +$wp_version = '5.5-beta3-48594'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.