vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 14:20:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Administration: Capitalize Trash consistently in various messages and comments.

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

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

git-svn-id: https://develop.svn.wordpress.org/trunk@47233 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov
2020-02-10 04:10:09 +00:00
parent 5302cd6514
commit 023d4b2796
24 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/wp-includes/post.php
View File

@@ -1399,7 +1399,7 @@ function get_post_types( $args = array(), $output = 'names', $operator = 'and' )
* ?{query_var_string}={post_slug} will be valid.
* @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),
* posts are trashed if post_type_supports('author'). Otherwise posts
@@ -1639,7 +1639,7 @@ function _post_type_meta_capabilities( $capabilities = null ) {
* - `view_items` - Label for viewing post type archives. Default is 'View Posts' / 'View Pages'.
* - `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
* post types. Default is 'Parent Page:'.
@@ -2926,8 +2926,8 @@ function wp_post_mime_type_where( $post_mime_types, $table_alias = '' ) {
* it is deleted also. This includes comments, post meta fields, and terms
* 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
*
@@ -2936,7 +2936,7 @@ function wp_post_mime_type_where( $post_mime_types, $table_alias = '' ) {
* @see wp_trash_post()
*
* @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.
*/
@@ -2966,7 +2966,7 @@ function wp_delete_post( $postid = 0, $force_delete = false ) {
*
* @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 );
if ( null !== $check ) {
@@ -3103,7 +3103,7 @@ function _reset_front_page_settings_for_post( $post_id ) {
/**
* 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
*
@@ -3142,7 +3142,7 @@ function wp_trash_post( $post_id = 0 ) {
}
/**
* Fires before a post is sent to the trash.
* Fires before a post is sent to the Trash.
*
* @since 3.3.0
*
@@ -3167,7 +3167,7 @@ function wp_trash_post( $post_id = 0 ) {
wp_trash_post_comments( $post_id );
/**
* Fires after a post is sent to the trash.
* Fires after a post is sent to the Trash.
*
* @since 2.9.0
*
@@ -3211,7 +3211,7 @@ function wp_untrash_post( $post_id = 0 ) {
}
/**
* Fires before a post is restored from the trash.
* Fires before a post is restored from the Trash.
*
* @since 2.9.0
*
@@ -3238,7 +3238,7 @@ function wp_untrash_post( $post_id = 0 ) {
wp_untrash_post_comments( $post_id );
/**
* Fires after a post is restored from the trash.
* Fires after a post is restored from the Trash.
*
* @since 2.9.0
*
@@ -3250,7 +3250,7 @@ function wp_untrash_post( $post_id = 0 ) {
}
/**
* Moves comments for a post to the trash.
* Moves comments for a post to the Trash.
*
* @since 2.9.0
*
@@ -3270,7 +3270,7 @@ function wp_trash_post_comments( $post = null ) {
$post_id = $post->ID;
/**
* Fires before comments are sent to the trash.
* Fires before comments are sent to the Trash.
*
* @since 2.9.0
*
@@ -3296,7 +3296,7 @@ function wp_trash_post_comments( $post = null ) {
clean_comment_cache( array_keys( $statuses ) );
/**
* Fires after comments are sent to the trash.
* Fires after comments are sent to the Trash.
*
* @since 2.9.0
*
@@ -3309,7 +3309,7 @@ function wp_trash_post_comments( $post = null ) {
}
/**
* Restore comments for a post from the trash.
* Restore comments for a post from the Trash.
*
* @since 2.9.0
*
@@ -3335,7 +3335,7 @@ function wp_untrash_post_comments( $post = null ) {
}
/**
* 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
*
@@ -3363,7 +3363,7 @@ function wp_untrash_post_comments( $post = null ) {
delete_post_meta( $post_id, '_wp_trash_meta_comments_status' );
/**
* 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
*
@@ -5574,15 +5574,15 @@ function wp_insert_attachment( $args, $file = false, $parent = 0, $wp_error = fa
* Deletion removes all post meta fields, taxonomy, comments, etc. associated
* 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
*
* @global wpdb $wpdb WordPress database abstraction object.
*
* @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.
*/