diff --git a/core/modules/book/config/install/core.base_field_override.node.book.promote.yml b/core/modules/book/config/install/core.base_field_override.node.book.promote.yml index 600d04a..00fc6b3 100644 --- a/core/modules/book/config/install/core.base_field_override.node.book.promote.yml +++ b/core/modules/book/config/install/core.base_field_override.node.book.promote.yml @@ -8,7 +8,7 @@ field_name: promote entity_type: node bundle: book label: Promote -description: 'A boolean indicating whether the node should be displayed on the front page.' +description: 'A boolean indicating whether the node should be marked as promoted.' required: false translatable: true default_value: diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php index d15d8f3..2386211 100644 --- a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php +++ b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php @@ -538,7 +538,7 @@ public function testViewsTranslationUI() { $json = Json::decode($response); $this->assertTrue(strpos($json[$ids[0]], t('Translate view')), 'Translate view contextual link added.'); - $description = 'All content promoted to the front page.'; + $description = 'All promoted content.'; $human_readable_name = 'Frontpage'; $display_settings_master = 'Master'; $display_options_master = '(Empty)'; diff --git a/core/modules/file/src/Tests/FileFieldRSSContentTest.php b/core/modules/file/src/Tests/FileFieldRSSContentTest.php index 7f04ac2..46d494c 100644 --- a/core/modules/file/src/Tests/FileFieldRSSContentTest.php +++ b/core/modules/file/src/Tests/FileFieldRSSContentTest.php @@ -52,7 +52,7 @@ function testFileFieldRSSContent() { $edit = array("fields[$field_name][type]" => 'file_rss_enclosure'); $this->drupalPostForm(NULL, $edit, t('Save')); - // Create a new node with a file field set. Promote to frontpage + // Create a new node with a file field set. Promote // needs to be set so this node will appear in the RSS feed. $node = $this->drupalCreateNode(array('type' => $type_name, 'promote' => 1)); $test_file = $this->getTestFile('text'); diff --git a/core/modules/forum/config/install/core.base_field_override.node.forum.promote.yml b/core/modules/forum/config/install/core.base_field_override.node.forum.promote.yml index c265238..15498f5 100644 --- a/core/modules/forum/config/install/core.base_field_override.node.forum.promote.yml +++ b/core/modules/forum/config/install/core.base_field_override.node.forum.promote.yml @@ -9,7 +9,7 @@ field_name: promote entity_type: node bundle: forum label: Promote -description: 'A boolean indicating whether the node should be displayed on the front page.' +description: 'A boolean indicating whether the node should be marked as promoted.' required: false translatable: true default_value: diff --git a/core/modules/migrate_drupal/src/Tests/Dump/Drupal6Node.php b/core/modules/migrate_drupal/src/Tests/Dump/Drupal6Node.php index 47b1330..076f877 100644 --- a/core/modules/migrate_drupal/src/Tests/Dump/Drupal6Node.php +++ b/core/modules/migrate_drupal/src/Tests/Dump/Drupal6Node.php @@ -84,7 +84,7 @@ public function load() { 'default' => 0, ), 'promote' => array( - 'description' => 'Boolean indicating whether the node should be displayed on the front page.', + 'description' => 'Boolean indicating whether the node should be marked as promoted.', 'type' => 'int', 'not null' => TRUE, 'default' => 0, diff --git a/core/modules/node/config/install/system.action.node_promote_action.yml b/core/modules/node/config/install/system.action.node_promote_action.yml index b1b4f05..6f77e41 100644 --- a/core/modules/node/config/install/system.action.node_promote_action.yml +++ b/core/modules/node/config/install/system.action.node_promote_action.yml @@ -1,5 +1,5 @@ id: node_promote_action -label: 'Promote content to front page' +label: 'Promote content' status: true langcode: en type: node diff --git a/core/modules/node/config/install/system.action.node_unpromote_action.yml b/core/modules/node/config/install/system.action.node_unpromote_action.yml index 21c0ae8..272b9c8 100644 --- a/core/modules/node/config/install/system.action.node_unpromote_action.yml +++ b/core/modules/node/config/install/system.action.node_unpromote_action.yml @@ -1,5 +1,5 @@ id: node_unpromote_action -label: 'Remove content from front page' +label: 'Demote content' status: true langcode: en type: node diff --git a/core/modules/node/config/install/views.view.frontpage.yml b/core/modules/node/config/install/views.view.frontpage.yml index 4799f22..fd8eb6a 100644 --- a/core/modules/node/config/install/views.view.frontpage.yml +++ b/core/modules/node/config/install/views.view.frontpage.yml @@ -7,7 +7,7 @@ dependencies: id: frontpage label: Frontpage module: node -description: 'All content promoted to the front page.' +description: 'All promoted content.' tag: default base_table: node base_field: nid diff --git a/core/modules/node/node.links.menu.yml b/core/modules/node/node.links.menu.yml index a197494..4ba4b8a 100644 --- a/core/modules/node/node.links.menu.yml +++ b/core/modules/node/node.links.menu.yml @@ -1,7 +1,7 @@ node.overview_types: title: 'Content types' parent: system.admin_structure - description: 'Manage content types, including default status, front page promotion, comment settings, etc.' + description: 'Manage content types, including default status, promotion, comment settings, etc.' route_name: node.overview_types node.add_page: title: 'Add content' diff --git a/core/modules/node/node.module b/core/modules/node/node.module index 1aa4a2a..9068d02 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -45,12 +45,12 @@ const NODE_PUBLISHED = 1; /** - * Denotes that the node is not promoted to the front page. + * Denotes that the node is not promoted. */ const NODE_NOT_PROMOTED = 0; /** - * Denotes that the node is promoted to the front page. + * Denotes that the node is promoted. */ const NODE_PROMOTED = 1; @@ -90,7 +90,7 @@ function node_help($route_name, RouteMatchInterface $route_match) { $output .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Creating content') . '
'; - $output .= '
' . t('When new content is created, the Node module records basic information about the content, including the author, date of creation, and the Content type. It also manages the publishing options, which define whether or not the content is published, promoted to the front page of the site, and/or sticky at the top of content lists. Default settings can be configured for each type of content on your site.', array('!content-type' => \Drupal::url('node.overview_types'))) . '
'; + $output .= '
' . t('When new content is created, the Node module records basic information about the content, including the author, date of creation, and the Content type. It also manages the publishing options, which define whether or not the content is published, promoted, and/or sticky at the top of content lists. Default settings can be configured for each type of content on your site.', array('!content-type' => \Drupal::url('node.overview_types'))) . '
'; $output .= '
' . t('Creating custom content types') . '
'; $output .= '
' . t('The Node module gives users with the Administer content types permission the ability to create new content types in addition to the default ones already configured. Creating custom content types allows you the flexibility to add fields and configure default settings that suit the differing needs of various site content.', array('!content-new' => \Drupal::url('node.type_add'), '!field' => \Drupal::url('help.page', array('name' => 'field')))) . '
'; $output .= '
' . t('Administering content') . '
'; @@ -658,7 +658,7 @@ function node_ranking() { 'score' => 'n.sticky', ), 'promote' => array( - 'title' => t('Content is promoted to the front page'), + 'title' => t('Content is promoted'), // The promote flag is either 0 or 1, which is automatically normalized. 'score' => 'n.promote', ), diff --git a/core/modules/node/src/Entity/Node.php b/core/modules/node/src/Entity/Node.php index 4b7671f..f867b9c 100644 --- a/core/modules/node/src/Entity/Node.php +++ b/core/modules/node/src/Entity/Node.php @@ -426,7 +426,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) { $fields['promote'] = BaseFieldDefinition::create('boolean') ->setLabel(t('Promote')) - ->setDescription(t('A boolean indicating whether the node should be displayed on the front page.')) + ->setDescription(t('A boolean indicating whether the node should be marked as promoted.')) ->setRevisionable(TRUE) ->setTranslatable(TRUE) ->setDefaultValue(TRUE) diff --git a/core/modules/node/src/NodeTypeForm.php b/core/modules/node/src/NodeTypeForm.php index 9335b1b..1c2ac28 100644 --- a/core/modules/node/src/NodeTypeForm.php +++ b/core/modules/node/src/NodeTypeForm.php @@ -153,7 +153,7 @@ public function form(array $form, FormStateInterface $form_state) { '#default_value' => $workflow_options, '#options' => array( 'status' => t('Published'), - 'promote' => t('Promoted to front page'), + 'promote' => t('Promoted'), 'sticky' => t('Sticky at top of lists'), 'revision' => t('Create new revision'), ), diff --git a/core/modules/node/src/NodeViewsData.php b/core/modules/node/src/NodeViewsData.php index b3df204..a2ce056 100644 --- a/core/modules/node/src/NodeViewsData.php +++ b/core/modules/node/src/NodeViewsData.php @@ -63,7 +63,7 @@ public function getViewsData() { $data['node_field_data']['promote']['field']['output formats'] = [ 'promoted-notpromoted' => array(t('Promoted'), t('Not promoted')), ]; - $data['node_field_data']['promote']['filter']['label'] = t('Promoted to front page status'); + $data['node_field_data']['promote']['filter']['label'] = t('Promoted status'); $data['node_field_data']['promote']['filter']['type'] = 'yes-no'; $data['node_field_data']['sticky']['field']['output formats'] = [ diff --git a/core/modules/node/src/Plugin/Action/DemoteNode.php b/core/modules/node/src/Plugin/Action/DemoteNode.php index e490ecb..71a31d9 100644 --- a/core/modules/node/src/Plugin/Action/DemoteNode.php +++ b/core/modules/node/src/Plugin/Action/DemoteNode.php @@ -14,7 +14,7 @@ * * @Action( * id = "node_unpromote_action", - * label = @Translation("Demote selected content from front page"), + * label = @Translation("Demote selected content"), * type = "node" * ) */ diff --git a/core/modules/node/src/Plugin/Action/PromoteNode.php b/core/modules/node/src/Plugin/Action/PromoteNode.php index 0cfc316..a7d2732 100644 --- a/core/modules/node/src/Plugin/Action/PromoteNode.php +++ b/core/modules/node/src/Plugin/Action/PromoteNode.php @@ -14,7 +14,7 @@ * * @Action( * id = "node_promote_action", - * label = @Translation("Promote selected content to front page"), + * label = @Translation("Promote selected content"), * type = "node" * ) */ diff --git a/core/modules/node/src/Tests/Views/BulkFormTest.php b/core/modules/node/src/Tests/Views/BulkFormTest.php index 7da2042..0123504 100644 --- a/core/modules/node/src/Tests/Views/BulkFormTest.php +++ b/core/modules/node/src/Tests/Views/BulkFormTest.php @@ -87,10 +87,10 @@ public function testBulkForm() { $node = $node_storage->load($node->id()); $this->assertFalse($node->isSticky(), 'Node is not sticky anymore'); - // Promote to front page. + // Promote content. $node->setPublished(FALSE); $node->save(); - $this->assertFalse($node->isPromoted(), 'Node is not promoted to the front page'); + $this->assertFalse($node->isPromoted(), 'Node is not promoted'); $edit = array( 'node_bulk_form[0]' => TRUE, 'action' => 'node_promote_action', @@ -100,9 +100,9 @@ public function testBulkForm() { $node_storage->resetCache(array($node->id())); $node = $node_storage->load($node->id()); $this->assertTrue($node->isPublished(), 'Node has been published'); - $this->assertTrue($node->isPromoted(), 'Node has been promoted to the front page'); + $this->assertTrue($node->isPromoted(), 'Node has been promoted'); - // Demote from front page. + // Demote content. $edit = array( 'node_bulk_form[0]' => TRUE, 'action' => 'node_unpromote_action', diff --git a/core/modules/node/templates/node.html.twig b/core/modules/node/templates/node.html.twig index a78fcb3..eacf93f 100644 --- a/core/modules/node/templates/node.html.twig +++ b/core/modules/node/templates/node.html.twig @@ -34,7 +34,7 @@ * teaser would result in: "node--view-mode-teaser", and * full: "node--view-mode-full". * The following are controlled through the node publishing options. - * - node--promoted: Appears on nodes promoted to the front page. + * - node--promoted: Appears on promoted nodes. * - node--sticky: Appears on nodes ordered above other non-sticky nodes in * teaser listings. * - node--unpublished: Appears on unpublished nodes visible only to site diff --git a/core/profiles/standard/config/install/core.base_field_override.node.page.promote.yml b/core/profiles/standard/config/install/core.base_field_override.node.page.promote.yml index d3a0923..9a0d029 100644 --- a/core/profiles/standard/config/install/core.base_field_override.node.page.promote.yml +++ b/core/profiles/standard/config/install/core.base_field_override.node.page.promote.yml @@ -9,7 +9,7 @@ field_name: promote entity_type: node bundle: page label: Promote -description: 'A boolean indicating whether the node should be displayed on the front page.' +description: 'A boolean indicating whether the node should be marked as promoted.' required: false translatable: true default_value: diff --git a/core/themes/bartik/templates/node.html.twig b/core/themes/bartik/templates/node.html.twig index 2e35f63..9ca9248 100644 --- a/core/themes/bartik/templates/node.html.twig +++ b/core/themes/bartik/templates/node.html.twig @@ -34,7 +34,7 @@ * teaser would result in: "node--view-mode-teaser", and * full: "node--view-mode-full". * The following are controlled through the node publishing options. - * - node--promoted: Appears on nodes promoted to the front page. + * - node--promoted: Appears on promoted nodes. * - node--sticky: Appears on nodes ordered above other non-sticky nodes in * teaser listings. * - node--unpublished: Appears on unpublished nodes visible only to site