Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-03-13 15:20:06 +01:00
Code Issues Projects Releases Wiki Activity

I18N: Use wp.i18n for translatable strings in wp-admin/js/user-profile.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 #50527.
Built from https://develop.svn.wordpress.org/trunk@48270


git-svn-id: http://core.svn.wordpress.org/trunk@48039 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2020-07-01 20:38:01 +00:00
parent 4329bd950b
commit 2fab13ae3e
4 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-admin/js/user-profile.js
View File

@ -2,10 +2,10 @@
* @output wp-admin/js/user-profile.js * @output wp-admin/js/user-profile.js
*/ */
/* global ajaxurl, pwsL10n, userProfileL10n */ /* global ajaxurl, pwsL10n */
(function($) { (function($) {
var updateLock = false, var updateLock = false,
__ = wp.i18n.__,
$pass1Row, $pass1Row,
$pass1, $pass1,
$pass2, $pass2,
@ -39,7 +39,7 @@
} }
// Once zxcvbn loads, passwords strength is known. // Once zxcvbn loads, passwords strength is known.
$( '#pw-weak-text-label' ).html( userProfileL10n.warnWeak ); $( '#pw-weak-text-label' ).text( __( 'Confirm use of weak password' ) );
} }
function bindPass1() { function bindPass1() {
@ -64,10 +64,10 @@
function resetToggle( show ) { function resetToggle( show ) {
$toggleButton $toggleButton
.attr({ .attr({
'aria-label': show ? userProfileL10n.ariaShow : userProfileL10n.ariaHide 'aria-label': show ? __( 'Show password' ) : __( 'Hide password' )
}) })
.find( '.text' ) .find( '.text' )
.text( show ? userProfileL10n.show : userProfileL10n.hide ) .text( show ? __( 'Show' ) : __( 'Hide' ) )
.end() .end()
.find( '.dashicons' ) .find( '.dashicons' )
.removeClass( show ? 'dashicons-hidden' : 'dashicons-visibility' ) .removeClass( show ? 'dashicons-hidden' : 'dashicons-visibility' )
@ -402,7 +402,7 @@
/* Warn the user if password was generated but not saved */ /* Warn the user if password was generated but not saved */
$( window ).on( 'beforeunload', function () { $( window ).on( 'beforeunload', function () {
if ( true === updateLock ) { if ( true === updateLock ) {
return userProfileL10n.warn; return __( 'Your new password has not been saved.' );
} }
} ); } );

2
wp-admin/js/user-profile.min.js vendored
View File

File diff suppressed because one or more lines are too long

14
wp-includes/script-loader.php
View File

@ -1065,19 +1065,7 @@ function wp_default_scripts( $scripts ) {
$scripts->set_translations( 'password-strength-meter' ); $scripts->set_translations( 'password-strength-meter' );
$scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter', 'wp-util' ), false, 1 ); $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter', 'wp-util' ), false, 1 );
did_action( 'init' ) && $scripts->localize( $scripts->set_translations( 'user-profile' );
'user-profile',
'userProfileL10n',
array(
'warn' => __( 'Your new password has not been saved.' ),
'warnWeak' => __( 'Confirm use of weak password' ),
'show' => __( 'Show' ),
'hide' => __( 'Hide' ),
'cancel' => __( 'Cancel' ),
'ariaShow' => esc_attr__( 'Show password' ),
'ariaHide' => esc_attr__( 'Hide password' ),
)
);
$scripts->add( 'language-chooser', "/wp-admin/js/language-chooser$suffix.js", array( 'jquery' ), false, 1 ); $scripts->add( 'language-chooser', "/wp-admin/js/language-chooser$suffix.js", array( 'jquery' ), false, 1 );

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.5-alpha-48269'; $wp_version = '5.5-alpha-48270';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.