Changeset 48348

Timestamp:

07/06/2020 08:15:46 PM (5 years ago)

Author:

ocean90

Message:

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

Location:

trunk/src

Files:

• js/_enqueues/admin/edit-comments.js (modified) (10 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/src/js/_enqueues/admin/edit-comments.js

@@ -7 +7 @@
  */
 
-/* global adminCommentsL10n, thousandsSeparator, list_args, QTags, ajaxurl, wpAjax */
+/* global adminCommentsSettings, thousandsSeparator, list_args, QTags, ajaxurl, wpAjax */
 /* global commentReply, theExtraList, theList, setCommentsList */
 
@@ -14 +14 @@
     updateHtmlTitle, updateDashboardText, updateInModerationText, adminTitle = document.title,
     isDashboard = $('#dashboard_right_now').length,
-    titleDiv, titleRegEx;
+    titleDiv, titleRegEx,
+    __ = wp.i18n.__;
 
     /**
@@ -192 +193 @@
         var newTitle, regExMatch, titleCount, commentFrag;
 
-        titleRegEx = titleRegEx || new RegExp( adminCommentsL10n.docTitleCommentsCount.replace( '%s', '\\([0-9' + thousandsSeparator + ']+\\)' ) + '?' );
+        /* translators: %s: Comments count. */
+        titleRegEx = titleRegEx || new RegExp( __( 'Comments (%s)' ).replace( '%s', '\\([0-9' + thousandsSeparator + ']+\\)' ) + '?' );
         // Count funcs operate on a $'d element.
         titleDiv = titleDiv || $( '<div />' );
@@ -211 +213 @@
             regExMatch = titleRegEx.exec( document.title );
             if ( regExMatch ) {
-                newTitle = document.title.replace( regExMatch[0], adminCommentsL10n.docTitleCommentsCount.replace( '%s', titleDiv.text() ) + ' ' );
+                /* translators: %s: Comments count. */
+                newTitle = document.title.replace( regExMatch[0], __( 'Comments (%s)' ).replace( '%s', titleDiv.text() ) + ' ' );
             }
         } else {
             regExMatch = titleRegEx.exec( newTitle );
             if ( regExMatch ) {
-                newTitle = newTitle.replace( regExMatch[0], adminCommentsL10n.docTitleComments );
+                newTitle = newTitle.replace( regExMatch[0], __( 'Comments11' ) );
             }
         }
@@ -361 +364 @@
         if ( c.is('.unapproved') ) {
             if ( settings.data.id == replyID )
-                replyButton.text(adminCommentsL10n.replyApprove);
+                replyButton.text( __( 'Approve and Reply' ) );
 
             c.find( '.row-actions span.view' ).addClass( 'hidden' ).end()
@@ -368 +371 @@
         } else {
             if ( settings.data.id == replyID )
-                replyButton.text(adminCommentsL10n.reply);
+                replyButton.text( __( 'Reply' ) );
 
             c.find( '.row-actions span.view' ).removeClass( 'hidden' ).end()
@@ -847 +850 @@
      */
     toggle : function(el) {
-        if ( 'none' !== $( el ).css( 'display' ) && ( $( '#replyrow' ).parent().is('#com-reply') || window.confirm( adminCommentsL10n.warnQuickEdit ) ) ) {
+        if ( 'none' !== $( el ).css( 'display' ) && ( $( '#replyrow' ).parent().is('#com-reply') || window.confirm( __( 'Are you sure you want to edit this comment?\nThe changes you made will be lost.' ) ) ) ) {
             $( el ).find( 'button.vim-q' ).click();
         }
@@ -1008 +1011 @@
 
             if ( c.hasClass('unapproved') ) {
-                replyButton.text(adminCommentsL10n.replyApprove);
+                replyButton.text( __( 'Approve and Reply' ) );
             } else {
-                replyButton.text(adminCommentsL10n.reply);
+                replyButton.text( __( 'Reply' ) );
             }
 
@@ -1218 +1221 @@
         }
 
-        return window.confirm( adminCommentsL10n.warnCommentChanges );
+        return window.confirm( __( 'Are you sure you want to do this?\nThe comment changes you made will be lost.' ) );
     }
 };
@@ -1313 +1316 @@
             ],
             {
-                highlight_first: adminCommentsL10n.hotkeys_highlight_first,
-                highlight_last: adminCommentsL10n.hotkeys_highlight_last,
+                highlight_first: adminCommentsSettings.hotkeys_highlight_first,
+                highlight_last: adminCommentsSettings.hotkeys_highlight_last,
                 prev_page_link_cb: make_hotkeys_redirect('prev'),
                 next_page_link_cb: make_hotkeys_redirect('next'),

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

@@ -1197 +1197 @@
 
         $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array( 'wp-lists', 'quicktags', 'jquery-query' ), false, 1 );
+        $scripts->set_translations( 'admin-comments' );
         did_action( 'init' ) && $scripts->localize(
             'admin-comments',
-            'adminCommentsL10n',
+            'adminCommentsSettings',
             array(
                 'hotkeys_highlight_first' => isset( $_GET['hotkeys_highlight_first'] ),
                 'hotkeys_highlight_last'  => isset( $_GET['hotkeys_highlight_last'] ),
-                'replyApprove'            => __( 'Approve and Reply' ),
-                'reply'                   => __( 'Reply' ),
-                'warnQuickEdit'           => __( "Are you sure you want to edit this comment?\nThe changes you made will be lost." ),
-                'warnCommentChanges'      => __( "Are you sure you want to do this?\nThe comment changes you made will be lost." ),
-                'docTitleComments'        => __( 'Comments' ),
-                /* translators: %s: Comments count. */
-                'docTitleCommentsCount'   => __( 'Comments (%s)' ),
             )
         );