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-admin/upload.php

    r47198 r47233  
    329329    $trashed = absint( $_GET['trashed'] );
    330330    if ( 1 == $trashed ) {
    331         $message = __( 'Media file moved to the trash.' );
    332     } else {
    333         /* translators: %s: Number of media files. */
    334         $message = _n( '%s media file moved to the trash.', '%s media files moved to the trash.', $trashed );
     331        $message = __( 'Media file moved to the Trash.' );
     332    } else {
     333        /* translators: %s: Number of media files. */
     334        $message = _n( '%s media file moved to the Trash.', '%s media files moved to the Trash.', $trashed );
    335335    }
    336336    $message                = sprintf( $message, number_format_i18n( $trashed ) );
     
    342342    $untrashed = absint( $_GET['untrashed'] );
    343343    if ( 1 == $untrashed ) {
    344         $message = __( 'Media file restored from the trash.' );
    345     } else {
    346         /* translators: %s: Number of media files. */
    347         $message = _n( '%s media file restored from the trash.', '%s media files restored from the trash.', $untrashed );
     344        $message = __( 'Media file restored from the Trash.' );
     345    } else {
     346        /* translators: %s: Number of media files. */
     347        $message = _n( '%s media file restored from the Trash.', '%s media files restored from the Trash.', $untrashed );
    348348    }
    349349    $message                = sprintf( $message, number_format_i18n( $untrashed ) );
     
    354354$messages[2] = __( 'Media file permanently deleted.' );
    355355$messages[3] = __( 'Error saving media file.' );
    356 $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>';
    357 $messages[5] = __( 'Media file restored from the trash.' );
     356$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>';
     357$messages[5] = __( 'Media file restored from the Trash.' );
    358358
    359359if ( ! empty( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) {
Note: See TracChangeset for help on using the changeset viewer.