Changeset 48387

Timestamp:

07/07/2020 04:59:22 PM (4 years ago)

Author:

ocean90

Message:

I18N: Use wp.i18n for translatable strings in wp-admin/js/widgets.js.

This removes the usage of $scripts->add_inline_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.

Fixes #50600.

Location:

trunk/src

Files:

• js/_enqueues/admin/widgets.js (modified) (5 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/src/js/_enqueues/admin/widgets.js

@@ -15 +15 @@
      */
     hoveredSidebar: null,
-
-    /**
-     * Translations.
-     *
-     * Exported from PHP in wp_default_scripts().
-     *
-     * @var {object}
-     */
-    l10n: {
-        save: '{save}',
-        saved: '{saved}',
-        saveAlert: '{saveAlert}',
-        widgetAdded: '{widgetAdded}'
-    },
 
     /**
@@ -110 +96 @@
                 } );
 
-                event.returnValue = wpWidgets.l10n.saveAlert;
+                event.returnValue = wp.i18n.__( 'The changes you made will be lost if you navigate away from this page.' );
                 return event.returnValue;
             }
@@ -142 +128 @@
                 if ( ! widget.data( 'dirty-state-initialized' ) ) {
                     saveButton = inside.find( '.widget-control-save' );
-                    saveButton.prop( 'disabled', true ).val( wpWidgets.l10n.saved );
+                    saveButton.prop( 'disabled', true ).val( wp.i18n.__( 'Saved' ) );
                     inside.on( 'input change', function() {
                         self.dirtyWidgets[ widgetId ] = true;
                         widget.addClass( 'widget-dirty' );
-                        saveButton.prop( 'disabled', false ).val( wpWidgets.l10n.save );
+                        saveButton.prop( 'disabled', false ).val( wp.i18n.__( 'Save' ) );
                     });
                     widget.data( 'dirty-state-initialized', true );
@@ -587 +573 @@
 
                     // Re-disable the save button.
-                    widget.find( '.widget-control-save' ).prop( 'disabled', true ).val( wpWidgets.l10n.saved );
+                    widget.find( '.widget-control-save' ).prop( 'disabled', true ).val( wp.i18n.__( 'Saved' ) );
 
                     widget.removeClass( 'widget-dirty' );
@@ -718 +704 @@
             widget.find( '.widget-title' ).trigger('click');
             // At the end of the animation, announce the widget has been added.
-            window.wp.a11y.speak( wpWidgets.l10n.widgetAdded, 'assertive' );
+            window.wp.a11y.speak( wp.i18n.__( 'Widget has been added to the selected sidebar' ), 'assertive' );
         }, 250 );
     },

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

@@ -1240 +1240 @@
 
         $scripts->add( 'admin-widgets', "/wp-admin/js/widgets$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable', 'wp-a11y' ), false, 1 );
-        did_action( 'init' ) && $scripts->add_inline_script(
-            'admin-widgets',
-            sprintf(
-                'wpWidgets.l10n = %s;',
-                wp_json_encode(
-                    array(
-                        'save'        => __( 'Save' ),
-                        'saved'       => __( 'Saved' ),
-                        'saveAlert'   => __( 'The changes you made will be lost if you navigate away from this page.' ),
-                        'widgetAdded' => __( 'Widget has been added to the selected sidebar' ),
-                    )
-                )
-            )
-        );
+        $scripts->set_translations( 'admin-widgets' );
 
         $scripts->add( 'media-widgets', "/wp-admin/js/widgets/media-widgets$suffix.js", array( 'jquery', 'media-models', 'media-views', 'wp-api-request' ) );