WordPress.org

Make WordPress Core


Ignore:
Timestamp:
02/10/2020 04:10:09 AM (13 months 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/post.php

    r47219 r47233  
    14001400 *     @type bool        $can_export            Whether to allow this post type to be exported. Default true.
    14011401 *     @type bool        $delete_with_user      Whether to delete posts of this type when deleting a user. If true,
    1402  *                                              posts of this type belonging to the user will be moved to trash
     1402 *                                              posts of this type belonging to the user will be moved to Trash
    14031403 *                                              when then user is deleted. If false, posts of this type belonging
    14041404 *                                              to the user will *not* be trashed or deleted. If not set (the default),
     
    16401640 * - `search_items` - Label for searching plural items. Default is 'Search Posts' / 'Search Pages'.
    16411641 * - `not_found` - Label used when no items are found. Default is 'No posts found' / 'No pages found'.
    1642  * - `not_found_in_trash` - Label used when no items are in the trash. Default is 'No posts found in Trash' /
     1642 * - `not_found_in_trash` - Label used when no items are in the Trash. Default is 'No posts found in Trash' /
    16431643 *                        'No pages found in Trash'.
    16441644 * - `parent_item_colon` - Label used to prefix parents of hierarchical items. Not used on non-hierarchical
     
    29272927 * associated with the post.
    29282928 *
    2929  * The post or page is moved to trash instead of permanently deleted unless
    2930  * trash is disabled, item is already in the trash, or $force_delete is true.
     2929 * The post or page is moved to Trash instead of permanently deleted unless
     2930 * Trash is disabled, item is already in the Trash, or $force_delete is true.
    29312931 *
    29322932 * @since 1.0.0
     
    29372937 *
    29382938 * @param int  $postid       Optional. Post ID. Default 0.
    2939  * @param bool $force_delete Optional. Whether to bypass trash and force deletion.
     2939 * @param bool $force_delete Optional. Whether to bypass Trash and force deletion.
    29402940 *                           Default false.
    29412941 * @return WP_Post|false|null Post data on success, false or null on failure.
     
    29672967     * @param bool|null $delete       Whether to go forward with deletion.
    29682968     * @param WP_Post   $post         Post object.
    2969      * @param bool      $force_delete Whether to bypass the trash.
     2969     * @param bool      $force_delete Whether to bypass the Trash.
    29702970     */
    29712971    $check = apply_filters( 'pre_delete_post', null, $post, $force_delete );
     
    31043104 * Move a post or page to the Trash
    31053105 *
    3106  * If trash is disabled, the post or page is permanently deleted.
     3106 * If Trash is disabled, the post or page is permanently deleted.
    31073107 *
    31083108 * @since 2.9.0
     
    31433143
    31443144    /**
    3145      * Fires before a post is sent to the trash.
     3145     * Fires before a post is sent to the Trash.
    31463146     *
    31473147     * @since 3.3.0
     
    31683168
    31693169    /**
    3170      * Fires after a post is sent to the trash.
     3170     * Fires after a post is sent to the Trash.
    31713171     *
    31723172     * @since 2.9.0
     
    32123212
    32133213    /**
    3214      * Fires before a post is restored from the trash.
     3214     * Fires before a post is restored from the Trash.
    32153215     *
    32163216     * @since 2.9.0
     
    32393239
    32403240    /**
    3241      * Fires after a post is restored from the trash.
     3241     * Fires after a post is restored from the Trash.
    32423242     *
    32433243     * @since 2.9.0
     
    32513251
    32523252/**
    3253  * Moves comments for a post to the trash.
     3253 * Moves comments for a post to the Trash.
    32543254 *
    32553255 * @since 2.9.0
     
    32713271
    32723272    /**
    3273      * Fires before comments are sent to the trash.
     3273     * Fires before comments are sent to the Trash.
    32743274     *
    32753275     * @since 2.9.0
     
    32973297
    32983298    /**
    3299      * Fires after comments are sent to the trash.
     3299     * Fires after comments are sent to the Trash.
    33003300     *
    33013301     * @since 2.9.0
     
    33103310
    33113311/**
    3312  * Restore comments for a post from the trash.
     3312 * Restore comments for a post from the Trash.
    33133313 *
    33143314 * @since 2.9.0
     
    33363336
    33373337    /**
    3338      * Fires before comments are restored for a post from the trash.
     3338     * Fires before comments are restored for a post from the Trash.
    33393339     *
    33403340     * @since 2.9.0
     
    33643364
    33653365    /**
    3366      * Fires after comments are restored for a post from the trash.
     3366     * Fires after comments are restored for a post from the Trash.
    33673367     *
    33683368     * @since 2.9.0
     
    55755575 * with the attachment (except the main post).
    55765576 *
    5577  * The attachment is moved to the trash instead of permanently deleted unless trash
    5578  * for media is disabled, item is already in the trash, or $force_delete is true.
     5577 * The attachment is moved to the Trash instead of permanently deleted unless Trash
     5578 * for media is disabled, item is already in the Trash, or $force_delete is true.
    55795579 *
    55805580 * @since 2.0.0
     
    55835583 *
    55845584 * @param int  $post_id      Attachment ID.
    5585  * @param bool $force_delete Optional. Whether to bypass trash and force deletion.
     5585 * @param bool $force_delete Optional. Whether to bypass Trash and force deletion.
    55865586 *                           Default false.
    55875587 * @return WP_Post|false|null Post data on success, false or null on failure.
Note: See TracChangeset for help on using the changeset viewer.