diff --git a/src/js/_enqueues/admin/tags-box.js b/src/js/_enqueues/admin/tags-box.js index 7d7eee53f1..b4d1cec969 100644 --- a/src/js/_enqueues/admin/tags-box.js +++ b/src/js/_enqueues/admin/tags-box.js @@ -6,7 +6,7 @@ /* global ajaxurl, tagBox, array_unique_noempty */ ( function( $ ) { - var tagDelimiter = ( window.tagsSuggestL10n && window.tagsSuggestL10n.tagDelimiter ) || ','; + var tagDelimiter = wp.i18n._x( ',', 'tag delimiter' ) || ','; /** * Filters unique items and returns a new array. @@ -164,7 +164,7 @@ */ xbutton = $( '' ); /** @@ -334,11 +334,11 @@ 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; default: diff --git a/src/js/_enqueues/admin/tags-suggest.js b/src/js/_enqueues/admin/tags-suggest.js index c5ccf16eaf..81c2612c84 100644 --- a/src/js/_enqueues/admin/tags-suggest.js +++ b/src/js/_enqueues/admin/tags-suggest.js @@ -4,12 +4,12 @@ * @output wp-admin/js/tags-suggest.js */ ( 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 ) { return val.split( new RegExp( separator + '\\s*' ) ); @@ -104,7 +104,7 @@ 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 ) { // If we're in the edit post Tags meta box, add the tag. diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index 31f837a6f8..a09879f1fe 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -1212,19 +1212,10 @@ function wp_default_scripts( $scripts ) { $scripts->set_translations( 'postbox' ); $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 ); $scripts->set_translations( 'post' );