Commit 329a886c authored by Dries's avatar Dries

- Patch #639434 by dereine, heather, Bojhan, justinrandell: clean up error messages.

parent 49af6f98
......@@ -432,7 +432,7 @@ function update_cache_clear_submit($form, &$form_state) {
*/
function _update_no_data() {
$destination = drupal_get_destination();
return t('No information is available about potential new releases for currently installed modules and themes. To check for updates, you may need to <a href="@run_cron">run cron</a> or you can <a href="@check_manually">check manually</a>. Please note that checking for available updates can take a long time, so please be patient.', array(
return t('No update information available. <a href="@run_cron">Run cron</a> or <a href="@check_manually">check manually</a>.', array(
'@run_cron' => url('admin/reports/status/run-cron', array('query' => $destination)),
'@check_manually' => url('admin/reports/updates/check', array('query' => $destination)),
));
......@@ -663,10 +663,10 @@ function _update_message_text($msg_type, $msg_reason, $report_link = FALSE, $lan
case UPDATE_NOT_FETCHED:
case UPDATE_FETCH_PENDING:
if ($msg_type == 'core') {
$text = t('There was a problem determining the status of available updates for your version of Drupal.', array(), array('langcode' => $langcode));
$text = t('There was a problem checking <a href="@update-report">available updates</a> for Drupal.', array('@update-report' => url('admin/reports/updates')), array('langcode' => $langcode));
}
else {
$text = t('There was a problem determining the status of available updates for one or more of your modules or themes.', array(), array('langcode' => $langcode));
$text = t('There was a problem checking <a href="@update-report">available updates</a> for your modules or themes.', array('@update-report' => url('admin/reports/updates')), array('langcode' => $langcode));
}
break;
}
......
......@@ -142,7 +142,7 @@ class UpdateCoreTestCase extends UpdateTestHelper {
variable_set('update_test_xml_map', array('drupal' => '0'));
$this->drupalGet('admin/config/modules');
$this->assertText(t('No information is available about potential new releases for currently installed modules and themes.'));
$this->assertText(t('No update information available.'));
$this->clickLink(t('check manually'));
$this->assertText(t('Checked available update data for one project.'));
$this->assertNoText(t('There are updates available for your version of Drupal.'));
......@@ -159,7 +159,7 @@ class UpdateCoreTestCase extends UpdateTestHelper {
variable_set('update_test_xml_map', array('drupal' => '1'));
$this->drupalGet('admin/config/modules');
$this->assertText(t('No information is available about potential new releases for currently installed modules and themes.'));
$this->assertText(t('No update information available.'));
$this->clickLink(t('check manually'));
$this->assertText(t('Checked available update data for one project.'));
$this->assertText(t('There are updates available for your version of Drupal.'));
......@@ -176,7 +176,7 @@ class UpdateCoreTestCase extends UpdateTestHelper {
variable_set('update_test_xml_map', array('drupal' => '2-sec'));
$this->drupalGet('admin/config/modules');
$this->assertText(t('No information is available about potential new releases for currently installed modules and themes.'));
$this->assertText(t('No update information available.'));
$this->clickLink(t('check manually'));
$this->assertText(t('Checked available update data for one project.'));
$this->assertNoText(t('There are updates available for your version of Drupal.'));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment