Changeset 48350

Timestamp:

07/06/2020 08:58:06 PM (5 years ago)

Author:

ocean90

Message:

I18N: Use wp.i18n for translatable strings in wp-admin/js/tags-box.js and wp-admin/js/tags-suggest.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 #50579.

Location:

trunk/src

Files:

• js/_enqueues/admin/tags-box.js (modified) (3 diffs)
• js/_enqueues/admin/tags-suggest.js (modified) (2 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/src/js/_enqueues/admin/tags-box.js

@@ -7 +7 @@
 
 ( function( $ ) {
-    var tagDelimiter = ( window.tagsSuggestL10n && window.tagsSuggestL10n.tagDelimiter ) || ',';
+    var tagDelimiter = wp.i18n._x( ',', 'tag delimiter' ) || ',';
 
     /**
@@ -165 +165 @@
                     xbutton = $( '<button type="button" id="' + id + '-check-num-' + key + '" class="ntdelbutton">' +
                         '<span class="remove-tag-icon" aria-hidden="true"></span>' +
-                        '<span class="screen-reader-text">' + window.tagsSuggestL10n.removeTerm + ' ' + listItem.html() + '</span>' +
+                        '<span class="screen-reader-text">' + wp.i18n.__( 'Remove term:' ) + ' ' + listItem.html() + '</span>' +
                         '</button>' );
 
@@ -335 +335 @@
             switch ( this.userAction ) {
                 case 'remove':
-                    message = window.tagsSuggestL10n.termRemoved;
+                    message = wp.i18n.__( 'Term removed.' );
                     break;
 
                 case 'add':
-                    message = window.tagsSuggestL10n.termAdded;
+                    message = wp.i18n.__( 'Term added.' );
                     break;
 

trunk/src/js/_enqueues/admin/tags-suggest.js

@@ -5 +5 @@
  */
 ( function( $ ) {
-    if ( typeof window.tagsSuggestL10n === 'undefined' || typeof window.uiAutocompleteL10n === 'undefined' ) {
+    if ( typeof window.uiAutocompleteL10n === 'undefined' ) {
         return;
     }
 
     var tempID = 0;
-    var separator = window.tagsSuggestL10n.tagDelimiter || ',';
+    var separator = wp.i18n._x( ',', 'tag delimiter' ) || ',';
 
     function split( val ) {
@@ -105 +105 @@
                 if ( $.ui.keyCode.TAB === event.keyCode ) {
                     // Audible confirmation message when a tag has been selected.
-                    window.wp.a11y.speak( window.tagsSuggestL10n.termSelected, 'assertive' );
+                    window.wp.a11y.speak( wp.i18n.__( 'Term selected.' ), 'assertive' );
                     event.preventDefault();
                 } else if ( $.ui.keyCode.ENTER === event.keyCode ) {

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

@@ -1213 +1213 @@
 
         $scripts->add( 'tags-box', "/wp-admin/js/tags-box$suffix.js", array( 'jquery', 'tags-suggest' ), false, 1 );
+        $scripts->set_translations( 'tags-box' );
 
         $scripts->add( 'tags-suggest', "/wp-admin/js/tags-suggest$suffix.js", array( 'jquery-ui-autocomplete', 'wp-a11y' ), false, 1 );
-        did_action( 'init' ) && $scripts->localize(
-            'tags-suggest',
-            'tagsSuggestL10n',
-            array(
-                'tagDelimiter' => _x( ',', 'tag delimiter' ),
-                'removeTerm'   => __( 'Remove term:' ),
-                'termSelected' => __( 'Term selected.' ),
-                'termAdded'    => __( 'Term added.' ),
-                'termRemoved'  => __( 'Term removed.' ),
-            )
-        );
+        $scripts->set_translations( 'tags-suggest' );
 
         $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array( 'suggest', 'wp-lists', 'postbox', 'tags-box', 'underscore', 'word-count', 'wp-a11y', 'wp-sanitize', 'clipboard' ), false, 1 );