Changeset 47233 for trunk/src/wp-admin/upload.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-admin/upload.php (modified) (3 diffs)

trunk/src/wp-admin/upload.php

@@ -329 +329 @@
     $trashed = absint( $_GET['trashed'] );
     if ( 1 == $trashed ) {
-        $message = __( 'Media file moved to the trash.' );
-    } else {
-        /* translators: %s: Number of media files. */
-        $message = _n( '%s media file moved to the trash.', '%s media files moved to the trash.', $trashed );
+        $message = __( 'Media file moved to the Trash.' );
+    } else {
+        /* translators: %s: Number of media files. */
+        $message = _n( '%s media file moved to the Trash.', '%s media files moved to the Trash.', $trashed );
     }
     $message                = sprintf( $message, number_format_i18n( $trashed ) );
@@ -342 +342 @@
     $untrashed = absint( $_GET['untrashed'] );
     if ( 1 == $untrashed ) {
-        $message = __( 'Media file restored from the trash.' );
-    } else {
-        /* translators: %s: Number of media files. */
-        $message = _n( '%s media file restored from the trash.', '%s media files restored from the trash.', $untrashed );
+        $message = __( 'Media file restored from the Trash.' );
+    } else {
+        /* translators: %s: Number of media files. */
+        $message = _n( '%s media file restored from the Trash.', '%s media files restored from the Trash.', $untrashed );
     }
     $message                = sprintf( $message, number_format_i18n( $untrashed ) );
@@ -354 +354 @@
 $messages[2] = __( 'Media file permanently deleted.' );
 $messages[3] = __( 'Error saving media file.' );
-$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>';
-$messages[5] = __( 'Media file restored from the trash.' );
+$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>';
+$messages[5] = __( 'Media file restored from the Trash.' );
 
 if ( ! empty( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) {