Changeset 48312

Timestamp:

07/05/2020 10:38:24 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Posts, Post Types: Clarify some "Error in deleting" messages, use more specific strings for attachments.

Props dingo_d.
See #50546.

Location:

trunk/src/wp-admin

Files:

• edit.php (modified) (3 diffs)
• post.php (modified) (3 diffs)
• upload.php (modified) (3 diffs)

trunk/src/wp-admin/edit.php

@@ -118 +118 @@
 
                 if ( ! wp_trash_post( $post_id ) ) {
-                    wp_die( __( 'Error in moving to Trash.' ) );
+                    wp_die( __( 'Error in moving the item to Trash.' ) );
                 }
 
@@ -141 +141 @@
 
                 if ( ! wp_untrash_post( $post_id ) ) {
-                    wp_die( __( 'Error in restoring from Trash.' ) );
+                    wp_die( __( 'Error in restoring the item from Trash.' ) );
                 }
 
@@ -159 +159 @@
                 if ( 'attachment' === $post_del->post_type ) {
                     if ( ! wp_delete_attachment( $post_id ) ) {
-                        wp_die( __( 'Error in deleting.' ) );
+                        wp_die( __( 'Error in deleting the attachment.' ) );
                     }
                 } else {
                     if ( ! wp_delete_post( $post_id ) ) {
-                        wp_die( __( 'Error in deleting.' ) );
+                        wp_die( __( 'Error in deleting the item.' ) );
                     }
                 }

trunk/src/wp-admin/post.php

@@ -259 +259 @@
 
         if ( ! wp_trash_post( $post_id ) ) {
-            wp_die( __( 'Error in moving to Trash.' ) );
+            wp_die( __( 'Error in moving the item to Trash.' ) );
         }
 
@@ -289 +289 @@
 
         if ( ! wp_untrash_post( $post_id ) ) {
-            wp_die( __( 'Error in restoring from Trash.' ) );
+            wp_die( __( 'Error in restoring the item from Trash.' ) );
         }
 
@@ -313 +313 @@
             $force = ( ! MEDIA_TRASH );
             if ( ! wp_delete_attachment( $post_id, $force ) ) {
-                wp_die( __( 'Error in deleting.' ) );
+                wp_die( __( 'Error in deleting the attachment.' ) );
             }
         } else {
             if ( ! wp_delete_post( $post_id, true ) ) {
-                wp_die( __( 'Error in deleting.' ) );
+                wp_die( __( 'Error in deleting the item.' ) );
             }
         }

trunk/src/wp-admin/upload.php

@@ -157 +157 @@
 
                 if ( ! wp_trash_post( $post_id ) ) {
-                    wp_die( __( 'Error in moving to Trash.' ) );
+                    wp_die( __( 'Error in moving the item to Trash.' ) );
                 }
             }
@@ -178 +178 @@
 
                 if ( ! wp_untrash_post( $post_id ) ) {
-                    wp_die( __( 'Error in restoring from Trash.' ) );
+                    wp_die( __( 'Error in restoring the item from Trash.' ) );
                 }
             }
@@ -193 +193 @@
 
                 if ( ! wp_delete_attachment( $post_id_del ) ) {
-                    wp_die( __( 'Error in deleting.' ) );
+                    wp_die( __( 'Error in deleting the attachment.' ) );
                 }
             }