WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Sergey Biryukov 2020-07-24 00:21:03 +00:00
parent e1830a8182
commit 703a978a77
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/comment.php
View File

@ -129,7 +129,7 @@ switch ( $action ) {
break; break;
case 'trash': case 'trash':
$caution_msg = __( 'You are about to move the following comment to the Trash:' ); $caution_msg = __( 'You are about to move the following comment to the Trash:' );
$button = __( 'Move to trash' ); $button = __( 'Move to Trash' );
break; break;
case 'delete': case 'delete':
$caution_msg = __( 'You are about to delete the following comment:' ); $caution_msg = __( 'You are about to delete the following comment:' );

2
wp-admin/edit-form-comment.php
View File

@ -202,7 +202,7 @@ endif;
<div id="major-publishing-actions"> <div id="major-publishing-actions">
<div id="delete-action"> <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>
<div id="publishing-action"> <div id="publishing-action">
<?php submit_button( __( 'Update' ), 'primary large', 'save', false ); ?> <?php submit_button( __( 'Update' ), 'primary large', 'save', false ); ?>

2
wp-admin/includes/class-wp-comments-list-table.php
View File

@ -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 ) { if ( in_array( $comment_status, array( 'trash', 'spam' ), true ) || ! EMPTY_TRASH_DAYS ) {
$actions['delete'] = __( 'Delete permanently' ); $actions['delete'] = __( 'Delete permanently' );
} else { } else {
$actions['trash'] = __( 'Move to trash' ); $actions['trash'] = __( 'Move to Trash' );
} }
return $actions; return $actions;

2
wp-admin/includes/class-wp-media-list-table.php
View File

@ -174,7 +174,7 @@ class WP_Media_List_Table extends WP_List_Table {
$actions['untrash'] = __( 'Restore' ); $actions['untrash'] = __( 'Restore' );
$actions['delete'] = __( 'Delete permanently' ); $actions['delete'] = __( 'Delete permanently' );
} else { } else {
$actions['trash'] = __( 'Move to trash' ); $actions['trash'] = __( 'Move to Trash' );
} }
} else { } else {
$actions['delete'] = __( 'Delete permanently' ); $actions['delete'] = __( 'Delete permanently' );

2
wp-admin/includes/class-wp-posts-list-table.php
View File

@ -417,7 +417,7 @@ class WP_Posts_List_Table extends WP_List_Table {
if ( $this->is_trash || ! EMPTY_TRASH_DAYS ) { if ( $this->is_trash || ! EMPTY_TRASH_DAYS ) {
$actions['delete'] = __( 'Delete permanently' ); $actions['delete'] = __( 'Delete permanently' );
} else { } else {
$actions['trash'] = __( 'Move to trash' ); $actions['trash'] = __( 'Move to Trash' );
} }
} }

4
wp-admin/includes/meta-boxes.php
View File

@ -334,7 +334,7 @@ function post_submit_meta_box( $post, $args = array() ) {
if ( ! EMPTY_TRASH_DAYS ) { if ( ! EMPTY_TRASH_DAYS ) {
$delete_text = __( 'Delete permanently' ); $delete_text = __( 'Delete permanently' );
} else { } else {
$delete_text = __( 'Move to trash' ); $delete_text = __( 'Move to Trash' );
} }
?> ?>
<a class="submitdelete deletion" href="<?php echo get_delete_post_link( $post_id ); ?>"><?php echo $delete_text; ?></a> <a class="submitdelete deletion" href="<?php echo get_delete_post_link( $post_id ); ?>"><?php echo $delete_text; ?></a>
@ -438,7 +438,7 @@ function attachment_submit_meta_box( $post ) {
<?php <?php
if ( current_user_can( 'delete_post', $post->ID ) ) { if ( current_user_can( 'delete_post', $post->ID ) ) {
if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) { if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
echo "<a class='submitdelete deletion' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Move to trash' ) . '</a>'; echo "<a class='submitdelete deletion' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Move to Trash' ) . '</a>';
} else { } else {
$delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : ''; $delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
echo "<a class='submitdelete deletion'$delete_ays href='" . get_delete_post_link( $post->ID, null, true ) . "'>" . __( 'Delete permanently' ) . '</a>'; echo "<a class='submitdelete deletion'$delete_ays href='" . get_delete_post_link( $post->ID, null, true ) . "'>" . __( 'Delete permanently' ) . '</a>';

8
wp-includes/media-template.php
View File

@ -518,9 +518,9 @@ function wp_print_media_templates() {
<# if ( ! data.uploading && data.can.remove ) { #> | <# if ( ! data.uploading && data.can.remove ) { #> |
<?php if ( MEDIA_TRASH ) : ?> <?php if ( MEDIA_TRASH ) : ?>
<# if ( 'trash' === data.status ) { #> <# if ( 'trash' === data.status ) { #>
<button type="button" class="button-link untrash-attachment"><?php _e( 'Restore from trash' ); ?></button> <button type="button" class="button-link untrash-attachment"><?php _e( 'Restore from Trash' ); ?></button>
<# } else { #> <# } else { #>
<button type="button" class="button-link trash-attachment"><?php _e( 'Move to trash' ); ?></button> <button type="button" class="button-link trash-attachment"><?php _e( 'Move to Trash' ); ?></button>
<# } #> <# } #>
<?php else : ?> <?php else : ?>
<button type="button" class="button-link delete-attachment"><?php _e( 'Delete permanently' ); ?></button> <button type="button" class="button-link delete-attachment"><?php _e( 'Delete permanently' ); ?></button>
@ -639,9 +639,9 @@ function wp_print_media_templates() {
<# if ( ! data.uploading && data.can.remove ) { #> <# if ( ! data.uploading && data.can.remove ) { #>
<?php if ( MEDIA_TRASH ) : ?> <?php if ( MEDIA_TRASH ) : ?>
<# if ( 'trash' === data.status ) { #> <# if ( 'trash' === data.status ) { #>
<button type="button" class="button-link untrash-attachment"><?php _e( 'Restore from trash' ); ?></button> <button type="button" class="button-link untrash-attachment"><?php _e( 'Restore from Trash' ); ?></button>
<# } else { #> <# } else { #>
<button type="button" class="button-link trash-attachment"><?php _e( 'Move to trash' ); ?></button> <button type="button" class="button-link trash-attachment"><?php _e( 'Move to Trash' ); ?></button>
<# } #> <# } #>
<?php else : ?> <?php else : ?>
<button type="button" class="button-link delete-attachment"><?php _e( 'Delete permanently' ); ?></button> <button type="button" class="button-link delete-attachment"><?php _e( 'Delete permanently' ); ?></button>

4
wp-includes/media.php
View File

@ -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." ), '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." ), 'warnBulkTrash' => __( "You are about to trash these items.\n 'Cancel' to stop, 'OK' to delete." ),
'bulkSelect' => __( 'Bulk select' ), 'bulkSelect' => __( 'Bulk select' ),
'trashSelected' => __( 'Move to trash' ), 'trashSelected' => __( 'Move to Trash' ),
'restoreSelected' => __( 'Restore from trash' ), 'restoreSelected' => __( 'Restore from Trash' ),
'deletePermanently' => __( 'Delete permanently' ), 'deletePermanently' => __( 'Delete permanently' ),
'apply' => __( 'Apply' ), 'apply' => __( 'Apply' ),
'filterByDate' => __( 'Filter by date' ), 'filterByDate' => __( 'Filter by date' ),

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.