Changeset 45178

Timestamp:

04/12/2019 08:33:48 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Site Health: i18n audit, take 2.

• Use wp.i18n to translate JavaScript strings.
• Use _n() for proper plural forms support.

Props TimothyBlynJacobs, ocean90, afercia.
Fixes #46683.

Location:

trunk/src

Files:

• js/_enqueues/admin/site-health.js (modified) (6 diffs)
• wp-admin/includes/class-wp-site-health.php (modified) (1 diff)
• wp-admin/site-health.php (modified) (2 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

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

@@ -9 +9 @@
 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' );
@@ -18 +22 @@
         $( '.success', $wrapper ).addClass( 'visible' );
 
-        wp.a11y.speak( SiteHealth.string.site_info_copied );
+        wp.a11y.speak( __( 'Site information has been added to your clipboard.' ) );
     } );
 
@@ -53 +57 @@
         var template = wp.template( 'health-check-issue' ),
             issueWrapper = $( '#health-check-issues-' + issue.status ),
-            issueCounter = $( '.issue-count', issueWrapper );
+            heading;
 
         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 ) {
+            heading = sprintf( _n( '%s Critical issue', '%s Critical issues', count ), '<span class="issue-count">' + count + '</span>' );
+        } else if ( 'recommended' === issue.status ) {
+            heading = sprintf( _n( '%s Recommended improvement', '%s Recommended improvements', count ), '<span class="issue-count">' + count + '</span>' );
+        } else if ( 'good' === issue.status ) {
+            heading = sprintf( _n( '%s Item with no issues detected', '%s Items with no issues detected', count ), '<span class="issue-count">' + count + '</span>' );
+        }
+
+        if ( heading ) {
+            $( '> h3', issueWrapper ).html( heading );
+        }
+
         $( '.issues', '#health-check-issues-' + issue.status ).append( template( issue ) );
     }
@@ -129 +146 @@
             );
 
-            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 + '%' ) );
         }
     }
@@ -222 +241 @@
         // After 3 seconds announce that we're still waiting for directory sizes.
         var timeout = window.setTimeout( function() {
-            wp.a11y.speak( SiteHealth.string.please_wait );
+            wp.a11y.speak( __( 'Please wait...' ) );
         }, 3000 );
 
@@ -249 +268 @@
 
                 window.setTimeout( function() {
-                    wp.a11y.speak( SiteHealth.string.site_health_complete );
+                    wp.a11y.speak( __( 'All site health tests have finished running.' ) );
                 }, delay );
             } else {

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

@@ -47 +47 @@
         $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' ),

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

@@ -92 +92 @@
         <div class="site-health-issues-wrapper" id="health-check-issues-critical">
             <h3>
-                <span class="issue-count">0</span> <?php _e( 'Critical issues' ); ?>
+                <?php printf( _n( '%s Critical issue', '%s Critical issues', 0 ), '<span class="issue-count">0</span>' ); ?>
             </h3>
 
@@ -100 +100 @@
         <div class="site-health-issues-wrapper" id="health-check-issues-recommended">
             <h3>
-                <span class="issue-count">0</span> <?php _e( 'Recommended improvements' ); ?>
+                <?php printf( _n( '%s Recommended improvement', '%s Recommended improvements', 0 ), '<span class="issue-count">0</span>' ); ?>
             </h3>
 

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

@@ -1691 +1691 @@
         );
 
-        $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 );