Comments Title: Make non-editable

docs/reference-guides/core-blocks.md

@@ -222,7 +222,7 @@ Displays a title with the number of comments ([Source](https://github.com/WordPr
 - **Name:** core/comments-title
 - **Category:** theme
 - **Supports:** align, color (background, gradients, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~anchor~~, ~~html~~
-- **Attributes:** level, multipleCommentsLabel, showCommentsCount, showPostTitle, singleCommentLabel, textAlign
+- **Attributes:** level, showCommentsCount, showPostTitle, textAlign
 
 ## Cover
 

packages/block-library/src/comments-title/block.json

@@ -12,12 +12,6 @@
  "textAlign": {
  "type": "string"
  },
- "singleCommentLabel": {
- "type": "string"
- },
- "multipleCommentsLabel": {
- "type": "string"
- },
  "showPostTitle": {
  "type": "boolean",
  "default": true

packages/block-library/src/comments-title/deprecated.js

@@ -0,0 +1,34 @@
+/**
+ * Internal dependencies
+ */
+import metadata from './block.json';
+
+const { attributes, supports } = metadata;
+
+export default [
+ {
+ attributes: {
+ ...attributes,
+ singleCommentLabel: {
+ type: 'string',
+ },
+ multipleCommentsLabel: {
+ type: 'string',
+ },
+ },
+ supports,
+ migrate: ( oldAttributes ) => {
+ /* eslint-disable no-unused-vars */
+ const {
+ singleCommentLabel,
+ multipleCommentsLabel,
+ ...newAttributes
+ } = oldAttributes;
+ /* eslint-enable no-unused-vars */
+ return newAttributes;
+ },
+ isEligible: ( { multipleCommentsLabel, singleCommentLabel } ) =>
+ multipleCommentsLabel || singleCommentLabel,
+ save: () => null,
+ },
+];

packages/block-library/src/comments-title/edit.js

@@ -10,17 +10,11 @@ import {
  AlignmentControl,
  BlockControls,
  useBlockProps,
- PlainText,
  InspectorControls,
 } from '@wordpress/block-editor';
-import { __ } from '@wordpress/i18n';
+import { __, _n, sprintf } from '@wordpress/i18n';
 import { useEntityProp } from '@wordpress/core-data';
-import {
- PanelBody,
- ToggleControl,
- __experimentalToggleGroupControl as ToggleGroupControl,
- __experimentalToggleGroupControlOption as ToggleGroupControlOption,
-} from '@wordpress/components';
+import { PanelBody, ToggleControl } from '@wordpress/components';
 import { useState, useEffect } from '@wordpress/element';
 import apiFetch from '@wordpress/api-fetch';
 import { addQueryArgs } from '@wordpress/url';
@@ -31,20 +25,12 @@ import { addQueryArgs } from '@wordpress/url';
 import HeadingLevelDropdown from '../heading/heading-level-dropdown';
 
 export default function Edit( {
- attributes: {
- textAlign,
- singleCommentLabel,
- multipleCommentsLabel,
- showPostTitle,
- showCommentsCount,
- level,
- },
+ attributes: { textAlign, showPostTitle, showCommentsCount, level },
  setAttributes,
  context: { postType, postId },
 } ) {
  const TagName = 'h' + level;
  const [ commentsCount, setCommentsCount ] = useState();
- const [ editingMode, setEditingMode ] = useState( 'plural' );
  const [ rawTitle ] = useEntityProp( 'postType', postType, 'title', postId );
  const isSiteEditor = typeof postId === 'undefined';
  const blockProps = useBlockProps( {
@@ -100,22 +86,6 @@ export default function Edit( {
  const inspectorControls = (
  <InspectorControls>
  <PanelBody title={ __( 'Settings' ) }>
- { isSiteEditor && (
- <ToggleGroupControl
- label={ __( 'Editing mode' ) }
- onChange={ setEditingMode }
- value={ editingMode }
- >
- <ToggleGroupControlOption
- label={ __( 'Singular' ) }
- value="singular"
- />
- <ToggleGroupControlOption
- label={ __( 'Plural' ) }
- value="plural"
- />
- </ToggleGroupControl>
- ) }
  <ToggleControl
  label={ __( 'Show post title' ) }
  checked={ showPostTitle }
@@ -136,78 +106,52 @@ export default function Edit( {
 
  const postTitle = isSiteEditor ? __( '"Post Title"' ) : `"${ rawTitle }"`;
 
- const singlePlaceholder = showPostTitle
- ? __( 'One response to ' )
- : __( 'One response' );
-
- const singlePlaceholderNoCount = showPostTitle
- ? __( 'Response to ' )
- : __( 'Response' );
-
- const multiplePlaceholder = showPostTitle
- ? __( 'responses to ' )
- : __( 'responses' );
-
- const multiplePlaceholderNoCount = showPostTitle
- ? __( 'Responses to ' )
- : __( 'Responses' );
+ let placeholder;
+ if ( showCommentsCount && commentsCount !== undefined ) {
+ if ( showPostTitle ) {
+ if ( commentsCount === 1 ) {
+ /* translators: %s: Post title. */
+ placeholder = sprintf( __( 'One response to %s' ), postTitle );
+ } else {
+ placeholder = sprintf(
+ /* translators: 1: Number of comments, 2: Post title. */
+ _n(
+ '%1$s response to %2$s',
+ '%1$s responses to %2$s',
+ commentsCount
+ ),
+ commentsCount,
+ postTitle
+ );
+ }
+ } else if ( commentsCount === 1 ) {
+ placeholder = __( 'One response' );
+ } else {
+ placeholder = sprintf(
+ /* translators: %s: Number of comments. */
+ _n( '%s responses', '%s responses', commentsCount ),
+ commentsCount
+ );
+ }
+ } else if ( showPostTitle ) {
+ if ( commentsCount === 1 ) {
+ /* translators: %s: Post title. */
+ placeholder = sprintf( __( 'Response to %s' ), postTitle );
+ } else {
+ /* translators: %s: Post title. */
+ placeholder = sprintf( __( 'Responses to %s' ), postTitle );
+ }
+ } else if ( commentsCount === 1 ) {
+ placeholder = __( 'Response' );
+ } else {
+ placeholder = __( 'Responses' );
+ }
 
  return (
  <>
  { blockControls }
  { inspectorControls }
- <TagName { ...blockProps }>
- { editingMode === 'singular' || commentsCount === 1 ? (
- <>
- <PlainText
- __experimentalVersion={ 2 }
- tagName="span"
- aria-label={
- showCommentsCount
- ? singlePlaceholder
- : singlePlaceholderNoCount
- }
- placeholder={
- showCommentsCount
- ? singlePlaceholder
- : singlePlaceholderNoCount
- }
- value={ singleCommentLabel }
- onChange={ ( newLabel ) =>
- setAttributes( {
- singleCommentLabel: newLabel,
- } )
- }
- />
- { showPostTitle ? postTitle : null }
- </>
- ) : (
- <>
- { showCommentsCount ? commentsCount : null }
- <PlainText
- __experimentalVersion={ 2 }
- tagName="span"
- aria-label={
- showCommentsCount
- ? ` ${ multiplePlaceholder }`
- : multiplePlaceholderNoCount
- }
- placeholder={
- showCommentsCount
- ? ` ${ multiplePlaceholder }`
- : multiplePlaceholderNoCount
- }
- value={ multipleCommentsLabel }
- onChange={ ( newLabel ) =>
- setAttributes( {
- multipleCommentsLabel: newLabel,
- } )
- }
- />
- { showPostTitle ? postTitle : null }
- </>
- ) }
- </TagName>
+ <TagName { ...blockProps }>{ placeholder }</TagName>
  </>
  );
 }

packages/block-library/src/comments-title/index.js

@@ -8,11 +8,13 @@ import { commentTitle as icon } from '@wordpress/icons';
  */
 import metadata from './block.json';
 import edit from './edit';
+import deprecated from './deprecated';
 
 const { name } = metadata;
 export { metadata, name };
 
 export const settings = {
  icon,
  edit,
+ deprecated,
 };

packages/block-library/src/comments-title/index.php

@@ -22,8 +22,8 @@ function render_block_core_comments_title( $attributes ) {
  $show_post_title = ! empty( $attributes['showPostTitle'] ) && $attributes['showPostTitle'];
  $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() );
+ $comments_count = get_comments_number();
+ $post_title  = '“' . get_the_title() . '”';
  $tag_name = 'h2';
  if ( isset( $attributes['level'] ) ) {
  $tag_name = 'h' . $attributes['level'];
@@ -33,28 +33,45 @@ function render_block_core_comments_title( $attributes ) {
  return;
  }
 
- $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(
  '<%1$s id="comments" %2$s>%3$s</%1$s>',

test/integration/fixtures/blocks/core__comments-title__deprecated-v1.html

@@ -0,0 +1 @@
+<!-- wp:comments-title {"textAlign":"center","singleCommentLabel":"One reply to ","multipleCommentsLabel":" replies to ","level":4} /-->

test/integration/fixtures/blocks/core__comments-title__deprecated-v1.json

@@ -0,0 +1,13 @@
+[
+ {
+ "name": "core/comments-title",
+ "isValid": true,
+ "attributes": {
+ "textAlign": "center",
+ "showPostTitle": true,
+ "showCommentsCount": true,
+ "level": 4
+ },
+ "innerBlocks": []
+ }
+]

test/integration/fixtures/blocks/core__comments-title__deprecated-v1.parsed.json

@@ -0,0 +1,14 @@
+[
+ {
+ "blockName": "core/comments-title",
+ "attrs": {
+ "textAlign": "center",
+ "singleCommentLabel": "One reply to ",
+ "multipleCommentsLabel": " replies to ",
+ "level": 4
+ },
+ "innerBlocks": [],
+ "innerHTML": "",
+ "innerContent": []
+ }
+]

test/integration/fixtures/blocks/core__comments-title__deprecated-v1.serialized.html

@@ -0,0 +1 @@
+<!-- wp:comments-title {"textAlign":"center","level":4} /-->