Changeset 53329 for trunk/src/wp-includes/blocks/comments-title.php

Timestamp:

05/02/2022 10:36:45 AM (4 years ago)

Author:

gziolo

Message:

Editor: Update WordPress packages for 6.0 Beta 4

Included cherry-picked commits from the Gutenberg plugin that fix bugs discovere after WordPress 6.0 Beta 3.

Props zieladam, ndiego, darerodz.
See #55567.

File:

• trunk/src/wp-includes/blocks/comments-title.php (modified) (3 diffs)

trunk/src/wp-includes/blocks/comments-title.php

@@ -30 +30 @@
     }
 
-    $single_default_comment_label = $show_post_title ? __( 'One response to' ) : __( 'One response' );
-    $single_comment_label         = ! empty( $attributes['singleCommentLabel'] ) ? $attributes['singleCommentLabel'] : $single_default_comment_label;
+    $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' );
+    }
+    $single_comment_label = ! empty( $attributes['singleCommentLabel'] ) ? $attributes['singleCommentLabel'] : $single_default_comment_label;
 
     $multiple_default_comment_label = $show_post_title ? __( 'Responses to' ) : __( 'Responses' );
-    $multiple_comment_label         = ! empty( $attributes['multipleCommentsLabel'] ) ? $attributes['multipleCommentsLabel'] : $multiple_default_comment_label;
+    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';
@@ -54 +61 @@
 }
 
-    /**
-     * Registers the `core/comments-title` block on the server.
-     */
+/**
+ * Registers the `core/comments-title` block on the server.
+ */
 function register_block_core_comments_title() {
     register_block_type_from_metadata(
@@ -66 +73 @@
 }
 
-    add_action( 'init', 'register_block_core_comments_title' );
+add_action( 'init', 'register_block_core_comments_title' );