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

I18N: Use wp.i18n for translatable strings in wp-admin/js/inline-edit-post.js and wp-admin/js/inline-edit-tax.js.

Browse Source 
This removes the usage of `wp_localize_script()` for passing translations to the scripts and instead adds the translatable strings in the scripts directly through the use of `wp.i18n` and its utilities.

Props swissspidy, ocean90.
See #20491.
Fixes #50601.

git-svn-id: https://develop.svn.wordpress.org/trunk@48391 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dominik Schilling 2020-07-07 18:00:37 +00:00
parent 289c28637c
commit 849e7bfdc8
3 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/js/_enqueues/admin/inline-edit-post.js
View File

@ -5,7 +5,7 @@
* @output wp-admin/js/inline-edit-post.js * @output wp-admin/js/inline-edit-post.js
*/ */
/* global inlineEditL10n, ajaxurl, typenow, inlineEditPost */ /* global ajaxurl, typenow, inlineEditPost */
window.wp = window.wp || {}; window.wp = window.wp || {};
@ -198,8 +198,8 @@ window.wp = window.wp || {};
if ( $(this).prop('checked') ) { if ( $(this).prop('checked') ) {
c = false; c = false;
var id = $(this).val(), theTitle; var id = $(this).val(), theTitle;
theTitle = $('#inline_'+id+' .post_title').html() || inlineEditL10n.notitle; theTitle = $('#inline_'+id+' .post_title').html() || wp.i18n.__( '(no title)' );
te += '<div id="ttle'+id+'"><a id="_'+id+'" class="ntdelbutton" title="'+inlineEditL10n.ntdeltitle+'">X</a>'+theTitle+'</div>'; te += '<div id="ttle'+id+'"><a id="_'+id+'" class="ntdelbutton" title="'+ wp.i18n.__( 'Remove From Bulk Edit' ) +'">X</a>'+theTitle+'</div>';
} }
}); });
@ -327,7 +327,7 @@ window.wp = window.wp || {};
var terms = $(this), var terms = $(this),
taxname = $(this).attr('id').replace('_' + id, ''), taxname = $(this).attr('id').replace('_' + id, ''),
textarea = $('textarea.tax_input_' + taxname, editRow), textarea = $('textarea.tax_input_' + taxname, editRow),
comma = inlineEditL10n.comma; comma = wp.i18n._x( ',', 'tag delimiter' ).trim();
terms.find( 'img' ).replaceWith( function() { return this.alt; } ); terms.find( 'img' ).replaceWith( function() { return this.alt; } );
terms = terms.text(); terms = terms.text();
@ -431,7 +431,7 @@ window.wp = window.wp || {};
$( this ).find( '.editinline' ) $( this ).find( '.editinline' )
.attr( 'aria-expanded', 'false' ) .attr( 'aria-expanded', 'false' )
.focus(); .focus();
wp.a11y.speak( inlineEditL10n.saved ); wp.a11y.speak( wp.i18n.__( 'Changes saved.' ) );
}); });
} else { } else {
r = r.replace( /<.[^<>]*?>/g, '' ); r = r.replace( /<.[^<>]*?>/g, '' );
@ -441,8 +441,8 @@ window.wp = window.wp || {};
} }
} else { } else {
$errorNotice.removeClass( 'hidden' ); $errorNotice.removeClass( 'hidden' );
$error.html( inlineEditL10n.error ); $error.text( wp.i18n.__( 'Error while saving the changes.' ) );
wp.a11y.speak( inlineEditL10n.error ); wp.a11y.speak( wp.i18n.__( 'Error while saving the changes.' ) );
} }
}, },
'html'); 'html');

8
src/js/_enqueues/admin/inline-edit-tax.js
View File

@ -4,7 +4,7 @@
* @output wp-admin/js/inline-edit-tax.js * @output wp-admin/js/inline-edit-tax.js
*/ */
/* global inlineEditL10n, ajaxurl, inlineEditTax */ /* global ajaxurl, inlineEditTax */
window.wp = window.wp || {}; window.wp = window.wp || {};
@ -224,7 +224,7 @@ window.inlineEditTax = {
row.find( '.editinline' ) row.find( '.editinline' )
.attr( 'aria-expanded', 'false' ) .attr( 'aria-expanded', 'false' )
.focus(); .focus();
wp.a11y.speak( inlineEditL10n.saved ); wp.a11y.speak( wp.i18n.__( 'Changes saved.' ) );
}); });
} else { } else {
@ -238,8 +238,8 @@ window.inlineEditTax = {
} }
} else { } else {
$errorNotice.removeClass( 'hidden' ); $errorNotice.removeClass( 'hidden' );
$error.html( inlineEditL10n.error ); $error.text( wp.i18n.__( 'Error while saving the changes.' ) );
wp.a11y.speak( inlineEditL10n.error ); wp.a11y.speak( wp.i18n.__( 'Error while saving the changes.' ) );
} }
} }
); );

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

@ -1254,27 +1254,10 @@ function wp_default_scripts( $scripts ) {
$scripts->add( 'theme', "/wp-admin/js/theme$suffix.js", array( 'wp-backbone', 'wp-a11y', 'customize-base' ), false, 1 ); $scripts->add( 'theme', "/wp-admin/js/theme$suffix.js", array( 'wp-backbone', 'wp-a11y', 'customize-base' ), false, 1 );
$scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'tags-suggest', 'wp-a11y' ), false, 1 ); $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'tags-suggest', 'wp-a11y' ), false, 1 );
did_action( 'init' ) && $scripts->localize( $scripts->set_translations( 'inline-edit-post' );
'inline-edit-post',
'inlineEditL10n',
array(
'error' => __( 'Error while saving the changes.' ),
'ntdeltitle' => __( 'Remove From Bulk Edit' ),
'notitle' => __( '(no title)' ),
'comma' => trim( _x( ',', 'tag delimiter' ) ),
'saved' => __( 'Changes saved.' ),
)
);
$scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery', 'wp-a11y' ), false, 1 ); $scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery', 'wp-a11y' ), false, 1 );
did_action( 'init' ) && $scripts->localize( $scripts->set_translations( 'inline-edit-tax' );
'inline-edit-tax',
'inlineEditL10n',
array(
'error' => __( 'Error while saving the changes.' ),
'saved' => __( 'Changes saved.' ),
)
);
$scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery', 'jquery-ui-core', 'thickbox' ), false, 1 ); $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery', 'jquery-ui-core', 'thickbox' ), false, 1 );
did_action( 'init' ) && $scripts->localize( did_action( 'init' ) && $scripts->localize(