Changeset 48395

Timestamp:

07/07/2020 06:38:20 PM (6 years ago)

Author:

ocean90

Message:

I18N: Use wp.i18n for translatable strings in wp-admin/js/comment.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 #50604.

Location:

trunk/src

Files:

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

trunk/src/js/_enqueues/admin/comment.js

@@ -3 +3 @@
  */
 
-/* global postboxes, commentL10n */
+/* global postboxes */
 
 /**
@@ -85 +85 @@
 
         $timestamp.html(
-            commentL10n.submittedOn + ' <b>' +
-            commentL10n.dateFormat
+            wp.i18n.__( 'Submitted on:' ) + ' <b>' +
+            /* translators: 1: Month, 2: Day, 3: Year, 4: Hour, 5: Minute. */
+            wp.i18n.__( '%1$s %2$s, %3$s at %4$s:%5$s' )
                 .replace( '%1$s', $( 'option[value="' + mm + '"]', '#mm' ).attr( 'data-text' ) )
                 .replace( '%2$s', parseInt( jj, 10 ) )

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

@@ -1225 +1225 @@
         $scripts->add( 'link', "/wp-admin/js/link$suffix.js", array( 'wp-lists', 'postbox' ), false, 1 );
 
-        $scripts->add( 'comment', "/wp-admin/js/comment$suffix.js", array( 'jquery', 'postbox' ) );
-        $scripts->add_data( 'comment', 'group', 1 );
-        did_action( 'init' ) && $scripts->localize(
-            'comment',
-            'commentL10n',
-            array(
-                'submittedOn' => __( 'Submitted on:' ),
-                /* translators: 1: Month, 2: Day, 3: Year, 4: Hour, 5: Minute. */
-                'dateFormat'  => __( '%1$s %2$s, %3$s at %4$s:%5$s' ),
-            )
-        );
+        $scripts->add( 'comment', "/wp-admin/js/comment$suffix.js", array( 'jquery', 'postbox' ), false, 1 );
+        $scripts->set_translations( 'comment' );
 
         $scripts->add( 'admin-gallery', "/wp-admin/js/gallery$suffix.js", array( 'jquery-ui-sortable' ) );