WordPress.org
Get WordPress

Make WordPress Core

Ticket #45317: 45317.3.diff

File 45317.3.diff, 35.9 KB (added by garrett-eclipse, 7 years ago)

Refresh in order for it to apply properly. As well as caught several strings in comments that were overlooked

  • src/js/_enqueues/admin/edit-comments.js

     
    536536                        // the comment is currently pending
    537537                        } else if ( unapproved ) {
    538538                                pendingDiff = -1;
    539                         // the comment was in the trash
     539                        // the comment was in the Trash
    540540                        } else if ( trashed ) {
    541541                                trashDiff = -1;
    542542                        }
    … …  
    578578                        } else if ( spammed ) {
    579579                                spamDiff = -1;
    580580                        }
    581                         // you can't trash an item on the trash screen
     581                        // you can't trash an item on the Trash screen
    582582                        trashDiff = 1;
    583583
    584584                // user clicked "Restore"
    … …  
    594594                                        pendingDiff = 1;
    595595                                }
    596596                        }
    597                         // you can't go from trash to spam
    598                         // you can untrash on the trash screen
     597                        // you can't go from Trash to spam
     598                        // you can untrash on the Trash screen
    599599                        trashDiff = -1;
    600600
    601601                // User clicked "Approve"

  • src/js/_enqueues/wp/customize/widgets.js

     
    18591859                                                        removedControl.container.remove();
    18601860                                                }
    18611861
    1862                                                 // Move widget to inactive widgets sidebar (move it to trash) if has been previously saved
     1862                                                // Move widget to inactive widgets sidebar (Move it to Trash) if has been previously saved
    18631863                                                // This prevents the inactive widgets sidebar from overflowing with throwaway widgets
    18641864                                                if ( api.Widgets.savedWidgetIds[removedWidgetId] ) {
    18651865                                                        inactiveWidgets = api.value( 'sidebars_widgets[wp_inactive_widgets]' )().slice();

  • src/js/media/views/attachment/details.js

     
    120120        },
    121121
    122122        /**
    123          * Sets the trash state on an attachment, or destroys the model itself.
     123         * Sets the Trash state on an attachment, or destroys the model itself.
    124124         *
    125125         * If the mediaTrash setting is set to true, trashes the attachment.
    126126         * Otherwise, the model itself is destroyed.
    … …  
    138138
    139139                this.getFocusableElements();
    140140
    141                 // When in the Media Library and the Media trash is enabled.
     141                // When in the Media Library and the Media Trash is enabled.
    142142                if ( wp.media.view.settings.mediaTrash &&
    143143                        'edit-metadata' === this.controller.content.mode() ) {
    144144

  • src/wp-admin/admin.php

     
    9393
    9494auth_redirect();
    9595
    96 // Schedule trash collection
     96// Schedule Trash collection
    9797if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) && ! wp_installing() ) {
    9898        wp_schedule_event( time(), 'daily', 'wp_scheduled_delete' );
    9999}

  • src/wp-admin/edit.php

     
    8181        }
    8282
    8383        if ( 'delete_all' === $doaction ) {
    84                 // Prepare for deletion of all posts with a specified post status (i.e. Empty trash).
     84                // Prepare for deletion of all posts with a specified post status (i.e. Empty Trash).
    8585                $post_status = preg_replace( '/[^a-z0-9_-]+/i', '', $_REQUEST['post_status'] );
    8686                // Validate the post status exists.
    8787                if ( get_post_status_object( $post_status ) ) {
    … …  
    240240                                        '<ul>' .
    241241                                                '<li>' . __( '<strong>Edit</strong> takes you to the editing screen for that post. You can also reach that screen by clicking on the post title.' ) . '</li>' .
    242242                                                '<li>' . __( '<strong>Quick Edit</strong> provides inline access to the metadata of your post, allowing you to update post details without leaving this screen.' ) . '</li>' .
    243                                                 '<li>' . __( '<strong>Trash</strong> removes your post from this list and places it in the trash, from which you can permanently delete it.' ) . '</li>' .
     243                                                '<li>' . __( '<strong>Trash</strong> removes your post from this list and places it in the Trash, from which you can permanently delete it.' ) . '</li>' .
    244244                                                '<li>' . __( '<strong>Preview</strong> will show you what your draft post will look like if you publish it. View will take you to your live site to view the post. Which link is available depends on your post&#8217;s status.' ) . '</li>' .
    245245                                        '</ul>',
    246246                )
    … …  
    250250                        'id'      => 'bulk-actions',
    251251                        'title'   => __( 'Bulk Actions' ),
    252252                        'content' =>
    253                                         '<p>' . __( 'You can also edit or move multiple posts to the trash at once. Select the posts you want to act on using the checkboxes, then select the action you want to take from the Bulk Actions menu and click Apply.' ) . '</p>' .
     253                                        '<p>' . __( 'You can also edit or move multiple posts to the Trash at once. Select the posts you want to act on using the checkboxes, then select the action you want to take from the Bulk Actions menu and click Apply.' ) . '</p>' .
    254254                                                        '<p>' . __( 'When using Bulk Edit, you can change the metadata (categories, author, etc.) for all selected posts at once. To remove a post from the grouping, just click the x next to its name in the Bulk Edit area that appears.' ) . '</p>',
    255255                )
    256256        );

  • src/wp-admin/includes/ajax-actions.php

     
    716716
    717717                $r = wp_untrash_comment( $comment );
    718718
    719                 if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'trash' ) { // undo trash, not in trash
     719                if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'trash' ) { // undo trash, not in Trash
    720720                        $delta = 1;
    721721                }
    722722        } elseif ( isset( $_POST['spam'] ) && 1 == $_POST['spam'] ) {
    … …  
    858858}
    859859
    860860/**
    861  * Ajax handler for sending a post to the trash.
     861 * Ajax handler for sending a post to the Trash.
    862862 *
    863863 * @since 3.1.0
    864864 *
    … …  
    894894}
    895895
    896896/**
    897  * Ajax handler to restore a post from the trash.
     897 * Ajax handler to restore a post from the Trash.
    898898 *
    899899 * @since 3.1.0
    900900 *

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

     
    493493
    494494                /*
    495495                 * Return if the post type doesn't have post formats, or there are no posts using formats,
    496                  * or if we're in the trash.
     496                 * or if we're in the Trash.
    497497                 */
    498498                if ( ! is_object_in_taxonomy( $post_type, 'post_format' ) || ! $used_post_formats || $this->is_trash ) {
    499499                        return;

  • src/wp-admin/includes/template.php

     
    523523}
    524524
    525525/**
    526  * Output 'undo move to trash' text for comments
     526 * Output 'undo move to Trash' text for comments
    527527 *
    528528 * @since 2.9.0
    529529 */
    … …  
    533533        <div class="trash-undo-inside">
    534534                <?php
    535535                /* translators: %s: Comment author, filled by AJAX. */
    536                 printf( __( 'Comment by %s moved to the trash.' ), '<strong></strong>' );
     536                printf( __( 'Comment by %s moved to the Trash.' ), '<strong></strong>' );
    537537                ?>
    538538                <span class="undo untrash"><a href="#"><?php _e( 'Undo' ); ?></a></span>
    539539        </div>

  • src/wp-admin/options-discussion.php

     
    206206<tr>
    207207<th scope="row"><?php _e( 'Comment Blacklist' ); ?></th>
    208208<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Comment Blacklist' ); ?></span></legend>
    209 <p><label for="blacklist_keys"><?php _e( 'When a comment contains any of these words in its content, name, URL, email, or IP address, it will be put in the trash. One word or IP address per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.' ); ?></label></p>
     209<p><label for="blacklist_keys"><?php _e( 'When a comment contains any of these words in its content, name, URL, email, or IP address, it will be put in the Trash. One word or IP address per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.' ); ?></label></p>
    210210<p>
    211211<textarea name="blacklist_keys" rows="10" cols="50" id="blacklist_keys" class="large-text code"><?php echo esc_textarea( get_option( 'blacklist_keys' ) ); ?></textarea>
    212212</p>

  • src/wp-admin/options-privacy.php

     
    101101                                'page_for_privacy_policy',
    102102                                sprintf(
    103103                                        /* translators: URL to Pages Trash. */
    104                                         __( 'The currently selected Privacy Policy page is in the trash. Please create or select a new Privacy Policy page or <a href="%s">restore the current page</a>.' ),
     104                                        __( 'The currently selected Privacy Policy page is in the Trash. Please create or select a new Privacy Policy page or <a href="%s">restore the current page</a>.' ),
    105105                                        'edit.php?post_status=trash&post_type=page'
    106106                                ),
    107107                                'error'

  • src/wp-admin/upload.php

     
    326326if ( ! empty( $_GET['trashed'] ) && absint( $_GET['trashed'] ) ) {
    327327        $trashed = absint( $_GET['trashed'] );
    328328        if ( 1 == $trashed ) {
    329                 $message = __( 'Media file moved to the trash.' );
     329                $message = __( 'Media file moved to the Trash.' );
    330330        } else {
    331331                /* translators: %s: Number of media files. */
    332                 $message = _n( '%s media file moved to the trash.', '%s media files moved to the trash.', $trashed );
     332                $message = _n( '%s media file moved to the Trash.', '%s media files moved to the Trash.', $trashed );
    333333        }
    334334        $message                = sprintf( $message, number_format_i18n( $trashed ) );
    335335        $message               .= ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids=' . ( isset( $_GET['ids'] ) ? $_GET['ids'] : '' ), 'bulk-media' ) ) . '">' . __( 'Undo' ) . '</a>';
    … …  
    339339if ( ! empty( $_GET['untrashed'] ) && absint( $_GET['untrashed'] ) ) {
    340340        $untrashed = absint( $_GET['untrashed'] );
    341341        if ( 1 == $untrashed ) {
    342                 $message = __( 'Media file restored from the trash.' );
     342                $message = __( 'Media file restored from the Trash.' );
    343343        } else {
    344344                /* translators: %s: Number of media files. */
    345                 $message = _n( '%s media file restored from the trash.', '%s media files restored from the trash.', $untrashed );
     345                $message = _n( '%s media file restored from the Trash.', '%s media files restored from the Trash.', $untrashed );
    346346        }
    347347        $message                = sprintf( $message, number_format_i18n( $untrashed ) );
    348348        $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'untrashed' ), $_SERVER['REQUEST_URI'] );
    … …  
    351351$messages[1] = __( 'Media file updated.' );
    352352$messages[2] = __( 'Media file permanently deleted.' );
    353353$messages[3] = __( 'Error saving media file.' );
    354 $messages[4] = __( 'Media file moved to the trash.' ) . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids=' . ( isset( $_GET['ids'] ) ? $_GET['ids'] : '' ), 'bulk-media' ) ) . '">' . __( 'Undo' ) . '</a>';
    355 $messages[5] = __( 'Media file restored from the trash.' );
     354$messages[4] = __( 'Media file moved to the Trash.' ) . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids=' . ( isset( $_GET['ids'] ) ? $_GET['ids'] : '' ), 'bulk-media' ) ) . '">' . __( 'Undo' ) . '</a>';
     355$messages[5] = __( 'Media file restored from the Trash.' );
    356356
    357357if ( ! empty( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) {
    358358        $message                = $messages[ $_GET['message'] ];

  • src/wp-includes/class-wp-customize-manager.php

     
    24942494                                $this->dismiss_user_auto_draft_changesets();
    24952495                        }
    24962496
    2497                         // Note that if the changeset status was publish, then it will get set to trash if revisions are not supported.
     2497                        // Note that if the changeset status was publish, then it will get set to Trash if revisions are not supported.
    24982498                        $response['changeset_status'] = $changeset_post->post_status;
    24992499                        if ( $is_publish && 'trash' === $response['changeset_status'] ) {
    25002500                                $response['changeset_status'] = 'publish';

  • src/wp-includes/class-wp-post-type.php

     
    250250        /**
    251251         * Whether to delete posts of this type when deleting a user.
    252252         *
    253          * If true, posts of this type belonging to the user will be moved to trash when then user is deleted.
     253         * If true, posts of this type belonging to the user will be moved to Trash when then user is deleted.
    254254         * If false, posts of this type belonging to the user will *not* be trashed or deleted.
    255255         * If not set (the default), posts are trashed if post_type_supports( 'author' ).
    256256         * Otherwise posts are not trashed or deleted. Default null.

  • src/wp-includes/class-wp-xmlrpc-server.php

     
    36383638        /**
    36393639         * Delete a comment.
    36403640         *
    3641          * By default, the comment will be moved to the trash instead of deleted.
     3641         * By default, the comment will be moved to the Trash instead of deleted.
    36423642         * See wp_delete_comment() for more information on this behavior.
    36433643         *
    36443644         * @since 2.7.0

  • src/wp-includes/comment.php

     
    13451345/**
    13461346 * Trashes or deletes a comment.
    13471347 *
    1348  * The comment is moved to trash instead of permanently deleted unless trash is
    1349  * disabled, item is already in the trash, or $force_delete is true.
     1348 * The comment is moved to Trash instead of permanently deleted unless Trash is
     1349 * disabled, item is already in the Trash, or $force_delete is true.
    13501350 *
    13511351 * The post comment count will be updated if the comment was approved and has a
    13521352 * post ID available.
    … …  
    13561356 * @global wpdb $wpdb WordPress database abstraction object.
    13571357 *
    13581358 * @param int|WP_Comment $comment_id   Comment ID or WP_Comment object.
    1359  * @param bool           $force_delete Whether to bypass trash and force deletion. Default is false.
     1359 * @param bool           $force_delete Whether to bypass Trash and force deletion. Default is false.
    13601360 * @return bool True on success, false on failure.
    13611361 */
    13621362function wp_delete_comment( $comment_id, $force_delete = false ) {
    … …  
    14261426/**
    14271427 * Moves a comment to the Trash
    14281428 *
    1429  * If trash is disabled, comment is permanently deleted.
     1429 * If Trash is disabled, comment is permanently deleted.
    14301430 *
    14311431 * @since 2.9.0
    14321432 *

  • src/wp-includes/link-template.php

     
    14451445 *
    14461446 * @param int|WP_Post $id           Optional. Post ID or post object. Default is the global `$post`.
    14471447 * @param string      $deprecated   Not used.
    1448  * @param bool        $force_delete Optional. Whether to bypass trash and force deletion. Default false.
     1448 * @param bool        $force_delete Optional. Whether to bypass Trash and force deletion. Default false.
    14491449 * @return string|void The delete post link URL for the given post.
    14501450 */
    14511451function get_delete_post_link( $id = 0, $deprecated = '', $force_delete = false ) {
    … …  
    14781478         *
    14791479         * @param string $link         The delete link.
    14801480         * @param int    $post_id      Post ID.
    1481          * @param bool   $force_delete Whether to bypass the trash and force deletion. Default false.
     1481         * @param bool   $force_delete Whether to bypass the Trash and force deletion. Default false.
    14821482         */
    14831483        return apply_filters( 'get_delete_post_link', wp_nonce_url( $delete_link, "$action-post_{$post->ID}" ), $post->ID, $force_delete );
    14841484}

  • src/wp-includes/post.php

     
    13761376 *                                              ?{query_var_string}={post_slug} will be valid.
    13771377 *     @type bool        $can_export            Whether to allow this post type to be exported. Default true.
    13781378 *     @type bool        $delete_with_user      Whether to delete posts of this type when deleting a user. If true,
    1379  *                                              posts of this type belonging to the user will be moved to trash
     1379 *                                              posts of this type belonging to the user will be moved to Trash
    13801380 *                                              when then user is deleted. If false, posts of this type belonging
    13811381 *                                              to the user will *not* be trashed or deleted. If not set (the default),
    13821382 *                                              posts are trashed if post_type_supports('author'). Otherwise posts
    … …  
    16151615 * - `view_items` - Label for viewing post type archives. Default is 'View Posts' / 'View Pages'.
    16161616 * - `search_items` - Label for searching plural items. Default is 'Search Posts' / 'Search Pages'.
    16171617 * - `not_found` - Label used when no items are found. Default is 'No posts found' / 'No pages found'.
    1618  * - `not_found_in_trash` - Label used when no items are in the trash. Default is 'No posts found in Trash' /
     1618 * - `not_found_in_trash` - Label used when no items are in the Trash. Default is 'No posts found in Trash' /
    16191619 *                        'No pages found in Trash'.
    16201620 * - `parent_item_colon` - Label used to prefix parents of hierarchical items. Not used on non-hierarchical
    16211621 *                       post types. Default is 'Parent Page:'.
    … …  
    28972897 * it is deleted also. This includes comments, post meta fields, and terms
    28982898 * associated with the post.
    28992899 *
    2900  * The post or page is moved to trash instead of permanently deleted unless
    2901  * trash is disabled, item is already in the trash, or $force_delete is true.
     2900 * The post or page is moved to Trash instead of permanently deleted unless
     2901 * Trash is disabled, item is already in the Trash, or $force_delete is true.
    29022902 *
    29032903 * @since 1.0.0
    29042904 *
    … …  
    29072907 * @see wp_trash_post()
    29082908 *
    29092909 * @param int  $postid       Optional. Post ID. Default 0.
    2910  * @param bool $force_delete Optional. Whether to bypass trash and force deletion.
     2910 * @param bool $force_delete Optional. Whether to bypass Trash and force deletion.
    29112911 *                           Default false.
    29122912 * @return WP_Post|false|null Post data on success, false or null on failure.
    29132913 */
    … …  
    29372937         *
    29382938         * @param bool    $delete       Whether to go forward with deletion.
    29392939         * @param WP_Post $post         Post object.
    2940          * @param bool    $force_delete Whether to bypass the trash.
     2940         * @param bool    $force_delete Whether to bypass the Trash.
    29412941         */
    29422942        $check = apply_filters( 'pre_delete_post', null, $post, $force_delete );
    29432943        if ( null !== $check ) {
    … …  
    30743074/**
    30753075 * Move a post or page to the Trash
    30763076 *
    3077  * If trash is disabled, the post or page is permanently deleted.
     3077 * If Trash is disabled, the post or page is permanently deleted.
    30783078 *
    30793079 * @since 2.9.0
    30803080 *
    … …  
    31133113        }
    31143114
    31153115        /**
    3116          * Fires before a post is sent to the trash.
     3116         * Fires before a post is sent to the Trash.
    31173117         *
    31183118         * @since 3.3.0
    31193119         *
    … …  
    31383138        wp_trash_post_comments( $post_id );
    31393139
    31403140        /**
    3141          * Fires after a post is sent to the trash.
     3141         * Fires after a post is sent to the Trash.
    31423142         *
    31433143         * @since 2.9.0
    31443144         *
    … …  
    31823182        }
    31833183
    31843184        /**
    3185          * Fires before a post is restored from the trash.
     3185         * Fires before a post is restored from the Trash.
    31863186         *
    31873187         * @since 2.9.0
    31883188         *
    … …  
    32093209        wp_untrash_post_comments( $post_id );
    32103210
    32113211        /**
    3212          * Fires after a post is restored from the trash.
     3212         * Fires after a post is restored from the Trash.
    32133213         *
    32143214         * @since 2.9.0
    32153215         *
    … …  
    32213221}
    32223222
    32233223/**
    3224  * Moves comments for a post to the trash.
     3224 * Moves comments for a post to the Trash.
    32253225 *
    32263226 * @since 2.9.0
    32273227 *
    … …  
    32413241        $post_id = $post->ID;
    32423242
    32433243        /**
    3244          * Fires before comments are sent to the trash.
     3244         * Fires before comments are sent to the Trash.
    32453245         *
    32463246         * @since 2.9.0
    32473247         *
    … …  
    32673267        clean_comment_cache( array_keys( $statuses ) );
    32683268
    32693269        /**
    3270          * Fires after comments are sent to the trash.
     3270         * Fires after comments are sent to the Trash.
    32713271         *
    32723272         * @since 2.9.0
    32733273         *
    … …  
    32803280}
    32813281
    32823282/**
    3283  * Restore comments for a post from the trash.
     3283 * Restore comments for a post from the Trash.
    32843284 *
    32853285 * @since 2.9.0
    32863286 *
    … …  
    33063306        }
    33073307
    33083308        /**
    3309          * Fires before comments are restored for a post from the trash.
     3309         * Fires before comments are restored for a post from the Trash.
    33103310         *
    33113311         * @since 2.9.0
    33123312         *
    … …  
    33343334        delete_post_meta( $post_id, '_wp_trash_meta_comments_status' );
    33353335
    33363336        /**
    3337          * Fires after comments are restored for a post from the trash.
     3337         * Fires after comments are restored for a post from the Trash.
    33383338         *
    33393339         * @since 2.9.0
    33403340         *
    … …  
    55315531 * Deletion removes all post meta fields, taxonomy, comments, etc. associated
    55325532 * with the attachment (except the main post).
    55335533 *
    5534  * The attachment is moved to the trash instead of permanently deleted unless trash
    5535  * for media is disabled, item is already in the trash, or $force_delete is true.
     5534 * The attachment is moved to the Trash instead of permanently deleted unless Trash
     5535 * for media is disabled, item is already in the Trash, or $force_delete is true.
    55365536 *
    55375537 * @since 2.0.0
    55385538 *
    … …  
    55395539 * @global wpdb $wpdb WordPress database abstraction object.
    55405540 *
    55415541 * @param int  $post_id      Attachment ID.
    5542  * @param bool $force_delete Optional. Whether to bypass trash and force deletion.
     5542 * @param bool $force_delete Optional. Whether to bypass Trash and force deletion.
    55435543 *                           Default false.
    55445544 * @return WP_Post|false|null Post data on success, false or null on failure.
    55455545 */

  • src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php

     
    9999                                                'force'    => array(
    100100                                                        'type'        => 'boolean',
    101101                                                        'default'     => false,
    102                                                         'description' => __( 'Whether to bypass trash and force deletion.' ),
     102                                                        'description' => __( 'Whether to bypass Trash and force deletion.' ),
    103103                                                ),
    104104                                                'password' => array(
    105105                                                        'description' => __( 'The password for the parent post of the comment (if the post is password protected).' ),
    … …  
    820820                /**
    821821                 * Filters whether a comment can be trashed.
    822822                 *
    823                  * Return false to disable trash support for the post.
     823                 * Return false to disable Trash support for the post.
    824824                 *
    825825                 * @since 4.7.0
    826826                 *

  • src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php

     
    117117                                                'force' => array(
    118118                                                        'type'        => 'boolean',
    119119                                                        'default'     => false,
    120                                                         'description' => __( 'Whether to bypass trash and force deletion.' ),
     120                                                        'description' => __( 'Whether to bypass Trash and force deletion.' ),
    121121                                                ),
    122122                                        ),
    123123                                ),
    … …  
    810810                 *
    811811                 * The dynamic portion of the hook name, `$this->post_type`, refers to the post type slug.
    812812                 *
    813                  * Pass false to disable trash support for the post.
     813                 * Pass false to disable Trash support for the post.
    814814                 *
    815815                 * @since 4.7.0
    816816                 *
    … …  
    849849                        }
    850850
    851851                        // (Note that internally this falls through to `wp_delete_post` if
    852                         // the trash is disabled.)
     852                        // the Trash is disabled.)
    853853                        $result   = wp_trash_post( $id );
    854854                        $post     = get_post( $id );
    855855                        $response = $this->prepare_item_for_response( $post, $request );

  • src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php

     
    427427                 *
    428428                 * @since 4.7.0
    429429                 *
    430                  * @param (mixed) $result The revision object (if it was deleted or moved to the trash successfully)
    431                  *                        or false (failure). If the revision was moved to the trash, $result represents
     430                 * @param (mixed) $result The revision object (if it was deleted or moved to the Trash successfully)
     431                 *                        or false (failure). If the revision was moved to the Trash, $result represents
    432432                 *                        its new state; if it was deleted, $result represents its state before deletion.
    433433                 * @param WP_REST_Request $request The request sent to the API.
    434434                 */

  • src/wp-includes/script-loader.php

     
    12531253                'upload_stopped'            => __( 'Upload stopped.' ),
    12541254                'dismiss'                   => __( 'Dismiss' ),
    12551255                'crunching'                 => __( 'Crunching&hellip;' ),
    1256                 'deleted'                   => __( 'moved to the trash.' ),
     1256                'deleted'                   => __( 'Moved to the Trash.' ),
    12571257                /* translators: %s: File name. */
    12581258                'error_uploading'           => __( '&#8220;%s&#8221; has failed to upload.' ),
    12591259        );

  • tests/phpunit/data/formatting/whole-posts.php

     
    5252 Cu bonorum graecis ius. Duo id ancillae probatus. Tota latine pri an. Cum ei iudico semper. Eum in blandit voluptaria.
    5353
    5454 Illud debet vitae ex vis numquam.'),
    55  
     55
    5656/* DIVIDER */
    5757
    5858// based on https://core.trac.wordpress.org/attachment/ticket/29557/ChatTranscript.txt
    … …  
    445445<p class="triangle-right left">A very significant, if unsurprising update.
    446446“blown away”</p>
    447447<img class="alignleft" src="http://www.example.com/postimages/2013/aarone.jpeg" alt="" width="50" height="50" />
    448 <p class="triangle-right lefttwo">Blown away by the trash can.</p>
     448<p class="triangle-right lefttwo">Blown away by the Trash can.</p>
    449449<img class="alignleft" src="http://www.example.com/postimages/2013/bobm.jpeg" alt="" width="50" height="50" />
    450450<p class="triangle-right left">That is one powerful fan.</p>
    451451<img class="alignright" src="http://www.example.com/postimages/2013/philipmetroid.jpg" alt="" width="50" height="50" />
    … …  
    470470<p class="triangle-right right">We\'ll even sell you this case that matches to put your drives into!</p>
    471471<img class="alignleft" src="http://www.example.com/postimages/2013/bobm.jpeg" alt="" width="50" height="50" />
    472472<p class="triangle-right left">For a single drive.
    473 Who is going to be the first to mod a real trash can with a RAID array to Thunderbolt?</p>
     473Who is going to be the first to mod a real Trash can with a RAID array to Thunderbolt?</p>
    474474<img class="alignright" src="http://www.example.com/postimages/2013/philipmetroid.jpg" alt="" width="50" height="50" />
    475475<p class="triangle-right right">I can\'t wait to see the enclosures people make to go with this device.</p>
    476476<img class="alignleft" src="http://www.example.com/postimages/2013/aarone.jpeg" alt="" width="50" height="50" />
    477 <p class="triangle-right lefttwo">Row of trash cans daisy chained together.</p>
     477<p class="triangle-right lefttwo">Row of Trash cans daisy chained together.</p>
    478478<img class="alignright" src="http://www.example.com/postimages/2013/philipmetroid.jpg" alt="" width="50" height="50" />
    479479<p class="triangle-right right">Packed and built for expansion.</p>
    480480<img class="alignleft" src="http://www.example.com/postimages/2013/aarone.jpeg" alt="" width="50" height="50" />
    … …  
    507507<p class="triangle-right left">Not terrible. However, now I need to price out the TOP OF THE LINE model and find out if it can cost more than my house.
    508508Should be able to do it.</p>
    509509<img class="alignright" src="http://www.example.com/postimages/2013/philipmetroid.jpg" alt="" width="50" height="50" />
    510 <p class="triangle-right right">SO RECYCLABLE that you can throw it into the trash... or use it as a trash can.</p>
     510<p class="triangle-right right">SO RECYCLABLE that you can throw it into the Trash... or use it as a Trash can.</p>
    511511<img class="alignleft" src="http://www.example.com/postimages/2013/aarone.jpeg" alt="" width="50" height="50" />
    512512<p class="triangle-right lefttwo">30k</p>
    513513<img class="alignright" src="http://www.example.com/postimages/2013/philipmetroid.jpg" alt="" width="50" height="50" />

  • tests/qunit/fixtures/wp-api-generated.js

     
    688688                        "force": {
    689689                            "required": false,
    690690                            "default": false,
    691                             "description": "Whether to bypass trash and force deletion.",
     691                            "description": "Whether to bypass Trash and force deletion.",
    692692                            "type": "boolean"
    693693                        }
    694694                    }
    … …  
    14971497                        "force": {
    14981498                            "required": false,
    14991499                            "default": false,
    1500                             "description": "Whether to bypass trash and force deletion.",
     1500                            "description": "Whether to bypass Trash and force deletion.",
    15011501                            "type": "boolean"
    15021502                        }
    15031503                    }
    … …  
    22492249                        "force": {
    22502250                            "required": false,
    22512251                            "default": false,
    2252                             "description": "Whether to bypass trash and force deletion.",
     2252                            "description": "Whether to bypass Trash and force deletion.",
    22532253                            "type": "boolean"
    22542254                        }
    22552255                    }
    … …  
    25622562                        "force": {
    25632563                            "required": false,
    25642564                            "default": false,
    2565                             "description": "Whether to bypass trash and force deletion.",
     2565                            "description": "Whether to bypass Trash and force deletion.",
    25662566                            "type": "boolean"
    25672567                        }
    25682568                    }
    … …  
    42104210                        "force": {
    42114211                            "required": false,
    42124212                            "default": false,
    4213                             "description": "Whether to bypass trash and force deletion.",
     4213                            "description": "Whether to bypass Trash and force deletion.",
    42144214                            "type": "boolean"
    42154215                        },
    42164216                        "password": {

  • tests/qunit/index.html

     
    3434                </script>
    3535                <script src="../../build/wp-includes/js/utils.js"></script>
    3636                <script>
    37                         window.pluploadL10n = {"queue_limit_exceeded":"You have attempted to queue too many files.","file_exceeds_size_limit":"%s exceeds the maximum upload size for this site.","zero_byte_file":"This file is empty. Please try another.","invalid_filetype":"Sorry, this file type is not permitted for security reasons.","not_an_image":"This file is not an image. Please try another.","image_memory_exceeded":"Memory exceeded. Please try another smaller file.","image_dimensions_exceeded":"This is larger than the maximum size. Please try another.","default_error":"An error occurred in the upload. Please try again later.","missing_upload_url":"There was a configuration error. Please contact the server administrator.","upload_limit_exceeded":"You may only upload 1 file.","http_error":"HTTP error.","upload_failed":"Upload failed.","big_upload_failed":"Please try uploading this file with the %1$sbrowser uploader%2$s.","big_upload_queued":"%s exceeds the maximum upload size for the multi-file uploader when used in your browser.","io_error":"IO error.","security_error":"Security error.","file_cancelled":"File canceled.","upload_stopped":"Upload stopped.","dismiss":"Dismiss","crunching":"Crunching\u2026","deleted":"moved to the trash.","error_uploading":"\u201c%s\u201d has failed to upload."};
     37                        window.pluploadL10n = {"queue_limit_exceeded":"You have attempted to queue too many files.","file_exceeds_size_limit":"%s exceeds the maximum upload size for this site.","zero_byte_file":"This file is empty. Please try another.","invalid_filetype":"Sorry, this file type is not permitted for security reasons.","not_an_image":"This file is not an image. Please try another.","image_memory_exceeded":"Memory exceeded. Please try another smaller file.","image_dimensions_exceeded":"This is larger than the maximum size. Please try another.","default_error":"An error occurred in the upload. Please try again later.","missing_upload_url":"There was a configuration error. Please contact the server administrator.","upload_limit_exceeded":"You may only upload 1 file.","http_error":"HTTP error.","upload_failed":"Upload failed.","big_upload_failed":"Please try uploading this file with the %1$sbrowser uploader%2$s.","big_upload_queued":"%s exceeds the maximum upload size for the multi-file uploader when used in your browser.","io_error":"IO error.","security_error":"Security error.","file_cancelled":"File canceled.","upload_stopped":"Upload stopped.","dismiss":"Dismiss","crunching":"Crunching\u2026","deleted":"Moved to the Trash.","error_uploading":"\u201c%s\u201d has failed to upload."};
    3838                        window._wpPluploadSettings = {"defaults":{"runtimes":"html5,flash,silverlight,html4","file_data_name":"async-upload","url":"\/wp-admin\/async-upload.php","flash_swf_url":"http:\/\/src.wordpress-develop.dev\/wp-includes\/js\/plupload\/plupload.flash.swf","silverlight_xap_url":"http:\/\/src.wordpress-develop.dev\/wp-includes\/js\/plupload\/plupload.silverlight.xap","filters":{"max_file_size":"2097152b","mime_types":[{"extensions":"jpg,jpeg,jpe,gif,png,bmp,tiff,tif,ico,asf,asx,wmv,wmx,wm,avi,divx,flv,mov,qt,mpeg,mpg,mpe,mp4,m4v,ogv,webm,mkv,3gp,3gpp,3g2,3gp2,txt,asc,c,cc,h,srt,csv,tsv,ics,rtx,css,vtt,dfxp,mp3,m4a,m4b,ra,ram,wav,ogg,oga,mid,midi,wma,wax,mka,rtf,js,pdf,class,tar,zip,gz,gzip,rar,7z,psd,xcf,doc,pot,pps,ppt,wri,xla,xls,xlt,xlw,mdb,mpp,docx,docm,dotx,dotm,xlsx,xlsm,xlsb,xltx,xltm,xlam,pptx,pptm,ppsx,ppsm,potx,potm,ppam,sldx,sldm,onetoc,onetoc2,onetmp,onepkg,oxps,xps,odt,odp,ods,odg,odc,odb,odf,wp,wpd,key,numbers,pages"}]},"multipart_params":{"action":"upload-attachment","_wpnonce":"87fa5740b8"}},"browser":{"mobile":false,"supported":true},"limitExceeded":false};
    3939                </script>
    4040                <script src="../../build/wp-includes/js/plupload/wp-plupload.js"></script>