Changeset 36887

Timestamp:

03/08/2016 05:42:45 PM (9 years ago)

Author:

ocean90

Message:

Media: Change wording for media files which aren't attached.

The media library can contain files which aren't attached yet. When attaching a file you currently get "Media attachment reattached.", or the opposite "Media attachment detached.". That's redundant and can be inaccurate. It's also not easy to translate in some languages.

This change generalizes the strings to refer to a "media file" instead.

Props SergeyBiryukov, ocean90, netweb.
Fixes #36089.

Location:

trunk/src

Files:

• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/includes/class-wp-media-list-table.php (modified) (1 diff)
• wp-admin/media.php (modified) (1 diff)
• wp-admin/upload.php (modified) (8 diffs)
• wp-includes/media.php (modified) (1 diff)

trunk/src/wp-admin/edit-form-advanced.php

@@ -161 +161 @@
     10 => __( 'Page draft updated.' ) . $preview_page_link_html,
 );
-$messages['attachment'] = array_fill( 1, 10, __( 'Media attachment updated.' ) ); // Hack, for now.
+$messages['attachment'] = array_fill( 1, 10, __( 'Media file updated.' ) ); // Hack, for now.
 
 /**

trunk/src/wp-admin/includes/class-wp-media-list-table.php

@@ -214 +214 @@
      */
     public function no_items() {
-        _e( 'No media attachments found.' );
+        _e( 'No media files found.' );
     }
 

trunk/src/wp-admin/media.php

@@ -93 +93 @@
         switch ( $_GET['message'] ) {
             case 'updated' :
-                $message = __('Media attachment updated.');
+                $message = __('Media file updated.');
                 $class = 'updated';
                 break;

trunk/src/wp-admin/upload.php

@@ -200 +200 @@
 'title'     => __('Attaching Files'),
 'content'   =>
-    '<p>' . __( 'If a media file has not been attached to any post, you will see that in the Attached To column, and can click on Attach File to launch a small popup that will allow you to search for a post and attach the file.' ) . '</p>'
+    '<p>' . __( 'If a media file has not been attached to any content, you will see that in the Uploaded To column, and can click on Attach to launch a small popup that will allow you to search for existing content and attach the file.' ) . '</p>'
 ) );
 
@@ -235 +235 @@
 $message = '';
 if ( ! empty( $_GET['posted'] ) ) {
-    $message = __( 'Media attachment updated.' );
+    $message = __( 'Media file updated.' );
     $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
 }
@@ -241 +241 @@
 if ( ! empty( $_GET['attached'] ) && $attached = absint( $_GET['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 = __( 'Media file attached.' );
+    } else {
+        /* translators: %s: number of media files */
+        $message = _n( '%s media file attached.', '%s media files attached.', $attached );
     }
     $message = sprintf( $message, number_format_i18n( $attached ) );
@@ -252 +252 @@
 if ( ! empty( $_GET['detach'] ) && $detached = absint( $_GET['detach'] ) ) {
     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 = __( 'Media file detached.' );
+    } else {
+        /* translators: %s: number of media files */
+        $message = _n( '%s media file detached.', '%s media filse detached.', $detached );
     }
     $message = sprintf( $message, number_format_i18n( $detached ) );
@@ -263 +263 @@
 if ( ! empty( $_GET['deleted'] ) && $deleted = absint( $_GET['deleted'] ) ) {
     if ( 1 == $deleted ) {
-        $message = __( 'Media attachment permanently deleted.' );
-    } else {
-        /* translators: %s: number of media attachments */
-        $message = _n( '%s media attachment permanently deleted.', '%s media attachments permanently deleted.', $deleted );
+        $message = __( 'Media file permanently deleted.' );
+    } else {
+        /* translators: %s: number of media files */
+        $message = _n( '%s media file permanently deleted.', '%s media files permanently deleted.', $deleted );
     }
     $message = sprintf( $message, number_format_i18n( $deleted ) );
@@ -274 +274 @@
 if ( ! empty( $_GET['trashed'] ) && $trashed = absint( $_GET['trashed'] ) ) {
     if ( 1 == $trashed ) {
-        $message = __( 'Media attachment moved to the trash.' );
-    } else {
-        /* translators: %s: number of media attachments */
-        $message = _n( '%s media attachment moved to the trash.', '%s media attachments 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 ) );
@@ -286 +286 @@
 if ( ! empty( $_GET['untrashed'] ) && $untrashed = absint( $_GET['untrashed'] ) ) {
     if ( 1 == $untrashed ) {
-        $message = __( 'Media attachment restored from the trash.' );
-    } else {
-        /* translators: %s: number of media attachments */
-        $message = _n( '%s media attachment restored from the trash.', '%s media attachments 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 ) );
@@ -295 +295 @@
 }
 
-$messages[1] = __( 'Media attachment updated.' );
-$messages[2] = __( 'Media attachment permanently deleted.' );
-$messages[3] = __( 'Error saving media attachment.' );
-$messages[4] = __( 'Media attachment 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 attachment restored from the trash.' );
+$messages[1] = __( 'Media file updated.' );
+$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.' );
 
 if ( ! empty( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) {

trunk/src/wp-includes/media.php

@@ -3363 +3363 @@
         'filterByType'           => __( 'Filter by type' ),
         'searchMediaLabel'       => __( 'Search Media' ),
-        'noMedia'                => __( 'No media attachments found.' ),
+        'noMedia'                => __( 'No media files found.' ),
 
         // Library Details