Changeset 48267

Timestamp:

07/01/2020 07:48:30 PM (5 years ago)

Author:

ocean90

Message:

I18N: Use wp.i18n for translatable strings in wp-admin/js/common.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.
See #20491.
Fixes #50526.

Location:

trunk/src

Files:

• js/_enqueues/admin/common.js (modified) (5 diffs)
• wp-includes/script-loader.php (modified) (2 diffs)

trunk/src/js/_enqueues/admin/common.js

@@ -3 +3 @@
  */
 
-/* global setUserSetting, ajaxurl, commonL10n, alert, confirm, pagenow */
+/* global setUserSetting, ajaxurl, alert, confirm, pagenow */
 /* global columns, screenMeta */
 
@@ -16 +16 @@
     var $document = $( document ),
         $window = $( window ),
-        $body = $( document.body );
+        $body = $( document.body ),
+        __ = wp.i18n.__;
 
 /**
@@ -189 +190 @@
      */
     warn : function() {
-        var msg = commonL10n.warnDelete || '';
-        if ( confirm(msg) ) {
+        if ( confirm( __( 'You are about to permanently delete these items from your site.\nThis action cannot be undone.\n\'Cancel\' to stop, \'OK\' to delete.' ) ) ) {
             return true;
         }
@@ -758 +758 @@
         $( '.notice.is-dismissible' ).each( function() {
             var $el = $( this ),
-                $button = $( '<button type="button" class="notice-dismiss"><span class="screen-reader-text"></span></button>' ),
-                btnText = commonL10n.dismiss || '';
+                $button = $( '<button type="button" class="notice-dismiss"><span class="screen-reader-text"></span></button>' );
 
             // Ensure plain text.
-            $button.find( '.screen-reader-text' ).text( btnText );
+            $button.find( '.screen-reader-text' ).text( __( 'Dismiss this notice.' ) );
             $button.on( 'click.wp-dismiss-notice', function( event ) {
                 event.preventDefault();
@@ -1560 +1559 @@
     $document.on( 'wp-menu-state-set wp-collapse-menu', function( event, eventData ) {
         var $collapseButton = $( '#collapse-button' ),
-            ariaExpanded = 'true',
-            ariaLabelText = commonL10n.collapseMenu;
+            ariaExpanded, ariaLabelText;
 
         if ( 'folded' === eventData.state ) {
             ariaExpanded = 'false';
-            ariaLabelText = commonL10n.expandMenu;
+            ariaLabelText = __( 'Expand Main menu' );
+        } else {
+            ariaExpanded = 'true';
+            ariaLabelText = __( 'Collapse Main menu' );
         }
 

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

@@ -609 +609 @@
 
     $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array( 'jquery', 'hoverIntent', 'utils' ), false, 1 );
-    did_action( 'init' ) && $scripts->localize(
-        'common',
-        'commonL10n',
-        array(
-            'warnDelete'   => __( "You are about to permanently delete these items from your site.\nThis action cannot be undone.\n 'Cancel' to stop, 'OK' to delete." ),
-            'dismiss'      => __( 'Dismiss this notice.' ),
-            'collapseMenu' => __( 'Collapse Main menu' ),
-            'expandMenu'   => __( 'Expand Main menu' ),
-        )
-    );
+    $scripts->set_translations( 'common' );
 
     $scripts->add( 'wp-sanitize', "/wp-includes/js/wp-sanitize$suffix.js", array(), false, 1 );
@@ -810 +801 @@
     // Masonry v2 depended on jQuery. v3 does not. The older jquery-masonry handle is a shiv.
     // It sets jQuery as a dependency, as the theme may have been implicitly loading it this way.
-    $scripts->add( 'imagesloaded', '/wp-includes/js/imagesloaded.min.js', array(), '4.1.4', 1 );
-    $scripts->add( 'masonry', '/wp-includes/js/masonry.min.js', array( 'imagesloaded' ), '4.2.2', 1 );
+    $scripts->add( 'imagesloaded', '/wp-includes/js/imagesloaded.min.js', array(), '3.2.0', 1 );
+    $scripts->add( 'masonry', '/wp-includes/js/masonry.min.js', array( 'imagesloaded' ), '3.3.2', 1 );
     $scripts->add( 'jquery-masonry', "/wp-includes/js/jquery/jquery.masonry$dev_suffix.js", array( 'jquery', 'masonry' ), '3.1.2b', 1 );