From f9ff030127dc54b9a32cf237ebdfe3fb50562e62 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 18 Oct 2017 15:46:52 +0000 Subject: [PATCH] I18N: Replace hardcoded file name in a translatable string in `convert_to_screen()` with a placeholder. Props ramiy. Fixes #41668. Built from https://develop.svn.wordpress.org/trunk@41906 git-svn-id: http://core.svn.wordpress.org/trunk@41740 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/template.php | 12 +++++++++++- wp-includes/version.php | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index 98e0d91255..ec0fb52591 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -2067,7 +2067,17 @@ function _wp_admin_html_begin() { */ function convert_to_screen( $hook_name ) { if ( ! class_exists( 'WP_Screen' ) ) { - _doing_it_wrong( 'convert_to_screen(), add_meta_box()', __( "Likely direct inclusion of wp-admin/includes/template.php in order to use add_meta_box(). This is very wrong. Hook the add_meta_box() call into the add_meta_boxes action instead." ), '3.3.0' ); + _doing_it_wrong( + 'convert_to_screen(), add_meta_box()', + sprintf( + /* translators: 1: wp-admin/includes/template.php 2: add_meta_box() 3: add_meta_boxes */ + __( 'Likely direct inclusion of %1$s in order to use %2$s. This is very wrong. Hook the %2$s call into the %3$s action instead.' ), + 'wp-admin/includes/template.php', + 'add_meta_box()', + 'add_meta_boxes' + ), + '3.3.0' + ); return (object) array( 'id' => '_invalid', 'base' => '_are_belong_to_us' ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index 54386a3335..34ce0279c8 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.9-beta2-41905'; +$wp_version = '4.9-beta2-41906'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.