From a396f171850c281de26f863e6d1f8158f06164ee Mon Sep 17 00:00:00 2001 From: Nathaniel Catchpole Date: Mon, 29 Aug 2016 21:13:48 +0100 Subject: [PATCH] Issue #202783 by evgeny.chernyavskiy, jrdixey, YesCT, subhojit777, adinac, jeet09, gaurav_varshney, alansaviolobo, Devin Carlson, chetan2111, beanworks, phantomvish: Use a consistent name for the aggregator module throughout core --- core/modules/aggregator/aggregator.links.menu.yml | 4 ++-- core/modules/aggregator/aggregator.module | 6 +++--- core/modules/aggregator/aggregator.routing.yml | 6 +++--- core/modules/aggregator/src/Tests/AggregatorAdminTest.php | 2 +- .../modules/aggregator/src/Tests/FeedAdminDisplayTest.php | 2 +- core/modules/migrate_drupal/tests/fixtures/drupal6.php | 8 ++++---- core/modules/migrate_drupal/tests/fixtures/drupal7.php | 8 ++++---- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/core/modules/aggregator/aggregator.links.menu.yml b/core/modules/aggregator/aggregator.links.menu.yml index dd2735bd1f3..6c966d50876 100644 --- a/core/modules/aggregator/aggregator.links.menu.yml +++ b/core/modules/aggregator/aggregator.links.menu.yml @@ -1,11 +1,11 @@ aggregator.admin_overview: - title: 'Feed aggregator' + title: 'Aggregator' description: 'Add feeds or import OPMLs to gather external content and configure how often they are updated.' route_name: aggregator.admin_overview parent: system.admin_config_services weight: 10 aggregator.page_last: - title: 'Feed aggregator' + title: 'Aggregator' weight: 5 route_name: aggregator.page_last aggregator.feed_add: diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module index 740569947a0..15b735311d5 100644 --- a/core/modules/aggregator/aggregator.module +++ b/core/modules/aggregator/aggregator.module @@ -31,11 +31,11 @@ function aggregator_help($route_name, RouteMatchInterface $route_match) { $output .= '
' . t('Users view feed content in the main aggregator display, or by their source (usually via an RSS feed reader). The most recent content in a feed can be displayed as a block through the Blocks administration page.', array(':aggregator' => \Drupal::url('aggregator.page_last'), ':aggregator-sources' => $url->toString(), ':admin-block' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#')) . '
'; } $output .= '
' . t('Adding, editing, and deleting feeds') . '
'; - $output .= '
' . t('Administrators can add, edit, and delete feeds, and choose how often to check each feed for newly updated items on the Feed aggregator page.', array(':feededit' => \Drupal::url('aggregator.admin_overview'))) . '
'; + $output .= '
' . t('Administrators can add, edit, and delete feeds, and choose how often to check each feed for newly updated items on the Aggregator administration page.', array(':feededit' => \Drupal::url('aggregator.admin_overview'))) . '
'; $output .= '
' . t('Configuring the display of feed items') . '
'; - $output .= '
' . t('Administrators can choose how many items are displayed in the listing pages, which HTML tags are allowed in the content of feed items, and whether they should be trimmed to a maximum number of characters on the Feed aggregator settings page.', array(':settings' => \Drupal::url('aggregator.admin_settings'))) . '
'; + $output .= '
' . t('Administrators can choose how many items are displayed in the listing pages, which HTML tags are allowed in the content of feed items, and whether they should be trimmed to a maximum number of characters on the Aggregator settings page.', array(':settings' => \Drupal::url('aggregator.admin_settings'))) . '
'; $output .= '
' . t('Discarding old feed items') . '
'; - $output .= '
' . t('Administrators can choose whether to discard feed items that are older than a specified period of time on the Feed aggregator settings page. This requires a correctly configured cron maintenance task (see below).', array(':settings' => \Drupal::url('aggregator.admin_settings'))) . '
'; + $output .= '
' . t('Administrators can choose whether to discard feed items that are older than a specified period of time on the Aggregator settings page. This requires a correctly configured cron maintenance task (see below).', array(':settings' => \Drupal::url('aggregator.admin_settings'))) . '
'; $output .= '
' . t('OPML integration') . '
'; // Check if the aggregator opml View is enabled. diff --git a/core/modules/aggregator/aggregator.routing.yml b/core/modules/aggregator/aggregator.routing.yml index 941f6934350..105ab6db0c0 100644 --- a/core/modules/aggregator/aggregator.routing.yml +++ b/core/modules/aggregator/aggregator.routing.yml @@ -2,7 +2,7 @@ aggregator.admin_overview: path: '/admin/config/services/aggregator' defaults: _controller: '\Drupal\aggregator\Controller\AggregatorController::adminOverview' - _title: 'Feed aggregator' + _title: 'Aggregator' requirements: _permission: 'administer news feeds' @@ -10,7 +10,7 @@ aggregator.admin_settings: path: '/admin/config/services/aggregator/settings' defaults: _form: '\Drupal\aggregator\Form\SettingsForm' - _title: 'Feed aggregator settings' + _title: 'Aggregator settings' requirements: _permission: 'administer news feeds' @@ -53,6 +53,6 @@ aggregator.page_last: path: '/aggregator' defaults: _controller: '\Drupal\aggregator\Controller\AggregatorController::pageLast' - _title: 'Feed aggregator' + _title: 'Aggregator' requirements: _permission: 'access news feeds' diff --git a/core/modules/aggregator/src/Tests/AggregatorAdminTest.php b/core/modules/aggregator/src/Tests/AggregatorAdminTest.php index 249817f380e..487e0ef921c 100644 --- a/core/modules/aggregator/src/Tests/AggregatorAdminTest.php +++ b/core/modules/aggregator/src/Tests/AggregatorAdminTest.php @@ -14,7 +14,7 @@ class AggregatorAdminTest extends AggregatorTestBase { */ public function testSettingsPage() { $this->drupalGet('admin/config'); - $this->clickLink('Feed aggregator'); + $this->clickLink('Aggregator'); $this->clickLink('Settings'); // Make sure that test plugins are present. $this->assertText('Test fetcher'); diff --git a/core/modules/aggregator/src/Tests/FeedAdminDisplayTest.php b/core/modules/aggregator/src/Tests/FeedAdminDisplayTest.php index b6e36e9c024..0324e3b9a55 100644 --- a/core/modules/aggregator/src/Tests/FeedAdminDisplayTest.php +++ b/core/modules/aggregator/src/Tests/FeedAdminDisplayTest.php @@ -3,7 +3,7 @@ namespace Drupal\aggregator\Tests; /** - * Tests the display of a feed on the feed aggregator list page. + * Tests the display of a feed on the Aggregator list page. * * @group aggregator */ diff --git a/core/modules/migrate_drupal/tests/fixtures/drupal6.php b/core/modules/migrate_drupal/tests/fixtures/drupal6.php index 347b2f2721b..2e35c319eec 100644 --- a/core/modules/migrate_drupal/tests/fixtures/drupal6.php +++ b/core/modules/migrate_drupal/tests/fixtures/drupal6.php @@ -30975,7 +30975,7 @@ $connection->insert('menu_links') 'plid' => '0', 'link_path' => 'aggregator', 'router_path' => 'aggregator', - 'link_title' => 'Feed aggregator', + 'link_title' => 'Aggregator', 'options' => 'a:0:{}', 'module' => 'system', 'hidden' => '0', @@ -31164,7 +31164,7 @@ $connection->insert('menu_links') 'plid' => '157', 'link_path' => 'admin/content/aggregator', 'router_path' => 'admin/content/aggregator', - 'link_title' => 'Feed aggregator', + 'link_title' => 'Aggregator', 'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:116:\"Configure which content your site aggregates from other sites, how often it polls them, and how they're categorized.\";}}", 'module' => 'system', 'hidden' => '0', @@ -34130,7 +34130,7 @@ $connection->insert('menu_router') 'number_parts' => '3', 'tab_parent' => '', 'tab_root' => 'admin/content/aggregator', - 'title' => 'Feed aggregator', + 'title' => 'Aggregator', 'title_callback' => 't', 'title_arguments' => '', 'type' => '6', @@ -39256,7 +39256,7 @@ $connection->insert('menu_router') 'number_parts' => '1', 'tab_parent' => '', 'tab_root' => 'aggregator', - 'title' => 'Feed aggregator', + 'title' => 'Aggregator', 'title_callback' => 't', 'title_arguments' => '', 'type' => '6', diff --git a/core/modules/migrate_drupal/tests/fixtures/drupal7.php b/core/modules/migrate_drupal/tests/fixtures/drupal7.php index a02d12f57ca..8249c79e857 100644 --- a/core/modules/migrate_drupal/tests/fixtures/drupal7.php +++ b/core/modules/migrate_drupal/tests/fixtures/drupal7.php @@ -16251,7 +16251,7 @@ $connection->insert('menu_links') 'plid' => '0', 'link_path' => 'aggregator', 'router_path' => 'aggregator', - 'link_title' => 'Feed aggregator', + 'link_title' => 'Aggregator', 'options' => 'a:0:{}', 'module' => 'system', 'hidden' => '0', @@ -17601,7 +17601,7 @@ $connection->insert('menu_links') 'plid' => '60', 'link_path' => 'admin/config/services/aggregator', 'router_path' => 'admin/config/services/aggregator', - 'link_title' => 'Feed aggregator', + 'link_title' => 'Aggregator', 'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:116:\"Configure which content your site aggregates from other sites, how often it polls them, and how they're categorized.\";}}", 'module' => 'system', 'hidden' => '0', @@ -21929,7 +21929,7 @@ $connection->insert('menu_router') 'context' => '0', 'tab_parent' => '', 'tab_root' => 'admin/config/services/aggregator', - 'title' => 'Feed aggregator', + 'title' => 'Aggregator', 'title_callback' => 't', 'title_arguments' => '', 'theme_callback' => '', @@ -27329,7 +27329,7 @@ $connection->insert('menu_router') 'context' => '0', 'tab_parent' => '', 'tab_root' => 'aggregator', - 'title' => 'Feed aggregator', + 'title' => 'Aggregator', 'title_callback' => 't', 'title_arguments' => '', 'theme_callback' => '',