diff --git a/core/modules/node/content_types.inc b/core/modules/node/content_types.inc index e838460..8345647 100644 --- a/core/modules/node/content_types.inc +++ b/core/modules/node/content_types.inc @@ -200,7 +200,7 @@ function node_type_form($form, &$form_state, $type = NULL) { '#default_value' => variable_get('node_options_' . $type->type, array('status', 'promote')), '#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/node.admin.inc b/core/modules/node/node.admin.inc index 139b2d2..e5855fd 100644 --- a/core/modules/node/node.admin.inc +++ b/core/modules/node/node.admin.inc @@ -46,12 +46,12 @@ function node_node_operations() { 'callback arguments' => array('updates' => array('status' => NODE_NOT_PUBLISHED)), ), 'promote' => array( - 'label' => t('Promote selected content to front page'), + 'label' => t('Promote selected content'), 'callback' => 'node_mass_update', 'callback arguments' => array('updates' => array('status' => NODE_PUBLISHED, 'promote' => NODE_PROMOTED)), ), 'demote' => array( - 'label' => t('Demote selected content from front page'), + 'label' => t('Demote selected content'), 'callback' => 'node_mass_update', 'callback arguments' => array('updates' => array('promote' => NODE_NOT_PROMOTED)), ), diff --git a/core/modules/node/node.module b/core/modules/node/node.module index 9d5fe32..4fda1b6 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -32,12 +32,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; @@ -108,7 +108,7 @@ function node_help($path, $arg) { $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' => url('admin/structure/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' => url('admin/structure/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' => url('admin/structure/types/add'), '@field' => url('admin/help/field'))) . '
'; $output .= '
' . t('Administering content') . '
'; @@ -1443,7 +1443,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', ), @@ -1679,7 +1679,7 @@ function node_menu() { $items['admin/structure/types'] = array( 'title' => 'Content types', - 'description' => 'Manage content types, including default status, front page promotion, comment settings, etc.', + 'description' => 'Manage content types, including default status, promotion, comment settings, etc.', 'page callback' => 'node_overview_types', 'access arguments' => array('administer content types'), 'file' => 'content_types.inc', @@ -2396,11 +2396,11 @@ function node_search_validate($form, &$form_state) { function node_form_system_site_information_settings_form_alter(&$form, &$form_state, $form_id) { $form['front_page']['default_nodes_main'] = array( '#type' => 'select', - '#title' => t('Number of posts on front page'), + '#title' => t('Number of promoted posts.'), '#default_value' => config('node.settings')->get('items_per_page'), '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)), '#access' => (config('system.site')->get('page.front') == 'node'), - '#description' => t('The maximum number of posts displayed on overview pages such as the front page.'), + '#description' => t('The maximum number of posts displayed on overview pages.'), ); $form['#submit'][] = 'node_form_system_site_information_settings_form_submit'; } @@ -3184,14 +3184,14 @@ function node_action_info() { ), 'node_promote_action' => array( 'type' => 'node', - 'label' => t('Promote content to front page'), + 'label' => t('Promote content'), 'configurable' => FALSE, 'behavior' => array('changes_property'), 'triggers' => array('node_presave', 'comment_insert', 'comment_update', 'comment_delete'), ), 'node_unpromote_action' => array( 'type' => 'node', - 'label' => t('Remove content from front page'), + 'label' => t('Remove content from the promoted state'), 'configurable' => FALSE, 'behavior' => array('changes_property'), 'triggers' => array('node_presave', 'comment_insert', 'comment_update', 'comment_delete'), @@ -3295,7 +3295,7 @@ function node_make_unsticky_action(EntityInterface $node, $context = array()) { */ function node_promote_action(EntityInterface $node, $context = array()) { $node->promote = NODE_PROMOTED; - watchdog('action', 'Promoted @type %title to front page.', array('@type' => node_get_type_label($node), '%title' => $node->label())); + watchdog('action', 'Promoted @type %title.', array('@type' => node_get_type_label($node), '%title' => $node->label())); } /** @@ -3311,7 +3311,7 @@ function node_promote_action(EntityInterface $node, $context = array()) { */ function node_unpromote_action(EntityInterface $node, $context = array()) { $node->promote = NODE_NOT_PROMOTED; - watchdog('action', 'Removed @type %title from front page.', array('@type' => node_get_type_label($node), '%title' => $node->label())); + watchdog('action', 'Removed @type %title from the promoted state.', array('@type' => node_get_type_label($node), '%title' => $node->label())); } /** diff --git a/core/modules/node/node.pages.inc b/core/modules/node/node.pages.inc index 863babd..d2ac9da 100644 --- a/core/modules/node/node.pages.inc +++ b/core/modules/node/node.pages.inc @@ -181,7 +181,7 @@ function theme_node_preview($variables) { // Do we need to preview trimmed version of post as well as full version? if ($trimmed != $full) { - drupal_set_message(t('The trimmed version of your post shows what your post looks like when promoted to the main page or when exported for syndication. You can insert the delimiter "<!--break-->" (without the quotes) to fine-tune where your post gets split.')); + drupal_set_message(t('The trimmed version of your post shows what your post looks like when promoted or when exported for syndication. You can insert the delimiter "<!--break-->" (without the quotes) to fine-tune where your post gets split.')); $output .= '

' . t('Preview trimmed version') . '

'; $output .= $trimmed; $output .= '

' . t('Preview full version') . '

'; diff --git a/core/modules/node/node.views.inc b/core/modules/node/node.views.inc index 7f19d43..de26658 100644 --- a/core/modules/node/node.views.inc +++ b/core/modules/node/node.views.inc @@ -152,8 +152,8 @@ function node_views_data() { ); $data['node']['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( @@ -162,7 +162,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/templates/node.html.twig b/core/modules/node/templates/node.html.twig index f1e0b5a..a2a9e96 100644 --- a/core/modules/node/templates/node.html.twig +++ b/core/modules/node/templates/node.html.twig @@ -28,7 +28,7 @@ * or "full". * - preview: Nodes in preview mode. * The following are controlled through the node publishing options. - * - promoted: Nodes promoted to the front page. + * - promoted: Nodes with the 'promoted' status. * - sticky: Nodes ordered above other non-sticky nodes in teaser * listings. * - unpublished: Unpublished nodes visible only to administrators. @@ -51,7 +51,7 @@ * - view_mode: View mode; for example, "teaser" or "full". * - teaser: Flag for the teaser state. Will be true if view_mode is 'teaser'. * - page: Flag for the full page state. Will be true if view_mode is 'full'. - * - promote: Flag for front page promotion state. + * - promote: Flag for the 'promoted' status. * - sticky: Flag for sticky post setting. * - status: Flag for published status. * - comment: State of comment settings for the node. diff --git a/core/modules/node/templates/node.tpl.php b/core/modules/node/templates/node.tpl.php index 196d26f..0ae0e62 100644 --- a/core/modules/node/templates/node.tpl.php +++ b/core/modules/node/templates/node.tpl.php @@ -29,7 +29,7 @@ * or "full". * - preview: Nodes in preview mode. * The following are controlled through the node publishing options. - * - promoted: Nodes promoted to the front page. + * - promoted: Nodes with the 'promoted' status. * - sticky: Nodes ordered above other non-sticky nodes in teaser * listings. * - unpublished: Unpublished nodes visible only to administrators. @@ -54,7 +54,7 @@ * - $view_mode: View mode; for example, "teaser" or "full". * - $teaser: Flag for the teaser state (shortcut for $view_mode == 'teaser'). * - $page: Flag for the full page state. - * - $promote: Flag for front page promotion state. + * - $promote: Flag for the 'promoted' status. * - $sticky: Flags for sticky post setting. * - $status: Flag for published status. * - $comment: State of comment settings for the node. diff --git a/core/themes/bartik/templates/node.tpl.php b/core/themes/bartik/templates/node.tpl.php index d32f9ac..3c177a9 100644 --- a/core/themes/bartik/templates/node.tpl.php +++ b/core/themes/bartik/templates/node.tpl.php @@ -29,7 +29,7 @@ * or "full". * - preview: Nodes in preview mode. * The following are controlled through the node publishing options. - * - promoted: Nodes promoted to the front page. + * - promoted: Nodes with the 'promoted' status. * - sticky: Nodes ordered above other non-sticky nodes in teaser * listings. * - unpublished: Unpublished nodes visible only to administrators. @@ -54,7 +54,7 @@ * - $view_mode: View mode; for example, "teaser" or "full". * - $teaser: Flag for the teaser state (shortcut for $view_mode == 'teaser'). * - $page: Flag for the full page state. - * - $promote: Flag for front page promotion state. + * - $promote: Flag for the 'promoted' status. * - $sticky: Flags for sticky post setting. * - $status: Flag for published status. * - $comment: State of comment settings for the node.