sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

I18N: Use wp.i18n for translatable strings in wp-admin/js/tags-box.js and wp-admin/js/tags-suggest.js.

Browse Source 
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.

git-svn-id: https://develop.svn.wordpress.org/trunk@48350 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dominik Schilling 2020-07-06 20:58:06 +00:00
parent 9e29ffdd33
commit 7a59fefb21
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/js/_enqueues/admin/tags-box.js
View File

@ -6,7 +6,7 @@
/* global ajaxurl, tagBox, array_unique_noempty */ /* global ajaxurl, tagBox, array_unique_noempty */
( function( $ ) { ( function( $ ) {
var tagDelimiter = ( window.tagsSuggestL10n && window.tagsSuggestL10n.tagDelimiter ) || ','; var tagDelimiter = wp.i18n._x( ',', 'tag delimiter' ) || ',';
/** /**
* Filters unique items and returns a new array. * Filters unique items and returns a new array.
@ -164,7 +164,7 @@
*/ */
xbutton = $( '<button type="button" id="' + id + '-check-num-' + key + '" class="ntdelbutton">' + xbutton = $( '<button type="button" id="' + id + '-check-num-' + key + '" class="ntdelbutton">' +
'<span class="remove-tag-icon" aria-hidden="true"></span>' + '<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>' ); '</button>' );
/** /**
@ -334,11 +334,11 @@
switch ( this.userAction ) { switch ( this.userAction ) {
case 'remove': case 'remove':
message = window.tagsSuggestL10n.termRemoved; message = wp.i18n.__( 'Term removed.' );
break; break;
case 'add': case 'add':
message = window.tagsSuggestL10n.termAdded; message = wp.i18n.__( 'Term added.' );
break; break;
default: default:

6
src/js/_enqueues/admin/tags-suggest.js
View File

@ -4,12 +4,12 @@
* @output wp-admin/js/tags-suggest.js * @output wp-admin/js/tags-suggest.js
*/ */
( function( $ ) { ( function( $ ) {
if ( typeof window.tagsSuggestL10n === 'undefined' || typeof window.uiAutocompleteL10n === 'undefined' ) { if ( typeof window.uiAutocompleteL10n === 'undefined' ) {
return; return;
} }
var tempID = 0; var tempID = 0;
var separator = window.tagsSuggestL10n.tagDelimiter || ','; var separator = wp.i18n._x( ',', 'tag delimiter' ) || ',';
function split( val ) { function split( val ) {
return val.split( new RegExp( separator + '\\s*' ) ); return val.split( new RegExp( separator + '\\s*' ) );
@ -104,7 +104,7 @@
if ( $.ui.keyCode.TAB === event.keyCode ) { if ( $.ui.keyCode.TAB === event.keyCode ) {
// Audible confirmation message when a tag has been selected. // 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(); event.preventDefault();
} else if ( $.ui.keyCode.ENTER === event.keyCode ) { } else if ( $.ui.keyCode.ENTER === event.keyCode ) {
// If we're in the edit post Tags meta box, add the tag. // If we're in the edit post Tags meta box, add the tag.

13
src/wp-includes/script-loader.php
View File

@ -1212,19 +1212,10 @@ function wp_default_scripts( $scripts ) {
$scripts->set_translations( 'postbox' ); $scripts->set_translations( 'postbox' );
$scripts->add( 'tags-box', "/wp-admin/js/tags-box$suffix.js", array( 'jquery', 'tags-suggest' ), false, 1 ); $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 ); $scripts->add( 'tags-suggest', "/wp-admin/js/tags-suggest$suffix.js", array( 'jquery-ui-autocomplete', 'wp-a11y' ), false, 1 );
did_action( 'init' ) && $scripts->localize( $scripts->set_translations( 'tags-suggest' );
'tags-suggest',
'tagsSuggestL10n',
array(
'tagDelimiter' => _x( ',', 'tag delimiter' ),
'removeTerm' => __( 'Remove term:' ),
'termSelected' => __( 'Term selected.' ),
'termAdded' => __( 'Term added.' ),
'termRemoved' => __( 'Term removed.' ),
)
);
$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->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' ); $scripts->set_translations( 'post' );