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..44c3a92 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: 'Remove 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 dd257b5..371918a 100644 --- a/core/modules/node/config/install/views.view.frontpage.yml +++ b/core/modules/node/config/install/views.view.frontpage.yml @@ -1,7 +1,7 @@ base_field: nid base_table: node core: 8.x -description: 'All content promoted to the front page.' +description: 'All promoted content.' status: true display: default: diff --git a/core/modules/node/config/schema/node.schema.yml b/core/modules/node/config/schema/node.schema.yml index 81e0977..7fb6029 100644 --- a/core/modules/node/config/schema/node.schema.yml +++ b/core/modules/node/config/schema/node.schema.yml @@ -53,7 +53,7 @@ node.settings.node: label: 'Published' promote: type: boolean - label: 'Promoted to front page' + label: 'Promoted' sticky: type: boolean label: 'Sticky at top of lists' diff --git a/core/modules/node/node.menu_links.yml b/core/modules/node/node.menu_links.yml index a197494..4ba4b8a 100644 --- a/core/modules/node/node.menu_links.yml +++ b/core/modules/node/node.menu_links.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 7294dcc..c1002ed 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -42,12 +42,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; @@ -111,7 +111,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') . '
'; @@ -757,7 +757,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/node.views.inc b/core/modules/node/node.views.inc index b4ef77c..8c562e2 100644 --- a/core/modules/node/node.views.inc +++ b/core/modules/node/node.views.inc @@ -158,8 +158,8 @@ function node_views_data() { ); $data['node_field_data']['promote'] = array( - 'title' => t('Promoted to front page status'), - 'help' => t('Whether or not the content is promoted to the front page.'), + 'title' => t('Promoted status'), + 'help' => t('Whether or not the content is promoted.'), 'field' => array( 'id' => 'boolean', 'output formats' => array( @@ -168,7 +168,7 @@ function node_views_data() { ), 'filter' => array( 'id' => 'boolean', - 'label' => t('Promoted to front page status'), + 'label' => t('Promoted status'), 'type' => 'yes-no', ), 'sort' => array( diff --git a/core/modules/node/src/Entity/Node.php b/core/modules/node/src/Entity/Node.php index 90ab790..2555400 100644 --- a/core/modules/node/src/Entity/Node.php +++ b/core/modules/node/src/Entity/Node.php @@ -397,7 +397,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) { $fields['promote'] = FieldDefinition::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); diff --git a/core/modules/node/src/NodeForm.php b/core/modules/node/src/NodeForm.php index 9e3dafc..0e7daa7 100644 --- a/core/modules/node/src/NodeForm.php +++ b/core/modules/node/src/NodeForm.php @@ -190,7 +190,7 @@ public function form(array $form, array &$form_state) { $form['promote'] = array( '#type' => 'checkbox', - '#title' => t('Promoted to front page'), + '#title' => t('Mark as Promoted'), '#default_value' => $node->isPromoted(), '#group' => 'options', '#access' => user_access('administer nodes'), diff --git a/core/modules/node/src/NodeTypeForm.php b/core/modules/node/src/NodeTypeForm.php index ec00d50..5a6b1f9 100644 --- a/core/modules/node/src/NodeTypeForm.php +++ b/core/modules/node/src/NodeTypeForm.php @@ -111,7 +111,7 @@ public function form(array $form, array &$form_state) { '#default_value' => $node_settings['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/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 af0b2d1..135777d 100644 --- a/core/modules/node/src/Tests/Views/BulkFormTest.php +++ b/core/modules/node/src/Tests/Views/BulkFormTest.php @@ -85,10 +85,10 @@ public function testBulkForm() { $node = entity_load('node', $node->id(), TRUE); $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', @@ -97,9 +97,9 @@ public function testBulkForm() { // Re-load the node and check the status and promoted flag. $node = entity_load('node', $node->id(), TRUE); $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 c80eecb..9ce93ce 100644 --- a/core/modules/node/templates/node.html.twig +++ b/core/modules/node/templates/node.html.twig @@ -11,7 +11,7 @@ * - createdtime: Formatted creation date. Preprocess functions can * reformat it by calling format_date() with the desired parameters on * $variables['node']->getCreatedTime(). - * - promoted: Whether the node is promoted to the front page. + * - promoted: Whether the node is promoted. * - sticky: Whether the node is 'sticky'. Sticky nodes are ordered above * other non-sticky nodes in teaser listings * - published: Whether the node is published. @@ -41,7 +41,7 @@ * full: "node--view-mode-full". * - node--preview: Whether a node is in preview mode. * 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/themes/bartik/templates/node.html.twig b/core/themes/bartik/templates/node.html.twig index d45b0f0..168a902 100644 --- a/core/themes/bartik/templates/node.html.twig +++ b/core/themes/bartik/templates/node.html.twig @@ -11,7 +11,7 @@ * - createdtime: Formatted creation date. Preprocess functions can * reformat it by calling format_date() with the desired parameters on * $variables['node']->getCreatedTime(). - * - promoted: Whether the node is promoted to the front page. + * - promoted: Whether the node is promoted. * - sticky: Whether the node is 'sticky'. Sticky nodes are ordered above * other non-sticky nodes in teaser listings * - published: Whether the node is published. @@ -41,7 +41,7 @@ * and full: "node--view-mode-full". * - is-preview: Whether a node is in preview mode. * 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