<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[48383] trunk/src: I18N: Use `wp.i18n` for translatable strings in `wp-admin/js/color-picker.js`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/48383">48383</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/48383","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-07-07 16:07:25 +0000 (Tue, 07 Jul 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>I18N: Use `wp.i18n` for translatable strings in `wp-admin/js/color-picker.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 <a href="https://core.trac.wordpress.org/ticket/20491">#20491</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/50596">#50596</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueueslibcolorpickerjs">trunk/src/js/_enqueues/lib/color-picker.js</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueueslibcolorpickerjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/lib/color-picker.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/lib/color-picker.js 2020-07-07 16:06:43 UTC (rev 48382)
+++ trunk/src/js/_enqueues/lib/color-picker.js 2020-07-07 16:07:25 UTC (rev 48383)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,7 +2,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @output wp-admin/js/color-picker.js
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* global wpColorPickerL10n */
</del><span class="cx" style="display: block; padding: 0 10px"> ( function( $, undef ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> var ColorPicker,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +10,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _wrap = '<div class="wp-picker-container" />',
</span><span class="cx" style="display: block; padding: 0 10px"> _button = '<input type="button" class="button button-small" />',
</span><span class="cx" style="display: block; padding: 0 10px"> _wrappingLabel = '<label></label>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _wrappingLabelText = '<span class="screen-reader-text"></span>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _wrappingLabelText = '<span class="screen-reader-text"></span>',
+ __ = wp.i18n.__;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Creates a jQuery UI color picker that is used in the theme customizer.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,7 +118,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Insert the default label text.
</span><span class="cx" style="display: block; padding: 0 10px"> self.wrappingLabelText = $( _wrappingLabelText )
</span><span class="cx" style="display: block; padding: 0 10px"> .insertBefore( el )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .text( wpColorPickerL10n.defaultLabel );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .text( __( 'Color value' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,7 +136,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .insertBefore( self.wrappingLabel )
</span><span class="cx" style="display: block; padding: 0 10px"> .css( { backgroundColor: self.initialValue } );
</span><span class="cx" style="display: block; padding: 0 10px"> // Set the toggle button span element text.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self.toggler.find( '.wp-color-result-text' ).text( wpColorPickerL10n.pick );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self.toggler.find( '.wp-color-result-text' ).text( __( 'Select Color' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> // Set up the Iris container and insert it after the wrapping label.
</span><span class="cx" style="display: block; padding: 0 10px"> self.pickerContainer = $( _after ).insertAfter( self.wrappingLabel );
</span><span class="cx" style="display: block; padding: 0 10px"> // Store a reference to the Clear/Default button.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,13 +146,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( self.options.defaultColor ) {
</span><span class="cx" style="display: block; padding: 0 10px"> self.button
</span><span class="cx" style="display: block; padding: 0 10px"> .addClass( 'wp-picker-default' )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .val( wpColorPickerL10n.defaultString )
- .attr( 'aria-label', wpColorPickerL10n.defaultAriaLabel );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .val( __( 'Default' ) )
+ .attr( 'aria-label', __( 'Select default color' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> self.button
</span><span class="cx" style="display: block; padding: 0 10px"> .addClass( 'wp-picker-clear' )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .val( wpColorPickerL10n.clear )
- .attr( 'aria-label', wpColorPickerL10n.clearAriaLabel );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .val( __( 'Clear' ) )
+ .attr( 'aria-label', __( 'Clear color' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Wrap the wrapping label in its wrapper and append the Clear/Default button.
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2020-07-07 16:06:43 UTC (rev 48382)
+++ trunk/src/wp-includes/script-loader.php 2020-07-07 16:07:25 UTC (rev 48383)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1349,18 +1349,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'iris', '/wp-admin/js/iris.min.js', array( 'jquery-ui-draggable', 'jquery-ui-slider', 'jquery-touch-punch' ), '1.0.7', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'wp-color-picker', "/wp-admin/js/color-picker$suffix.js", array( 'iris' ), false, 1 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- did_action( 'init' ) && $scripts->localize(
- 'wp-color-picker',
- 'wpColorPickerL10n',
- array(
- 'clear' => __( 'Clear' ),
- 'clearAriaLabel' => __( 'Clear color' ),
- 'defaultString' => __( 'Default' ),
- 'defaultAriaLabel' => __( 'Select default color' ),
- 'pick' => __( 'Select Color' ),
- 'defaultLabel' => __( 'Color value' ),
- )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scripts->set_translations( 'wp-color-picker' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'dashboard', "/wp-admin/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox', 'wp-util', 'wp-a11y' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>