Changeset 48274

Timestamp:

07/02/2020 11:09:23 AM (4 years ago)

Author:

SergeyBiryukov

Message:

I18N: Use wp.i18n for translatable strings in wp-admin/js/privacy-tools.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, afercia.
See #20491.
Fixes #50535.

Location:

trunk/src

Files:

• js/_enqueues/admin/privacy-tools.js (modified) (8 diffs)
• wp-includes/script-loader.php (modified) (2 diffs)

trunk/src/js/_enqueues/admin/privacy-tools.js

@@ -7 +7 @@
 // Privacy request action handling.
 jQuery( document ).ready( function( $ ) {
-    var strings = window.privacyToolsL10n || {},
+    var __ = wp.i18n.__,
         copiedNoticeTimeout;
 
@@ -78 +78 @@
 
         function onExportDoneSuccess( zipUrl ) {
-            var summaryMessage = strings.emailSent;
+            var summaryMessage = __( 'The personal data export link for this user was sent.' );
 
             setActionState( $action, 'export-personal-data-success' );
@@ -87 +87 @@
                 window.location = zipUrl;
             } else if ( ! sendAsEmail ) {
-                onExportFailure( strings.noExportFile );
+                onExportFailure( __( 'No personal data export file was generated.' ) );
             }
 
@@ -94 +94 @@
 
         function onExportFailure( errorMessage ) {
+            var summaryMessage = __( 'An error occurred while attempting to export personal data.' );
+
             setActionState( $action, 'export-personal-data-failed' );
+
             if ( errorMessage ) {
-                appendResultsAfterRow( $requestRow, 'notice-error', strings.exportError, [ errorMessage ] );
+                appendResultsAfterRow( $requestRow, 'notice-error', summaryMessage, [ errorMessage ] );
             }
 
@@ -176 +179 @@
 
         function onErasureDoneSuccess() {
-            var summaryMessage = strings.noDataFound,
+            var summaryMessage = __( 'No personal data was found for this user.' ),
                 classes = 'notice-success';
 
@@ -183 +186 @@
             if ( false === hasRemoved ) {
                 if ( false === hasRetained ) {
-                    summaryMessage = strings.noDataFound;
+                    summaryMessage = __( 'No personal data was found for this user.' );
                 } else {
-                    summaryMessage = strings.noneRemoved;
+                    summaryMessage = __( 'Personal data was found for this user but was not erased.' );
                     classes = 'notice-warning';
                 }
             } else {
                 if ( false === hasRetained ) {
-                    summaryMessage = strings.foundAndRemoved;
+                    summaryMessage = __( 'All of the personal data found for this user was erased.' );
                 } else {
-                    summaryMessage = strings.someNotRemoved;
+                    summaryMessage = __( 'Personal data was found for this user but some of the personal data found was not erased.' );
                     classes = 'notice-warning';
                 }
@@ -202 +205 @@
 
         function onErasureFailure() {
+            var summaryMessage = __( 'An error occurred while attempting to find and erase personal data.' );
+
             setActionState( $action, 'remove-personal-data-failed' );
-            appendResultsAfterRow( $requestRow, 'notice-error', strings.removalError, [] );
+
+            appendResultsAfterRow( $requestRow, 'notice-error', summaryMessage, [] );
 
             setTimeout( function() { $rowActions.removeClass( 'processing' ); }, 500 );
@@ -268 +274 @@
             $container,
             range,
-            __ = wp.i18n.__,
             $target = $( event.target ),
             copiedNotice = $target.siblings( '.success' );

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

@@ -1206 +1206 @@
     // To enqueue media-views or media-editor, call wp_enqueue_media().
     // Both rely on numerous settings, styles, and templates to operate correctly.
-    $scripts->add( 'media-views', "/wp-includes/js/media-views$suffix.js", array( 'utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable', 'wp-mediaelement', 'wp-api-request', 'wp-a11y', 'wp-i18n', 'clipboard' ), false, 1 );
+    $scripts->add( 'media-views', "/wp-includes/js/media-views$suffix.js", array( 'utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable', 'wp-mediaelement', 'wp-api-request', 'wp-a11y', 'clipboard' ), false, 1 );
     $scripts->set_translations( 'media-views' );
+
     $scripts->add( 'media-editor', "/wp-includes/js/media-editor$suffix.js", array( 'shortcode', 'media-views' ), false, 1 );
     $scripts->add( 'media-audiovideo', "/wp-includes/js/media-audiovideo$suffix.js", array( 'media-editor' ), false, 1 );
@@ -1380 +1381 @@
         );
 
-        $scripts->add( 'site-health', "/wp-admin/js/site-health$suffix.js", array( 'clipboard', 'jquery', 'wp-util', 'wp-a11y', 'wp-i18n' ), false, 1 );
+        $scripts->add( 'site-health', "/wp-admin/js/site-health$suffix.js", array( 'clipboard', 'jquery', 'wp-util', 'wp-a11y' ), false, 1 );
         $scripts->set_translations( 'site-health' );
 
-        $scripts->add( 'privacy-tools', "/wp-admin/js/privacy-tools$suffix.js", array( 'jquery', 'wp-a11y', 'wp-i18n' ), false, 1 );
-        did_action( 'init' ) && $scripts->localize(
-            'privacy-tools',
-            'privacyToolsL10n',
-            array(
-                'noDataFound'     => __( 'No personal data was found for this user.' ),
-                'foundAndRemoved' => __( 'All of the personal data found for this user was erased.' ),
-                'noneRemoved'     => __( 'Personal data was found for this user but was not erased.' ),
-                'someNotRemoved'  => __( 'Personal data was found for this user but some of the personal data found was not erased.' ),
-                'removalError'    => __( 'An error occurred while attempting to find and erase personal data.' ),
-                'emailSent'       => __( 'The personal data export link for this user was sent.' ),
-                'noExportFile'    => __( 'No personal data export file was generated.' ),
-                'exportError'     => __( 'An error occurred while attempting to export personal data.' ),
-            )
-        );
+        $scripts->add( 'privacy-tools', "/wp-admin/js/privacy-tools$suffix.js", array( 'jquery', 'wp-a11y' ), false, 1 );
+        $scripts->set_translations( 'privacy-tools' );
 
         $scripts->add( 'updates', "/wp-admin/js/updates$suffix.js", array( 'jquery', 'wp-util', 'wp-a11y', 'wp-sanitize' ), false, 1 );