Changeset 53381 for branches/6.0/src/wp-includes/blocks/comments-title.php

Timestamp:

05/10/2022 04:20:59 PM (3 years ago)

Author:

hellofromTonya

Message:

Editor: Update WordPress packages for 6.0 RC 2.

[53377] Included cherry-picked commits from the Gutenberg plugin that fix bugs discovered after WordPress 6.0 RC 1.

[53378] Includes cherry-picked commit from the Gutenberg plugin that fix a bug discovered just before WordPress 6.0 RC 2.

Props zieladam, ndiego, kebbet, hellofromTonya.
Merges [53377] and [53378] to the 6.0 branch.
Fixes #55567.

Location:

branches/6.0

Files:

• . (modified) (1 prop)
• src/wp-includes/blocks/comments-title.php (modified) (2 diffs)

branches/6.0/src/wp-includes/blocks/comments-title.php

@@ -23 +23 @@
     $show_comments_count = ! empty( $attributes['showCommentsCount'] ) && $attributes['showCommentsCount'];
     $wrapper_attributes  = get_block_wrapper_attributes( array( 'class' => $align_class_name ) );
-    $post_title          = $show_post_title ? sprintf( '"%1$s"', get_the_title() ) : null;
-    $comments_count      = number_format_i18n( get_comments_number() );
-    $tag_name            = 'h2';
+    $comments_count      = get_comments_number();
+    /* translators: %s: Post title. */
+    $post_title = sprintf( __( '“%s”' ), get_the_title() );
+    $tag_name   = 'h2';
     if ( isset( $attributes['level'] ) ) {
         $tag_name = 'h' . $attributes['level'];
@@ -34 +35 @@
     }
 
-    $single_default_comment_label = $show_post_title ? __( 'Response to' ) : __( 'Response' );
     if ( $show_comments_count ) {
-        $single_default_comment_label = $show_post_title ? __( 'One response to' ) : __( 'One response' );
+        if ( $show_post_title ) {
+            if ( '1' === $comments_count ) {
+                /* translators: %s: Post title. */
+                $comments_title = sprintf( __( 'One response to %s' ), $post_title );
+            } else {
+                $comments_title = sprintf(
+                    /* translators: 1: Number of comments, 2: Post title. */
+                    _n(
+                        '%1$s response to %2$s',
+                        '%1$s responses to %2$s',
+                        $comments_count
+                    ),
+                    number_format_i18n( $comments_count ),
+                    $post_title
+                );
+            }
+        } elseif ( '1' === $comments_count ) {
+            $comments_title = __( 'One response' );
+        } else {
+            $comments_title = sprintf(
+                /* translators: %s: Number of comments. */
+                _n( '%s responses', '%s responses', $comments_count ),
+                number_format_i18n( $comments_count )
+            );
+        }
+    } elseif ( $show_post_title ) {
+        if ( '1' === $comments_count ) {
+            /* translators: %s: Post title. */
+            $comments_title = sprintf( __( 'Response to %s' ), $post_title );
+        } else {
+            /* translators: %s: Post title. */
+            $comments_title = sprintf( __( 'Responses to %s' ), $post_title );
+        }
+    } elseif ( '1' === $comments_count ) {
+        $comments_title = __( 'Response' );
+    } else {
+        $comments_title = __( 'Responses' );
     }
-    $single_comment_label = ! empty( $attributes['singleCommentLabel'] ) ? $attributes['singleCommentLabel'] : $single_default_comment_label;
-
-    $multiple_default_comment_label = $show_post_title ? __( 'Responses to' ) : __( 'Responses' );
-    if ( $show_comments_count ) {
-        $multiple_default_comment_label = $show_post_title ? __( 'responses to' ) : __( 'responses' );
-    }
-
-    $multiple_comment_label = ! empty( $attributes['multipleCommentsLabel'] ) ? $attributes['multipleCommentsLabel'] : $multiple_default_comment_label;
-
-    $comments_title = '%1$s %2$s %3$s';
-
-    $comments_title = sprintf(
-        $comments_title,
-        // If there is only one comment, only display the label.
-        '1' !== $comments_count && $show_comments_count ? $comments_count : null,
-        '1' === $comments_count ? $single_comment_label : $multiple_comment_label,
-        $post_title
-    );
 
     return sprintf(