Ticket #26553: 26553.5.diff

src/wp-includes/comment-template.php

@@ -1280 +1280 @@
         global $wpcommentspopupfile, $wpcommentsjavascript;
 
         $id = get_the_ID();
-        $span = '<span class="screen-reader-text">';
         $title = get_the_title();
-        $span_close = '</span>';
-
         $number = get_comments_number( $id );
 
         if ( false === $zero ) {
-                /* translators: 1: Opening span tag with a class, 2: post title, 3: closing span tag */
-                $zero = sprintf( __( 'No Comments%1$s on %2$s%3$s' ), $span, $title, $span_close );
+                /* translators: %s: post title */
+                $zero = sprintf( __( 'No Comments<span class="screen-reader-text"> on %s</span>' ), $title );
         }
+
         if ( false === $one ) {
-                /* translators: 1: Opening span tag with a class, 2: post title, 3: closing span tag */
-                $one = sprintf( __( '1 Comment%1$s on %2$s%3$s' ), $span, $title, $span_close );
+                /* translators: %s: post title */
+                $one = sprintf( __( '1 Comment<span class="screen-reader-text"> on %s</span>' ), $title );
         }
+
         if ( false === $more ) {
-                /* translators: 1: Opening span tag with a class, 2: post title, 3: closing span tag, 4: number of comments */
-                $more = sprintf( _n( '%4$s Comment%1$s on %2$s%3$s', '%4$s Comments%1$s on %2$s%3$s', $number ),
-                        $span, $title, $span_close, number_format_i18n( $number )
-                );
+                /* translators: 1: Number of comments 2: post title */
+                $more = _n( '%1$s Comment<span class="screen-reader-text"> on %2$s</span>', '%1$s Comments<span class="screen-reader-text"> on %2$s</span>', $number );
+                $more = sprintf( $more, number_format_i18n( $number ), $title );
         }
+
         if ( false === $none ) {
-                /* translators: 1: Opening span tag with a class, 2: post title, 3: closing span tag */
-                $none = sprintf( __( 'Comments Off%1$s on %2$s%3$s' ), $span, $title, $span_close );
+                /* translators: %s: post title */
+                $none = sprintf( __( 'Comments Off<span class="screen-reader-text"> on %s</span>' ), $title );
         }
 
         if ( 0 == $number && !comments_open() && !pings_open() ) {