From ca3b0a700a7fc7f48246771415e24c85adfc0823 Mon Sep 17 00:00:00 2001 From: Joe McGill Date: Fri, 12 May 2017 12:49:14 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@40650 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/media.php | 6 +++--- src/wp-includes/script-loader.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wp-includes/media.php b/src/wp-includes/media.php index 1092aaea97..6843c61b21 100644 --- a/src/wp-includes/media.php +++ b/src/wp-includes/media.php @@ -3497,8 +3497,8 @@ function wp_enqueue_media( $args = array() ) { 'unattached' => __( 'Unattached' ), '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' ), 'cancelSelection' => __( 'Cancel Selection' ), @@ -3745,7 +3745,7 @@ function get_post_galleries( $post, $html = true ) { if ( 'gallery' === $shortcode[2] ) { $srcs = array(); - $shortcode_attrs = shortcode_parse_atts( $shortcode[3] ); + $shortcode_attrs = shortcode_parse_atts( $shortcode[3] ); if ( ! is_array( $shortcode_attrs ) ) { $shortcode_attrs = array(); } diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index f1eda9ee38..18beba3013 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -77,7 +77,7 @@ function wp_default_scripts( &$scripts ) { $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' ), 'expandMenu' => __( 'Expand Main menu' ),