Changeset 48383

Timestamp:

07/07/2020 04:07:25 PM (4 years ago)

Author:

ocean90

Message:

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 #20491.
Fixes #50596.

Location:

trunk/src

Files:

• js/_enqueues/lib/color-picker.js (modified) (5 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/src/js/_enqueues/lib/color-picker.js

@@ -3 +3 @@
  */
 
-/* global wpColorPickerL10n */
 ( function( $, undef ) {
 
@@ -12 +11 @@
         _button = '<input type="button" class="button button-small" />',
         _wrappingLabel = '<label></label>',
-        _wrappingLabelText = '<span class="screen-reader-text"></span>';
+        _wrappingLabelText = '<span class="screen-reader-text"></span>',
+        __ = wp.i18n.__;
 
     /**
@@ -119 +119 @@
                 self.wrappingLabelText = $( _wrappingLabelText )
                     .insertBefore( el )
-                    .text( wpColorPickerL10n.defaultLabel );
+                    .text( __( 'Color value' ) );
             }
 
@@ -137 +137 @@
                 .css( { backgroundColor: self.initialValue } );
             // Set the toggle button span element text.
-            self.toggler.find( '.wp-color-result-text' ).text( wpColorPickerL10n.pick );
+            self.toggler.find( '.wp-color-result-text' ).text( __( 'Select Color' ) );
             // Set up the Iris container and insert it after the wrapping label.
             self.pickerContainer = $( _after ).insertAfter( self.wrappingLabel );
@@ -147 +147 @@
                 self.button
                     .addClass( 'wp-picker-default' )
-                    .val( wpColorPickerL10n.defaultString )
-                    .attr( 'aria-label', wpColorPickerL10n.defaultAriaLabel );
+                    .val( __( 'Default' ) )
+                    .attr( 'aria-label', __( 'Select default color' ) );
             } else {
                 self.button
                     .addClass( 'wp-picker-clear' )
-                    .val( wpColorPickerL10n.clear )
-                    .attr( 'aria-label', wpColorPickerL10n.clearAriaLabel );
+                    .val( __( 'Clear' ) )
+                    .attr( 'aria-label', __( 'Clear color' ) );
             }
 

trunk/src/wp-includes/script-loader.php

@@ -1350 +1350 @@
         $scripts->add( 'iris', '/wp-admin/js/iris.min.js', array( 'jquery-ui-draggable', 'jquery-ui-slider', 'jquery-touch-punch' ), '1.0.7', 1 );
         $scripts->add( 'wp-color-picker', "/wp-admin/js/color-picker$suffix.js", array( 'iris' ), false, 1 );
-        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' ),
-            )
-        );
+        $scripts->set_translations( 'wp-color-picker' );
 
         $scripts->add( 'dashboard', "/wp-admin/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox', 'wp-util', 'wp-a11y' ), false, 1 );