Changeset 47233 for trunk/src/wp-includes/post.php

Timestamp:

02/10/2020 04:10:09 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Administration: Capitalize Trash consistently in various messages and comments.

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

Props garrett-eclipse, aandrewdixon, Presskopp.
Fixes #45317.

File:

• trunk/src/wp-includes/post.php (modified) (18 diffs)

trunk/src/wp-includes/post.php

@@ -1400 +1400 @@
  *     @type bool        $can_export            Whether to allow this post type to be exported. Default true.
  *     @type bool        $delete_with_user      Whether to delete posts of this type when deleting a user. If true,
- *                                              posts of this type belonging to the user will be moved to trash
+ *                                              posts of this type belonging to the user will be moved to Trash
  *                                              when then user is deleted. If false, posts of this type belonging
  *                                              to the user will *not* be trashed or deleted. If not set (the default),
@@ -1640 +1640 @@
  * - `search_items` - Label for searching plural items. Default is 'Search Posts' / 'Search Pages'.
  * - `not_found` - Label used when no items are found. Default is 'No posts found' / 'No pages found'.
- * - `not_found_in_trash` - Label used when no items are in the trash. Default is 'No posts found in Trash' /
+ * - `not_found_in_trash` - Label used when no items are in the Trash. Default is 'No posts found in Trash' /
  *                        'No pages found in Trash'.
  * - `parent_item_colon` - Label used to prefix parents of hierarchical items. Not used on non-hierarchical
@@ -2927 +2927 @@
  * associated with the post.
  *
- * The post or page is moved to trash instead of permanently deleted unless
- * trash is disabled, item is already in the trash, or $force_delete is true.
+ * The post or page is moved to Trash instead of permanently deleted unless
+ * Trash is disabled, item is already in the Trash, or $force_delete is true.
  *
  * @since 1.0.0
@@ -2937 +2937 @@
  *
  * @param int  $postid       Optional. Post ID. Default 0.
- * @param bool $force_delete Optional. Whether to bypass trash and force deletion.
+ * @param bool $force_delete Optional. Whether to bypass Trash and force deletion.
  *                           Default false.
  * @return WP_Post|false|null Post data on success, false or null on failure.
@@ -2967 +2967 @@
      * @param bool|null $delete       Whether to go forward with deletion.
      * @param WP_Post   $post         Post object.
-     * @param bool      $force_delete Whether to bypass the trash.
+     * @param bool      $force_delete Whether to bypass the Trash.
      */
     $check = apply_filters( 'pre_delete_post', null, $post, $force_delete );
@@ -3104 +3104 @@
  * Move a post or page to the Trash
  *
- * If trash is disabled, the post or page is permanently deleted.
+ * If Trash is disabled, the post or page is permanently deleted.
  *
  * @since 2.9.0
@@ -3143 +3143 @@
 
     /**
-     * Fires before a post is sent to the trash.
+     * Fires before a post is sent to the Trash.
      *
      * @since 3.3.0
@@ -3168 +3168 @@
 
     /**
-     * Fires after a post is sent to the trash.
+     * Fires after a post is sent to the Trash.
      *
      * @since 2.9.0
@@ -3212 +3212 @@
 
     /**
-     * Fires before a post is restored from the trash.
+     * Fires before a post is restored from the Trash.
      *
      * @since 2.9.0
@@ -3239 +3239 @@
 
     /**
-     * Fires after a post is restored from the trash.
+     * Fires after a post is restored from the Trash.
      *
      * @since 2.9.0
@@ -3251 +3251 @@
 
 /**
- * Moves comments for a post to the trash.
+ * Moves comments for a post to the Trash.
  *
  * @since 2.9.0
@@ -3271 +3271 @@
 
     /**
-     * Fires before comments are sent to the trash.
+     * Fires before comments are sent to the Trash.
      *
      * @since 2.9.0
@@ -3297 +3297 @@
 
     /**
-     * Fires after comments are sent to the trash.
+     * Fires after comments are sent to the Trash.
      *
      * @since 2.9.0
@@ -3310 +3310 @@
 
 /**
- * Restore comments for a post from the trash.
+ * Restore comments for a post from the Trash.
  *
  * @since 2.9.0
@@ -3336 +3336 @@
 
     /**
-     * Fires before comments are restored for a post from the trash.
+     * Fires before comments are restored for a post from the Trash.
      *
      * @since 2.9.0
@@ -3364 +3364 @@
 
     /**
-     * Fires after comments are restored for a post from the trash.
+     * Fires after comments are restored for a post from the Trash.
      *
      * @since 2.9.0
@@ -5575 +5575 @@
  * with the attachment (except the main post).
  *
- * The attachment is moved to the trash instead of permanently deleted unless trash
- * for media is disabled, item is already in the trash, or $force_delete is true.
+ * The attachment is moved to the Trash instead of permanently deleted unless Trash
+ * for media is disabled, item is already in the Trash, or $force_delete is true.
  *
  * @since 2.0.0
@@ -5583 +5583 @@
  *
  * @param int  $post_id      Attachment ID.
- * @param bool $force_delete Optional. Whether to bypass trash and force deletion.
+ * @param bool $force_delete Optional. Whether to bypass Trash and force deletion.
  *                           Default false.
  * @return WP_Post|false|null Post data on success, false or null on failure.