From ff5671101665892f54fd75db3716fd8c1ca6e671 Mon Sep 17 00:00:00 2001
From: xjm <xjm@65776.no-reply.drupal.org>
Date: Fri, 29 Sep 2023 19:10:20 -0500
Subject: [PATCH] Revert "Issue #3364773 by roshnichordiya, Chris Matthews,
thakurnishant_06, quietone, xjm, yoroy: Make help text consistent on entity
bundle forms (Content/Comment/Media/Block)"
This reverts commit 482d7992b2388a0d1374d07feb92bf4ed309c50a.
---
core/modules/block_content/src/BlockContentTypeForm.php | 5 ++---
core/modules/comment/src/CommentTypeForm.php | 6 ++----
core/modules/media/src/MediaTypeForm.php | 6 +++---
core/modules/node/src/NodeTypeForm.php | 6 +++---
4 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/core/modules/block_content/src/BlockContentTypeForm.php b/core/modules/block_content/src/BlockContentTypeForm.php
index 6044917f16b3..2124518ddbfc 100644
--- a/core/modules/block_content/src/BlockContentTypeForm.php
+++ b/core/modules/block_content/src/BlockContentTypeForm.php
@@ -35,7 +35,7 @@ public function form(array $form, FormStateInterface $form_state) {
'#title' => $this->t('Label'),
'#maxlength' => 255,
'#default_value' => $block_type->label(),
- '#description' => $this->t("The human-readable name for this block type, displayed on the <em>Block types</em> page."),
+ '#description' => $this->t("Provide a label for this block type to help identify it in the administration pages."),
'#required' => TRUE,
];
$form['id'] = [
@@ -44,14 +44,13 @@ public function form(array $form, FormStateInterface $form_state) {
'#machine_name' => [
'exists' => '\Drupal\block_content\Entity\BlockContentType::load',
],
- '#description' => $this->t("Unique machine-readable name: lowercase letters, numbers, and underscores only."),
'#maxlength' => EntityTypeInterface::BUNDLE_MAX_LENGTH,
];
$form['description'] = [
'#type' => 'textarea',
'#default_value' => $block_type->getDescription(),
- '#description' => $this->t('Displays on the <em>Block types</em> page.'),
+ '#description' => $this->t('Enter a description for this block type.'),
'#title' => $this->t('Description'),
];
diff --git a/core/modules/comment/src/CommentTypeForm.php b/core/modules/comment/src/CommentTypeForm.php
index c4cea6f51e7a..37b1bf973b62 100644
--- a/core/modules/comment/src/CommentTypeForm.php
+++ b/core/modules/comment/src/CommentTypeForm.php
@@ -3,8 +3,8 @@
namespace Drupal\comment;
use Drupal\Core\Entity\EntityForm;
-use Drupal\Core\Entity\EntityTypeInterface;
use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Entity\EntityTypeInterface;
use Drupal\Core\Entity\FieldableEntityInterface;
use Drupal\Core\Form\FormStateInterface;
use Drupal\language\Entity\ContentLanguageSettings;
@@ -79,7 +79,6 @@ public function form(array $form, FormStateInterface $form_state) {
'#title' => $this->t('Label'),
'#maxlength' => 255,
'#default_value' => $comment_type->label(),
- '#description' => $this->t('The human-readable name for this comment type, displayed on the <em>Comment types</em> page.'),
'#required' => TRUE,
];
$form['id'] = [
@@ -88,7 +87,6 @@ public function form(array $form, FormStateInterface $form_state) {
'#machine_name' => [
'exists' => '\Drupal\comment\Entity\CommentType::load',
],
- '#description' => $this->t('Unique machine-readable name: lowercase letters, numbers, and underscores only.'),
'#maxlength' => EntityTypeInterface::BUNDLE_MAX_LENGTH,
'#disabled' => !$comment_type->isNew(),
];
@@ -96,7 +94,7 @@ public function form(array $form, FormStateInterface $form_state) {
$form['description'] = [
'#type' => 'textarea',
'#default_value' => $comment_type->getDescription(),
- '#description' => $this->t('Displays on the <em>Comment types</em> page.'),
+ '#description' => $this->t('Describe this comment type. The text will be displayed on the <em>Comment types</em> administration overview page.'),
'#title' => $this->t('Description'),
];
diff --git a/core/modules/media/src/MediaTypeForm.php b/core/modules/media/src/MediaTypeForm.php
index ee815dd21c37..64adc89cfb29 100644
--- a/core/modules/media/src/MediaTypeForm.php
+++ b/core/modules/media/src/MediaTypeForm.php
@@ -97,7 +97,7 @@ public function form(array $form, FormStateInterface $form_state) {
'#title' => $this->t('Name'),
'#type' => 'textfield',
'#default_value' => $this->entity->label(),
- '#description' => $this->t('The human-readable name for this media type, displayed on the <em>Media types</em> page.'),
+ '#description' => $this->t('The human-readable name of this media type.'),
'#required' => TRUE,
'#size' => 30,
];
@@ -110,14 +110,14 @@ public function form(array $form, FormStateInterface $form_state) {
'#machine_name' => [
'exists' => [MediaType::class, 'load'],
],
- '#description' => $this->t('Unique machine-readable name: lowercase letters, numbers, and underscores only.'),
+ '#description' => $this->t('A unique machine-readable name for this media type.'),
];
$form['description'] = [
'#title' => $this->t('Description'),
'#type' => 'textarea',
'#default_value' => $this->entity->getDescription(),
- '#description' => $this->t('Displays on the <em>Media types</em> page.'),
+ '#description' => $this->t('Describe this media type. The text will be displayed on the <em>Add new media</em> page.'),
];
$plugins = $this->sourceManager->getDefinitions();
diff --git a/core/modules/node/src/NodeTypeForm.php b/core/modules/node/src/NodeTypeForm.php
index 5746739a8f8c..f4742b570f02 100644
--- a/core/modules/node/src/NodeTypeForm.php
+++ b/core/modules/node/src/NodeTypeForm.php
@@ -69,7 +69,7 @@ public function form(array $form, FormStateInterface $form_state) {
'#title' => $this->t('Name'),
'#type' => 'textfield',
'#default_value' => $type->label(),
- '#description' => $this->t('The human-readable name for this content type, displayed on the <em>Content types</em> page.'),
+ '#description' => $this->t('The human-readable name of this content type. This text will be displayed as part of the list on the <em>Add content</em> page. This name must be unique.'),
'#required' => TRUE,
'#size' => 30,
];
@@ -83,7 +83,7 @@ public function form(array $form, FormStateInterface $form_state) {
'exists' => ['Drupal\node\Entity\NodeType', 'load'],
'source' => ['name'],
],
- '#description' => $this->t('Unique machine-readable name: lowercase letters, numbers, and underscores only.', [
+ '#description' => $this->t('A unique machine-readable name for this content type. It must only contain lowercase letters, numbers, and underscores. This name will be used for constructing the URL of the %node-add page.', [
'%node-add' => $this->t('Add content'),
]),
];
@@ -92,7 +92,7 @@ public function form(array $form, FormStateInterface $form_state) {
'#title' => $this->t('Description'),
'#type' => 'textarea',
'#default_value' => $type->getDescription(),
- '#description' => $this->t('Displays on the <em>Content types</em> page.'),
+ '#description' => $this->t('This text will be displayed on the <em>Add new content</em> page.'),
];
$form['additional_settings'] = [
--
GitLab