Ticket #46683: 46683.diff

src/js/_enqueues/admin/site-health.js

@@ -8 +8 @@
 
 jQuery( document ).ready( function( $ ) {
 
+        var __ = wp.i18n.__,
+                _n = wp.i18n._n,
+                sprintf = wp.i18n.sprintf;
+
         var data;
 
         var clipboard = new ClipboardJS( '.site-health-copy-buttons .copy-button' );
@@ -17 +21 @@
                 var $wrapper = $( e.trigger ).closest( 'div' );
                 $( '.success', $wrapper ).addClass( 'visible' );
 
-                wp.a11y.speak( SiteHealth.string.site_info_copied );
+                wp.a11y.speak( __( 'Site information has been added to your clipboard.' ) );
         } );
 
         // Accordion handling in various areas.
@@ -52 +56 @@
         function AppendIssue( issue ) {
                 var template = wp.template( 'health-check-issue' ),
                         issueWrapper = $( '#health-check-issues-' + issue.status ),
-                        issueCounter = $( '.issue-count', issueWrapper );
+                        headline;
 
                 SiteHealth.site_status.issues[ issue.status ]++;
 
-                issueCounter.text( SiteHealth.site_status.issues[ issue.status ] );
+                var count = SiteHealth.site_status.issues[ issue.status ];
+
+                if ( 'critical' === issue.status ) {
+                        headline = sprintf( _n( '%s Critical issue', '%s Critical issues', count ), '<span class="issue-count">' + count + '</span>' );
+                } else if ( 'recommended' === issue.status ) {
+                        headline = sprintf( _n( '%s Recommended improvement', '%s Recommended improvements', count ), '<span class="issue-count">' + count + '</span>' );
+                } else if ( 'good' === issue.status ) {
+                        headline = sprintf( _n( '%s Item with no issues detected', '%s Items with no issues detected', count ), '<span class="issue-count">' + count + '</span>' );
+                }
+
+                if ( headline ) {
+                        $( '> h3', issueWrapper ).html( headline );
+                }
+
                 $( '.issues', '#health-check-issues-' + issue.status ).append( template( issue ) );
         }
 
@@ -127 +144 @@
                         }
                 );
 
-                wp.a11y.speak( SiteHealth.string.site_health_complete_screen_reader.replace( '%s', val + '%' ) );
+                // translators: %s: The percentage score for the tests.
+                var text = __( 'All site health tests have finished running. Your site scored %s, and the results are now available on the page.' );
+                wp.a11y.speak( sprintf( text, val + '%' ) );
         }
 
         /**

src/wp-admin/includes/class-wp-site-health.php

@@ -46 +46 @@
 
                 $health_check_js_variables = array(
                         'screen'      => $screen->id,
-                        'string'      => array(
-                                'please_wait'                        => __( 'Please wait...' ),
-                                'copied'                             => __( 'Copied' ),
-                                'running_tests'                      => __( 'Currently being tested...' ),
-                                'site_health_complete'               => __( 'All site health tests have finished running.' ),
-                                'site_info_show_copy'                => __( 'Show options for copying this information' ),
-                                'site_info_hide_copy'                => __( 'Hide options for copying this information' ),
-                                // translators: %s: The percentage score for the tests.
-                                'site_health_complete_screen_reader' => __( 'All site health tests have finished running. Your site scored %s, and the results are now available on the page.' ),
-                                'site_info_copied'                   => __( 'Site information has been added to your clipboard.' ),
-                        ),
                         'nonce'       => array(
                                 'site_status'        => wp_create_nonce( 'health-check-site-status' ),
                                 'site_status_result' => wp_create_nonce( 'health-check-site-status-result' ),

src/wp-admin/site-health-info.php

@@ -87 +87 @@
         <div class="site-health-copy-buttons">
                 <div class="copy-button-wrapper">
                         <button type="button" class="button button-primary copy-button" data-clipboard-text="<?php echo esc_attr( WP_Debug_Data::format( $info, 'text' ) ); ?>"><?php _e( 'Copy site info to clipboard' ); ?></button>
-                        <span class="success" aria-hidden="true">Copied!</span>
+                        <span class="success" aria-hidden="true"><?php _e( 'Copied!' ); ?></span>
                 </div>
                 <?php if ( $english_info ) : ?>
                         <div class="copy-button-wrapper">
                                 <button type="button" class="button copy-button" data-clipboard-text="<?php echo esc_attr( WP_Debug_Data::format( $english_info, 'text' ) ); ?>"><?php _e( 'Copy site info to clipboard (English)' ); ?></button>
-                                <span class="success" aria-hidden="true">Copied!</span>
+                                <span class="success" aria-hidden="true"><?php _e( 'Copied!' ) ?></span>
                         </div>
                 <?php endif; ?>
         </div>

src/wp-admin/site-health.php

@@ -91 +91 @@
 
                 <div class="site-health-issues-wrapper" id="health-check-issues-critical">
                         <h3>
-                                <span class="issue-count">0</span> <?php _e( 'Critical issues' ); ?>
+                                <span class="issue-count">0</span> <?php echo _n( 'Critical issue', 'Critical issues', 0 ); ?>
                         </h3>
 
                         <div id="health-check-site-status-critical" class="health-check-accordion issues"></div>
@@ -99 +99 @@
 
                 <div class="site-health-issues-wrapper" id="health-check-issues-recommended">
                         <h3>
-                                <span class="issue-count">0</span> <?php _e( 'Recommended improvements' ); ?>
+                                <span class="issue-count">0</span> <?php echo _n( 'Recommended improvement', 'Recommended improvements', 0 ); ?>
                         </h3>
 
                         <div id="health-check-site-status-recommended" class="health-check-accordion issues"></div>

src/wp-includes/script-loader.php

@@ -1690 +1690 @@
                         )
                 );
 
-                $scripts->add( 'site-health', "/wp-admin/js/site-health$suffix.js", array( 'clipboard', 'jquery', 'wp-util', 'wp-a11y' ), false, 1 );
+                $scripts->add( 'site-health', "/wp-admin/js/site-health$suffix.js", array( 'clipboard', 'jquery', 'wp-util', 'wp-a11y', 'wp-i18n' ), false, 1 );
 
                 $scripts->add( 'updates', "/wp-admin/js/updates$suffix.js", array( 'jquery', 'wp-util', 'wp-a11y' ), false, 1 );
                 did_action( 'init' ) && $scripts->localize(