Changeset 36328 for trunk/src/wp-admin/upload.php

Timestamp:

01/15/2016 10:28:15 PM (9 years ago)

Author:

ocean90

Message:

Media: Update some attach/detach strings in the columns view.

• Show a "Media attachment reattached."/"Media attachment detached." message when only one attachment was attached/detached.
• Use the string placeholder as number_format_i18n() returns a string.
• Add translator comments.
• Update help text to refer to the new dropdown menus.
• Add a more generic title to the attach modal.

Fixes #33237.

File:

• trunk/src/wp-admin/upload.php (modified) (5 diffs)

trunk/src/wp-admin/upload.php

@@ -183 +183 @@
 'content'   =>
     '<p>' . __( 'All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen.' ) . '</p>' .
-    '<p>' . __( 'You can narrow the list by file type/status using the text link filters at the top of the screen. You also can refine the list by date using the dropdown menu above the media table.' ) . '</p>' .
+    '<p>' . __( 'You can narrow the list by file type/status or by date using the dropdown menus above the media table.' ) . '</p>' .
     '<p>' . __( 'You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.' ) . '</p>'
 ) );
@@ -236 +236 @@
 
 if ( ! empty( $_GET['attached'] ) && $attached = absint( $_GET['attached'] ) ) {
-    $message = sprintf( _n( 'Reattached %d attachment.', 'Reattached %d attachments.', $attached ), $attached );
+    if ( 1 == $attached ) {
+        $message = __( 'Media attachment reattached.' );
+    } else {
+        /* translators: %s: number of media attachments */
+        $message = _n( '%s media attachment reattached.', '%s media attachments reattached.', $attached );
+    }
+    $message = sprintf( $message, number_format_i18n( $attached ) );
     $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
 }
 
 if ( ! empty( $_GET['detach'] ) && $detached = absint( $_GET['detach'] ) ) {
-    $message = sprintf( _n( 'Detached %d attachment.', 'Detached %d attachments.', $detached ), $detached );
+    if ( 1 == $detached ) {
+        $message = __( 'Media attachment detached.' );
+    } else {
+        /* translators: %s: number of media attachments */
+        $message = _n( '%s media attachment detached.', '%s media attachments detached.', $detached );
+    }
+    $message = sprintf( $message, number_format_i18n( $detached ) );
     $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
 }
@@ -249 +261 @@
         $message = __( 'Media attachment permanently deleted.' );
     } else {
-        $message = _n( '%d media attachment permanently deleted.', '%d media attachments permanently deleted.', $deleted );
+        /* translators: %s: number of media attachments */
+        $message = _n( '%s media attachment permanently deleted.', '%s media attachments permanently deleted.', $deleted );
     }
     $message = sprintf( $message, number_format_i18n( $deleted ) );
@@ -259 +272 @@
         $message = __( 'Media attachment moved to the trash.' );
     } else {
-        $message = _n( '%d media attachment moved to the trash.', '%d media attachments moved to the trash.', $trashed );
+        /* translators: %s: number of media attachments */
+        $message = _n( '%s media attachment moved to the trash.', '%s media attachments moved to the trash.', $trashed );
     }
     $message = sprintf( $message, number_format_i18n( $trashed ) );
@@ -270 +284 @@
         $message = __( 'Media attachment restored from the trash.' );
     } else {
-        $message = _n( '%d media attachment restored from the trash.', '%d media attachments restored from the trash.', $untrashed );
+        /* translators: %s: number of media attachments */
+        $message = _n( '%s media attachment restored from the trash.', '%s media attachments restored from the trash.', $untrashed );
     }
     $message = sprintf( $message, number_format_i18n( $untrashed ) );