Changeset 48594

Timestamp:

07/24/2020 12:19:37 AM (4 years 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:

• wp-admin/comment.php (modified) (1 diff)
• wp-admin/edit-form-comment.php (modified) (1 diff)
• wp-admin/includes/class-wp-comments-list-table.php (modified) (1 diff)
• wp-admin/includes/class-wp-media-list-table.php (modified) (1 diff)
• wp-admin/includes/class-wp-posts-list-table.php (modified) (1 diff)
• wp-admin/includes/meta-boxes.php (modified) (2 diffs)
• wp-includes/media-template.php (modified) (2 diffs)
• wp-includes/media.php (modified) (1 diff)

trunk/src/wp-admin/comment.php

@@ -130 +130 @@
             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':

trunk/src/wp-admin/edit-form-comment.php

@@ -203 +203 @@
 <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">

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

@@ -369 +369 @@
             $actions['delete'] = __( 'Delete permanently' );
         } else {
-            $actions['trash'] = __( 'Move to trash' );
+            $actions['trash'] = __( 'Move to Trash' );
         }
 

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

@@ -175 +175 @@
                 $actions['delete']  = __( 'Delete permanently' );
             } else {
-                $actions['trash'] = __( 'Move to trash' );
+                $actions['trash'] = __( 'Move to Trash' );
             }
         } else {

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

@@ -418 +418 @@
                 $actions['delete'] = __( 'Delete permanently' );
             } else {
-                $actions['trash'] = __( 'Move to trash' );
+                $actions['trash'] = __( 'Move to Trash' );
             }
         }

trunk/src/wp-admin/includes/meta-boxes.php

@@ -335 +335 @@
                 $delete_text = __( 'Delete permanently' );
             } else {
-                $delete_text = __( 'Move to trash' );
+                $delete_text = __( 'Move to Trash' );
             }
             ?>
@@ -439 +439 @@
     if ( current_user_can( 'delete_post', $post->ID ) ) {
         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 {
             $delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';

trunk/src/wp-includes/media-template.php

@@ -519 +519 @@
                     <?php if ( MEDIA_TRASH ) : ?>
                         <# 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 { #>
-                            <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 : ?>
@@ -640 +640 @@
                     <?php if ( MEDIA_TRASH ) : ?>
                     <# 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 { #>
-                        <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 : ?>

trunk/src/wp-includes/media.php

@@ -4216 +4216 @@
         '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' ),