Changeset 35901

Timestamp:

12/13/2015 07:02:30 PM (10 years ago)

Author:

SergeyBiryukov

Message:

I18N: Add missing context for 'Trash' strings.

Fixes #35054.

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-media-list-table.php (modified) (4 diffs)
• class-wp-posts-list-table.php (modified) (1 diff)
• meta-boxes.php (modified) (1 diff)

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

@@ -128 +128 @@
                 '<option value="trash"%s>%s</option>',
                 selected( 'trash' === $filter, true, false ),
-                __( 'Trash' )
+                _x( 'Trash', 'attachment filter' )
             );
         }
@@ -145 +145 @@
                 $actions['delete'] = __( 'Delete Permanently' );
             } else {
-                $actions['trash'] = __( 'Trash' );
+                $actions['trash'] = _x( 'Trash', 'verb' );
             }
         } else {
@@ -637 +637 @@
             if ( current_user_can( 'delete_post', $post->ID ) )
                 if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
-                    $actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
+                    $actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID ) . "'>" . _x( 'Trash', 'verb' ) . "</a>";
                 } else {
                     $delete_ays = !MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
@@ -653 +653 @@
                     $actions['untrash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=untrash&amp;post=$post->ID", 'untrash-post_' . $post->ID ) . "'>" . __( 'Restore' ) . "</a>";
                 elseif ( EMPTY_TRASH_DAYS && MEDIA_TRASH )
-                    $actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
+                    $actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID ) . "'>" . _x( 'Trash', 'verb' ) . "</a>";
                 if ( $this->is_trash || !EMPTY_TRASH_DAYS || !MEDIA_TRASH ) {
                     $delete_ays = ( !$this->is_trash && !MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : '';

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

@@ -1180 +1180 @@
                 $actions['untrash'] = "<a title='" . esc_attr__( 'Restore this item from the Trash' ) . "' href='" . wp_nonce_url( admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=untrash', $post->ID ) ), 'untrash-post_' . $post->ID ) . "'>" . __( 'Restore' ) . "</a>";
             elseif ( EMPTY_TRASH_DAYS )
-                $actions['trash'] = "<a class='submitdelete' title='" . esc_attr__( 'Move this item to the Trash' ) . "' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
+                $actions['trash'] = "<a class='submitdelete' title='" . esc_attr__( 'Move this item to the Trash' ) . "' href='" . get_delete_post_link( $post->ID ) . "'>" . _x( 'Trash', 'verb' ) . "</a>";
             if ( 'trash' === $post->post_status || !EMPTY_TRASH_DAYS )
                 $actions['delete'] = "<a class='submitdelete' title='" . esc_attr__( 'Delete this item permanently' ) . "' href='" . get_delete_post_link( $post->ID, '', true ) . "'>" . __( 'Delete Permanently' ) . "</a>";

trunk/src/wp-admin/includes/meta-boxes.php

@@ -335 +335 @@
     if ( current_user_can( 'delete_post', $post->ID ) )
         if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
-            echo "<a class='submitdelete deletion' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
+            echo "<a class='submitdelete deletion' href='" . get_delete_post_link( $post->ID ) . "'>" . _x( 'Trash', 'verb' ) . "</a>";
         } else {
             $delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';