Changeset 40650

Timestamp:

05/12/2017 12:49:14 PM (7 years ago)

Author:

joemcgill

Message:

Improve wording of the AYS warning when permanently deleting uploads, tags, posts.

This is a follow up on [40283], which cleans up the wording.

Props azaozz, swissspidy, ocean90.
Fixes #39712.

Location:

trunk/src/wp-includes

Files:

• media.php (modified) (2 diffs)
• script-loader.php (modified) (1 diff)

trunk/src/wp-includes/media.php

@@ -3498 +3498 @@
         'trash'                  => _x( 'Trash', 'noun' ),
         'uploadedToThisPost'     => $post_type_object->labels->uploaded_to_this_item,
-        'warnDelete'             => __( "You are about to permanently delete this item.\nThis will remove it from your site.\n 'Cancel' to stop, 'OK' to delete." ),
-        'warnBulkDelete'         => __( "You are about to permanently delete these items.\nThis will remove them from your site.\n 'Cancel' to stop, 'OK' to delete." ),
+        'warnDelete'             => __( "You are about to permanently delete this item from your site.\nThis action cannot be undone.\n 'Cancel' to stop, 'OK' to delete." ),
+        'warnBulkDelete'         => __( "You are about to permanently delete these items from your site.\nThis action cannot be undone.\n 'Cancel' to stop, 'OK' to delete." ),
         'warnBulkTrash'          => __( "You are about to trash these items.\n  'Cancel' to stop, 'OK' to delete." ),
         'bulkSelect'             => __( 'Bulk Select' ),
@@ -3746 +3746 @@
                 $srcs = array();
 
-                $shortcode_attrs = shortcode_parse_atts( $shortcode[3] ); 
+                $shortcode_attrs = shortcode_parse_atts( $shortcode[3] );
                 if ( ! is_array( $shortcode_attrs ) ) {
                     $shortcode_attrs = array();

trunk/src/wp-includes/script-loader.php

@@ -78 +78 @@
     $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), false, 1 );
     did_action( 'init' ) && $scripts->localize( 'common', 'commonL10n', array(
-        'warnDelete'   => __( "You are about to permanently delete these items.\nThis will remove them from your site.\n 'Cancel' to stop, 'OK' to delete." ),
+        'warnDelete'   => __( "You are about to permanently delete these items from your site.\nThis action cannot be undone.\n 'Cancel' to stop, 'OK' to delete." ),
         'dismiss'      => __( 'Dismiss this notice.' ),
         'collapseMenu' => __( 'Collapse Main menu' ),