From f0c4b2c12e5b70b82c70015d671a0396237dc74f Mon Sep 17 00:00:00 2001 From: Dominik Schilling Date: Tue, 7 Jul 2020 18:13:14 +0000 Subject: [PATCH] I18N: Use `wp.i18n` for translatable strings in `wp-admin/js/plugin-install.js`. This removes the usage of `wp_localize_script()` for passing translations to the script and instead adds the translatable strings in the script directly through the use of `wp.i18n` and its utilities. Props swissspidy, ocean90. See #20491. Fixes #50602. git-svn-id: https://develop.svn.wordpress.org/trunk@48392 602fd350-edb4-49c9-b593-d223f7449a82 --- src/js/_enqueues/admin/plugin-install.js | 12 +++++++++--- src/wp-includes/script-loader.php | 10 +--------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/js/_enqueues/admin/plugin-install.js b/src/js/_enqueues/admin/plugin-install.js index 8f417e5472..df273b48dd 100644 --- a/src/js/_enqueues/admin/plugin-install.js +++ b/src/js/_enqueues/admin/plugin-install.js @@ -4,7 +4,7 @@ * @output wp-admin/js/plugin-install.js */ -/* global plugininstallL10n, tb_click, tb_remove, tb_position */ +/* global tb_click, tb_remove, tb_position */ jQuery( document ).ready( function( $ ) { @@ -156,7 +156,13 @@ jQuery( document ).ready( function( $ ) { */ $( '.wrap' ).on( 'click', '.thickbox.open-plugin-details-modal', function( e ) { // The `data-title` attribute is used only in the Plugin screens. - var title = $( this ).data( 'title' ) ? plugininstallL10n.plugin_information + ' ' + $( this ).data( 'title' ) : plugininstallL10n.plugin_modal_label; + var title = $( this ).data( 'title' ) ? + wp.i18n.sprintf( + // translators: %s: Plugin name. + wp.i18n.__( 'Plugin: %s' ), + $( this ).data( 'title' ) + ) : + wp.i18n.__( 'Plugin details' ); e.preventDefault(); e.stopPropagation(); @@ -170,7 +176,7 @@ jQuery( document ).ready( function( $ ) { tbWindow .attr({ 'role': 'dialog', - 'aria-label': plugininstallL10n.plugin_modal_label + 'aria-label': wp.i18n.__( 'Plugin details' ) }) .addClass( 'plugin-details-modal' ); diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index a9dcf930cb..a98c2ed29c 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -1260,15 +1260,7 @@ function wp_default_scripts( $scripts ) { $scripts->set_translations( 'inline-edit-tax' ); $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery', 'jquery-ui-core', 'thickbox' ), false, 1 ); - did_action( 'init' ) && $scripts->localize( - 'plugin-install', - 'plugininstallL10n', - array( - 'plugin_information' => __( 'Plugin:' ), - 'plugin_modal_label' => __( 'Plugin details' ), - 'ays' => __( 'Are you sure you want to install this plugin?' ), - ) - ); + $scripts->set_translations( 'plugin-install' ); $scripts->add( 'site-health', "/wp-admin/js/site-health$suffix.js", array( 'clipboard', 'jquery', 'wp-util', 'wp-a11y' ), false, 1 ); $scripts->set_translations( 'site-health' );