Changeset 33431

Timestamp:

07/26/2015 10:47:05 PM (11 years ago)

Author:

SergeyBiryukov

Message:

Merge duplicate strings related to Trash.

props pavelevap.
fixes #33133.

Location:

trunk/src/wp-admin

Files:

• post.php (modified) (1 diff)
• upload.php (modified) (2 diffs)

trunk/src/wp-admin/post.php

@@ -279 +279 @@
 
     if ( ! current_user_can( 'delete_post', $post_id ) )
-        wp_die( __( 'You are not allowed to move this item out of the Trash.' ) );
+        wp_die( __( 'You are not allowed to restore this item from the Trash.' ) );
 
     if ( ! wp_untrash_post( $post_id ) )

trunk/src/wp-admin/upload.php

@@ -130 +130 @@
 
                 if ( !wp_trash_post( $post_id ) )
-                    wp_die( __( 'Error in moving to trash.' ) );
+                    wp_die( __( 'Error in moving to Trash.' ) );
             }
             $location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location );
@@ -142 +142 @@
 
                 if ( !wp_untrash_post( $post_id ) )
-                    wp_die( __( 'Error in restoring from trash.' ) );
+                    wp_die( __( 'Error in restoring from Trash.' ) );
             }
             $location = add_query_arg( 'untrashed', count( $post_ids ), $location );