From e515d61ec0b365b15d10d98d34288f782c7bccf4 Mon Sep 17 00:00:00 2001 From: Helen Hou-Sandi Date: Fri, 23 Oct 2020 15:59:34 +0000 Subject: [PATCH] Administration: Unify search results message on list tables. This wraps the search string in a `` tag, which makes easier to parse visually especially when your search string also contains double quotes. Props Mista-Flo, mapk, sergeybiryukov. Fixes #37353. git-svn-id: https://develop.svn.wordpress.org/trunk@49284 602fd350-edb4-49c9-b593-d223f7449a82 --- src/js/_enqueues/wp/updates.js | 4 ++-- src/wp-admin/edit-comments.php | 4 ++-- src/wp-admin/edit-tags.php | 2 +- src/wp-admin/edit.php | 2 +- src/wp-admin/includes/class-wp-plugins-list-table.php | 2 +- src/wp-admin/link-manager.php | 2 +- src/wp-admin/network/sites.php | 2 +- src/wp-admin/network/themes.php | 2 +- src/wp-admin/network/users.php | 2 +- src/wp-admin/plugins.php | 2 +- src/wp-admin/upload.php | 2 +- src/wp-admin/users.php | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/js/_enqueues/wp/updates.js b/src/js/_enqueues/wp/updates.js index 402afaf585..f4d3472f84 100644 --- a/src/js/_enqueues/wp/updates.js +++ b/src/js/_enqueues/wp/updates.js @@ -2580,8 +2580,8 @@ var $subTitle = $( '' ).addClass( 'subtitle' ).html( sprintf( /* translators: %s: Search query. */ - __( 'Search results for “%s”' ), - _.escape( data.s ) + __( 'Search results for: %s' ), + '' + _.escape( data.s ) + '' ) ), $oldSubTitle = $( '.wrap .subtitle' ); diff --git a/src/wp-admin/edit-comments.php b/src/wp-admin/edit-comments.php index 0dde8df01a..b7aec5d1de 100644 --- a/src/wp-admin/edit-comments.php +++ b/src/wp-admin/edit-comments.php @@ -232,8 +232,8 @@ if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) { echo ''; printf( /* translators: %s: Search query. */ - __( 'Search results for “%s”' ), - wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50, '…' ) + __( 'Search results for: %s' ), + '' . wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50, '…' . '' ) ); echo ''; } diff --git a/src/wp-admin/edit-tags.php b/src/wp-admin/edit-tags.php index cb1ac29fdb..9408f21eba 100644 --- a/src/wp-admin/edit-tags.php +++ b/src/wp-admin/edit-tags.php @@ -339,7 +339,7 @@ if ( is_plugin_active( 'wpcat2tag-importer/wpcat2tag-importer.php' ) ) { ' . __( 'Search results for “%s”' ) . '', esc_html( wp_unslash( $_REQUEST['s'] ) ) ); + printf( '' . __( 'Search results for: %s' ) . '', '' . esc_html( wp_unslash( $_REQUEST['s'] ) ) . '' ); } ?> diff --git a/src/wp-admin/edit.php b/src/wp-admin/edit.php index 40bc41c512..75d4773641 100644 --- a/src/wp-admin/edit.php +++ b/src/wp-admin/edit.php @@ -407,7 +407,7 @@ if ( current_user_can( $post_type_object->cap->create_posts ) ) { if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) { /* translators: %s: Search query. */ - printf( ' ' . __( 'Search results for “%s”' ) . '', get_search_query() ); + printf( ' ' . __( 'Search results for: %s' ) . '', '' . get_search_query() . '' ); } ?> diff --git a/src/wp-admin/includes/class-wp-plugins-list-table.php b/src/wp-admin/includes/class-wp-plugins-list-table.php index 5a1f682455..b1917bac31 100644 --- a/src/wp-admin/includes/class-wp-plugins-list-table.php +++ b/src/wp-admin/includes/class-wp-plugins-list-table.php @@ -407,7 +407,7 @@ class WP_Plugins_List_Table extends WP_List_Table { $s = esc_html( wp_unslash( $_REQUEST['s'] ) ); /* translators: %s: Plugin search term. */ - printf( __( 'No plugins found for “%s”.' ), $s ); + printf( __( 'No plugins found for: %s.' ), '' . $s . '' ); // We assume that somebody who can install plugins in multisite is experienced enough to not need this helper link. if ( ! is_multisite() && current_user_can( 'install_plugins' ) ) { diff --git a/src/wp-admin/link-manager.php b/src/wp-admin/link-manager.php index de57d2cf0d..4aa4d29260 100644 --- a/src/wp-admin/link-manager.php +++ b/src/wp-admin/link-manager.php @@ -105,7 +105,7 @@ echo esc_html( $title ); ' . __( 'Search results for “%s”' ) . '', esc_html( wp_unslash( $_REQUEST['s'] ) ) ); + printf( '' . __( 'Search results for: %s' ) . '', '' . esc_html( wp_unslash( $_REQUEST['s'] ) ) . '' ); } ?> diff --git a/src/wp-admin/network/sites.php b/src/wp-admin/network/sites.php index 5b081c2833..7c6fa7e9b8 100644 --- a/src/wp-admin/network/sites.php +++ b/src/wp-admin/network/sites.php @@ -372,7 +372,7 @@ require_once ABSPATH . 'wp-admin/admin-header.php'; ' . __( 'Search results for “%s”' ) . '', esc_html( $s ) ); + printf( '' . __( 'Search results for: %s' ) . '', '' . esc_html( $s ) . '' ); } ?> diff --git a/src/wp-admin/network/themes.php b/src/wp-admin/network/themes.php index 84fbdf3106..6f335e7311 100644 --- a/src/wp-admin/network/themes.php +++ b/src/wp-admin/network/themes.php @@ -353,7 +353,7 @@ require_once ABSPATH . 'wp-admin/admin-header.php'; ' . __( 'Search results for “%s”' ) . '', esc_html( $s ) ); + printf( '' . __( 'Search results for: %s' ) . '', '' . esc_html( $s ) . '' ); } ?> diff --git a/src/wp-admin/network/users.php b/src/wp-admin/network/users.php index 4b103fc0bc..fe7fe0d61d 100644 --- a/src/wp-admin/network/users.php +++ b/src/wp-admin/network/users.php @@ -279,7 +279,7 @@ if ( isset( $_REQUEST['updated'] ) && 'true' == $_REQUEST['updated'] && ! empty( if ( strlen( $usersearch ) ) { /* translators: %s: Search query. */ - printf( '' . __( 'Search results for “%s”' ) . '', esc_html( $usersearch ) ); + printf( '' . __( 'Search results for: %s' ) . '', '' . esc_html( $usersearch ) . '' ); } ?> diff --git a/src/wp-admin/plugins.php b/src/wp-admin/plugins.php index 96d0b2cba9..1edfdab85e 100644 --- a/src/wp-admin/plugins.php +++ b/src/wp-admin/plugins.php @@ -728,7 +728,7 @@ if ( ( ! is_multisite() || is_network_admin() ) && current_user_can( 'install_pl if ( strlen( $s ) ) { /* translators: %s: Search query. */ - printf( '' . __( 'Search results for “%s”' ) . '', esc_html( urldecode( $s ) ) ); + printf( '' . __( 'Search results for: %s' ) . '', '' . esc_html( urldecode( $s ) ) . '' ); } ?> diff --git a/src/wp-admin/upload.php b/src/wp-admin/upload.php index 2eb29da17d..08129a23bc 100644 --- a/src/wp-admin/upload.php +++ b/src/wp-admin/upload.php @@ -276,7 +276,7 @@ if ( current_user_can( 'upload_files' ) ) { if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) { /* translators: %s: Search query. */ - printf( '' . __( 'Search results for “%s”' ) . '', get_search_query() ); + printf( '' . __( 'Search results for: %s' ) . '', '' . get_search_query() . '' ); } ?> diff --git a/src/wp-admin/users.php b/src/wp-admin/users.php index 786e7e29a2..1ff91ec595 100644 --- a/src/wp-admin/users.php +++ b/src/wp-admin/users.php @@ -571,7 +571,7 @@ switch ( $wp_list_table->current_action() ) { if ( strlen( $usersearch ) ) { /* translators: %s: Search query. */ - printf( '' . __( 'Search results for “%s”' ) . '', esc_html( $usersearch ) ); + printf( '' . __( 'Search results for: %s' ) . '', '' . esc_html( $usersearch ) . '' ); } ?>