Make WordPress Core

Changeset 36887


Ignore:
Timestamp:
03/08/2016 05:42:45 PM (6 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:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/edit-form-advanced.php

    r36659 r36887  
    161161    10 => __( 'Page draft updated.' ) . $preview_page_link_html,
    162162);
    163 $messages['attachment'] = array_fill( 1, 10, __( 'Media attachment updated.' ) ); // Hack, for now.
     163$messages['attachment'] = array_fill( 1, 10, __( 'Media file updated.' ) ); // Hack, for now.
    164164
    165165/**
  • trunk/src/wp-admin/includes/class-wp-media-list-table.php

    r36331 r36887  
    214214     */
    215215    public function no_items() {
    216         _e( 'No media attachments found.' );
     216        _e( 'No media files found.' );
    217217    }
    218218
  • trunk/src/wp-admin/media.php

    r33067 r36887  
    9393        switch ( $_GET['message'] ) {
    9494            case 'updated' :
    95                 $message = __('Media attachment updated.');
     95                $message = __('Media file updated.');
    9696                $class = 'updated';
    9797                break;
  • trunk/src/wp-admin/upload.php

    r36668 r36887  
    200200'title'     => __('Attaching Files'),
    201201'content'   =>
    202     '<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>'
     202    '<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>'
    203203) );
    204204
     
    235235$message = '';
    236236if ( ! empty( $_GET['posted'] ) ) {
    237     $message = __( 'Media attachment updated.' );
     237    $message = __( 'Media file updated.' );
    238238    $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
    239239}
     
    241241if ( ! empty( $_GET['attached'] ) && $attached = absint( $_GET['attached'] ) ) {
    242242    if ( 1 == $attached ) {
    243         $message = __( 'Media attachment reattached.' );
    244     } else {
    245         /* translators: %s: number of media attachments */
    246         $message = _n( '%s media attachment reattached.', '%s media attachments reattached.', $attached );
     243        $message = __( 'Media file attached.' );
     244    } else {
     245        /* translators: %s: number of media files */
     246        $message = _n( '%s media file attached.', '%s media files attached.', $attached );
    247247    }
    248248    $message = sprintf( $message, number_format_i18n( $attached ) );
     
    252252if ( ! empty( $_GET['detach'] ) && $detached = absint( $_GET['detach'] ) ) {
    253253    if ( 1 == $detached ) {
    254         $message = __( 'Media attachment detached.' );
    255     } else {
    256         /* translators: %s: number of media attachments */
    257         $message = _n( '%s media attachment detached.', '%s media attachments detached.', $detached );
     254        $message = __( 'Media file detached.' );
     255    } else {
     256        /* translators: %s: number of media files */
     257        $message = _n( '%s media file detached.', '%s media filse detached.', $detached );
    258258    }
    259259    $message = sprintf( $message, number_format_i18n( $detached ) );
     
    263263if ( ! empty( $_GET['deleted'] ) && $deleted = absint( $_GET['deleted'] ) ) {
    264264    if ( 1 == $deleted ) {
    265         $message = __( 'Media attachment permanently deleted.' );
    266     } else {
    267         /* translators: %s: number of media attachments */
    268         $message = _n( '%s media attachment permanently deleted.', '%s media attachments permanently deleted.', $deleted );
     265        $message = __( 'Media file permanently deleted.' );
     266    } else {
     267        /* translators: %s: number of media files */
     268        $message = _n( '%s media file permanently deleted.', '%s media files permanently deleted.', $deleted );
    269269    }
    270270    $message = sprintf( $message, number_format_i18n( $deleted ) );
     
    274274if ( ! empty( $_GET['trashed'] ) && $trashed = absint( $_GET['trashed'] ) ) {
    275275    if ( 1 == $trashed ) {
    276         $message = __( 'Media attachment moved to the trash.' );
    277     } else {
    278         /* translators: %s: number of media attachments */
    279         $message = _n( '%s media attachment moved to the trash.', '%s media attachments moved to the trash.', $trashed );
     276        $message = __( 'Media file moved to the trash.' );
     277    } else {
     278        /* translators: %s: number of media files */
     279        $message = _n( '%s media file moved to the trash.', '%s media files moved to the trash.', $trashed );
    280280    }
    281281    $message = sprintf( $message, number_format_i18n( $trashed ) );
     
    286286if ( ! empty( $_GET['untrashed'] ) && $untrashed = absint( $_GET['untrashed'] ) ) {
    287287    if ( 1 == $untrashed ) {
    288         $message = __( 'Media attachment restored from the trash.' );
    289     } else {
    290         /* translators: %s: number of media attachments */
    291         $message = _n( '%s media attachment restored from the trash.', '%s media attachments restored from the trash.', $untrashed );
     288        $message = __( 'Media file restored from the trash.' );
     289    } else {
     290        /* translators: %s: number of media files */
     291        $message = _n( '%s media file restored from the trash.', '%s media files restored from the trash.', $untrashed );
    292292    }
    293293    $message = sprintf( $message, number_format_i18n( $untrashed ) );
     
    295295}
    296296
    297 $messages[1] = __( 'Media attachment updated.' );
    298 $messages[2] = __( 'Media attachment permanently deleted.' );
    299 $messages[3] = __( 'Error saving media attachment.' );
    300 $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>';
    301 $messages[5] = __( 'Media attachment restored from the trash.' );
     297$messages[1] = __( 'Media file updated.' );
     298$messages[2] = __( 'Media file permanently deleted.' );
     299$messages[3] = __( 'Error saving media file.' );
     300$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>';
     301$messages[5] = __( 'Media file restored from the trash.' );
    302302
    303303if ( ! empty( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) {
  • trunk/src/wp-includes/media.php

    r36569 r36887  
    33633363        'filterByType'           => __( 'Filter by type' ),
    33643364        'searchMediaLabel'       => __( 'Search Media' ),
    3365         'noMedia'                => __( 'No media attachments found.' ),
     3365        'noMedia'                => __( 'No media files found.' ),
    33663366
    33673367        // Library Details
Note: See TracChangeset for help on using the changeset viewer.