diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module index 1fb502756581ad863f5538aaeafe6a36de9073a1..80edea98f9ca9fdcb83fecc9870605b70b004998 100644 --- a/core/modules/aggregator/aggregator.module +++ b/core/modules/aggregator/aggregator.module @@ -33,21 +33,21 @@ function aggregator_help($route_name, Request $request) { $output .= '
' . t('OPML integration') . '
'; $output .= '
' . t('A machine-readable OPML file of all feeds is available. OPML is an XML-based file format used to share outline-structured information such as a list of RSS feeds. Feeds can also be imported via an OPML file.', array('!aggregator-opml' => \Drupal::url('aggregator.opml_page'), '!import-opml' => \Drupal::url('aggregator.opml_add'))) . '
'; $output .= '
' . t('Configuring cron') . '
'; - $output .= '
' . t('A correctly configured cron maintenance task is required to update feeds automatically.', array('!cron' => \Drupal::url('system.cron_settings'))) . '
'; + $output .= '
' . t('A working cron maintenance task is required to update feeds automatically.', array('!cron' => \Drupal::url('system.cron_settings'))) . '
'; $output .= ''; return $output; case 'aggregator.admin_overview': // Don't use placeholders for possibility to change URLs for translators. - $output = '

' . t('Thousands of sites (particularly news sites and blogs) publish their latest headlines and posts in feeds, using a number of standardized XML-based formats. Formats supported by the aggregator include RSS, RDF, and Atom.') . '

'; - $output .= '

' . t('Current feeds are listed below, and new feeds may be added. At the blocks administration page you can enable for each feed the block Aggregator feed that contains the latest items .', array('!addfeed' => \Drupal::url('aggregator.feed_add'), '!block' => \Drupal::url('block.admin_display'))) . '

'; + $output = '

' . t('Many sites publish their headlines and posts in feeds, using a number of standardized XML-based formats. The aggregator supports RSS, RDF, and Atom.') . '

'; + $output .= '

' . t('Current feeds are listed below, and new feeds may be added. For each feed, the latest items block may be enabled at the blocks administration page.', array('!addfeed' => \Drupal::url('aggregator.feed_add'), '!block' => \Drupal::url('block.admin_display'))) . '

'; return $output; case 'aggregator.feed_add': return '

' . t('Add a feed in RSS, RDF or Atom format. A feed may only have one entry.') . '

'; case 'aggregator.opml_add': - return '

' . t('OPML is an XML format used to exchange multiple feeds between aggregators. A single OPML document may contain a collection of many feeds. Drupal can parse such a file and import all feeds at once, saving you the effort of adding them manually. You may either upload a local file from your computer or enter a URL where Drupal can download it.') . '

'; + return '

' . t('OPML is an XML format for exchanging feeds between aggregators. A single OPML document may contain many feeds. Aggregator uses this file to import all feeds at once. Upload a file from your computer or enter a URL where the OPML file can be downloaded.') . '

'; } } diff --git a/core/modules/aggregator/src/Form/OpmlFeedAdd.php b/core/modules/aggregator/src/Form/OpmlFeedAdd.php index 61487756b27ac1c9b5d699df207a3a53a39fa9aa..f77c7cb962ef03d4844cb1a946f90e04b0a5bd03 100644 --- a/core/modules/aggregator/src/Form/OpmlFeedAdd.php +++ b/core/modules/aggregator/src/Form/OpmlFeedAdd.php @@ -105,7 +105,7 @@ public function validateForm(array &$form, array &$form_state) { // If both fields are empty or filled, cancel. $file_upload = $this->getRequest()->files->get('files[upload]', NULL, TRUE); if (empty($form_state['values']['remote']) == empty($file_upload)) { - $this->setFormError('remote', $form_state, $this->t('You must either upload a file or enter a URL.')); + $this->setFormError('remote', $form_state, $this->t('Either upload a file or enter a URL.')); } } diff --git a/core/modules/aggregator/src/Tests/ImportOpmlTest.php b/core/modules/aggregator/src/Tests/ImportOpmlTest.php index e826d8131bf53bb8ca66cbc32565626b8f422030..4f5fc9cfee257ecd47609642c36a1d1827f18fab 100644 --- a/core/modules/aggregator/src/Tests/ImportOpmlTest.php +++ b/core/modules/aggregator/src/Tests/ImportOpmlTest.php @@ -42,7 +42,7 @@ function openImportForm() { $this->drupalPlaceBlock('system_help_block', array('region' => 'help')); $this->drupalGet('admin/config/services/aggregator/add/opml'); - $this->assertText('A single OPML document may contain a collection of many feeds.', 'Found OPML help text.'); + $this->assertText('A single OPML document may contain many feeds.', 'Found OPML help text.'); $this->assertField('files[upload]', 'Found file upload field.'); $this->assertField('remote', 'Found Remote URL field.'); $this->assertField('refresh', '', 'Found Refresh field.'); @@ -56,7 +56,7 @@ function validateImportFormFields() { $edit = array(); $this->drupalPostForm('admin/config/services/aggregator/add/opml', $edit, t('Import')); - $this->assertRaw(t('You must either upload a file or enter a URL.'), 'Error if no fields are filled.'); + $this->assertRaw(t('Either upload a file or enter a URL.'), 'Error if no fields are filled.'); $path = $this->getEmptyOpml(); $edit = array( @@ -64,7 +64,7 @@ function validateImportFormFields() { 'remote' => file_create_url($path), ); $this->drupalPostForm('admin/config/services/aggregator/add/opml', $edit, t('Import')); - $this->assertRaw(t('You must either upload a file or enter a URL.'), 'Error if both fields are filled.'); + $this->assertRaw(t('Either upload a file or enter a URL.'), 'Error if both fields are filled.'); $edit = array('remote' => 'invalidUrl://empty'); $this->drupalPostForm('admin/config/services/aggregator/add/opml', $edit, t('Import'));