From afa38dc2e1599ea01874107459c265cf834aceb1 Mon Sep 17 00:00:00 2001 From: webchick <webchick@24967.no-reply.drupal.org> Date: Tue, 4 Mar 2014 12:27:47 -0800 Subject: [PATCH] Issue #2170425 by miraj9093, sandipmkhairnar, tgeller: Make text consistent: "Add new content" -> "Add content". --- core/modules/forum/forum.module | 2 +- .../node/lib/Drupal/node/NodeTypeFormController.php | 6 +++--- .../lib/Drupal/node/Plugin/views/area/ListingEmpty.php | 2 +- core/modules/system/system.api.php | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module index b1bb1ea4f483..1a55bfea5a12 100644 --- a/core/modules/forum/forum.module +++ b/core/modules/forum/forum.module @@ -33,7 +33,7 @@ function forum_help($path, $arg) { $output .= '<dt>' . t('Setting up forum structure') . '</dt>'; $output .= '<dd>' . t('Visit the <a href="!forums">Forums page</a> to set up containers and forums to hold your discussion topics.', array('!forums' => \Drupal::url('forum.overview'))) . '</dd>'; $output .= '<dt>' . t('Starting a discussion') . '</dt>'; - $output .= '<dd>' . t('The <a href="!create-topic">Forum topic</a> link on the <a href="!content-add">Add new content</a> page creates the first post of a new threaded discussion, or thread.', array('!create-topic' => \Drupal::url('node.add', array('node_type' => 'forum')), '!content-add' => \Drupal::url('node.add_page'))) . '</dd>'; + $output .= '<dd>' . t('The <a href="!create-topic">Forum topic</a> link on the <a href="!content-add">Add content</a> page creates the first post of a new threaded discussion, or thread.', array('!create-topic' => \Drupal::url('node.add', array('node_type' => 'forum')), '!content-add' => \Drupal::url('node.add_page'))) . '</dd>'; $output .= '<dt>' . t('Navigating in the Forum') . '</dt>'; $output .= '<dd>' . t('Enabling the Forum module provides a default <em>Forums</em> menu item in the Tools menu that links to the <a href="!forums">Forums page</a>.', array('!forums' => \Drupal::url('forum.index'))) . '</dd>'; $output .= '<dt>' . t('Moving forum topics') . '</dt>'; diff --git a/core/modules/node/lib/Drupal/node/NodeTypeFormController.php b/core/modules/node/lib/Drupal/node/NodeTypeFormController.php index dda06828fbc9..350e46db25cd 100644 --- a/core/modules/node/lib/Drupal/node/NodeTypeFormController.php +++ b/core/modules/node/lib/Drupal/node/NodeTypeFormController.php @@ -37,7 +37,7 @@ public function form(array $form, array &$form_state) { '#title' => t('Name'), '#type' => 'textfield', '#default_value' => $type->name, - '#description' => t('The human-readable name of this content type. This text will be displayed as part of the list on the <em>Add new content</em> page. It is recommended that this name begin with a capital letter and contain only letters, numbers, and spaces. This name must be unique.'), + '#description' => 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. It is recommended that this name begin with a capital letter and contain only letters, numbers, and spaces. This name must be unique.'), '#required' => TRUE, '#size' => 30, ); @@ -52,7 +52,7 @@ public function form(array $form, array &$form_state) { 'source' => array('name'), ), '#description' => 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, in which underscores will be converted into hyphens.', array( - '%node-add' => t('Add new content'), + '%node-add' => t('Add content'), )), ); @@ -60,7 +60,7 @@ public function form(array $form, array &$form_state) { '#title' => t('Description'), '#type' => 'textarea', '#default_value' => $type->description, - '#description' => t('Describe this content type. The text will be displayed on the <em>Add new content</em> page.'), + '#description' => t('Describe this content type. The text will be displayed on the <em>Add content</em> page.'), ); $form['additional_settings'] = array( diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/area/ListingEmpty.php b/core/modules/node/lib/Drupal/node/Plugin/views/area/ListingEmpty.php index 2d71c21fdd89..4dcf088d1de4 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/area/ListingEmpty.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/area/ListingEmpty.php @@ -68,7 +68,7 @@ public function render($empty = FALSE) { '#links' => array( array( 'href' => 'node/add', - 'title' => $this->t('Add new content'), + 'title' => $this->t('Add content'), ), ), '#access' => $this->accessManager->checkNamedRoute('node.add_page', array(), $account), diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php index 225a4fa5f019..d36f5f3188d8 100644 --- a/core/modules/system/system.api.php +++ b/core/modules/system/system.api.php @@ -549,11 +549,11 @@ function hook_menu_local_tasks(&$data, $route_name) { $data['actions']['node/add'] = array( '#theme' => 'menu_local_action', '#link' => array( - 'title' => t('Add new content'), + 'title' => t('Add content'), 'href' => 'node/add', 'localized_options' => array( 'attributes' => array( - 'title' => t('Add new content'), + 'title' => t('Add content'), ), ), ), @@ -567,7 +567,7 @@ function hook_menu_local_tasks(&$data, $route_name) { 'href' => 'node/add', 'localized_options' => array( 'attributes' => array( - 'title' => t('Add new content'), + 'title' => t('Add content'), ), ), ), @@ -730,7 +730,7 @@ function hook_page_alter(&$page) { // Add help text to the user login block. $page['sidebar_first']['user_login']['help'] = array( '#weight' => -10, - '#markup' => t('To post comments or add new content, you first have to log in.'), + '#markup' => t('To post comments or add content, you first have to log in.'), ); } -- GitLab