diff -u b/core/includes/install.core.inc b/core/includes/install.core.inc --- b/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -1977,21 +1977,18 @@ 'title' => st('Translations directory'), 'value' => st('The translations directory does not exist.'), 'severity' => REQUIREMENT_ERROR, - 'description' => st('You must create a translations directory as part of the installation process. Create the directory %translations_directory and reload this page. Additional information about installing Drupal is available in the INSTALL.txt.', array( - '%translations_directory' => $translations_directory, - '@install_txt' => base_path() . 'core/INSTALL.txt' - )), + 'description' => st('The installer requires that you create a translations directory as part of the installation process. Create the directory %translations_directory . More details about installing Drupal are available in INSTALL.txt.', array('%translations_directory' => $translations_directory, '@install_txt' => base_path() . 'core/INSTALL.txt')), ); } else { $requirements['translations directory exists'] = array( 'title' => st('Translations directory'), - 'value' => st('The directory %translations_directory exists.', array('%translations_directory' => $translations_directory)), + 'value' => st('The diretory %translations_directory exists.', array('%translations_directory' => $translations_directory)), ); // If the translations directory is not readable, throw an error. if (!$readable) { $requirements['translations directory readable'] = array( - 'title' => st('Translations directory'), + 'title' => st('Translations directory'), 'value' => st('The translations directory is not readable.'), 'severity' => REQUIREMENT_ERROR, 'description' => st('The installer requires read permissions to %translations_directory at all times. If you are unsure how to grant file permissions, consult the online handbook.', array('%translations_directory' => $translations_directory, '@handbook_url' => 'http://drupal.org/server-permissions')), @@ -2020,13 +2017,16 @@ 'title' => st('Translations directory'), 'value' => st('The translations directory does not exist.'), 'severity' => REQUIREMENT_ERROR, - 'description' => st('The installer requires that you create a translations directory as part of the installation process. Create the directory %translations_directory . More details about installing Drupal are available in INSTALL.txt.', array('%translations_directory' => $translations_directory, '@install_txt' => base_path() . 'core/INSTALL.txt')), + 'description' => st('You must create a translations directory as part of the installation process. Create the directory %translations_directory and reload this page. Additional information about installing Drupal is available in the INSTALL.txt.', array( + '%translations_directory' => $translations_directory, + '@install_txt' => base_path() . 'core/INSTALL.txt' + )), ); } else { $requirements['translations directory exists'] = array( 'title' => st('Translations directory'), - 'value' => st('The diretory %translations_directory exists.', array('%translations_directory' => $translations_directory)), + 'value' => st('The directory %translations_directory exists.', array('%translations_directory' => $translations_directory)), ); // If the translations directory is not readable, throw an error. if (!$readable) { @@ -2099,11 +2099,7 @@ 'title' => st('Default settings file'), 'value' => st('The default settings file does not exist.'), 'severity' => REQUIREMENT_ERROR, - 'description' => st('You must not modify the %default-file file in any way from the original download. Restore the %default-file file and reload this page. Additional information about installing Drupal is available in the INSTALL.txt.', array( - '@drupal' => drupal_install_profile_distribution_name(), - '%default-file' => $default_settings_file, - '@install_txt' => base_path() . 'core/INSTALL.txt' - )), + 'description' => st('The @drupal installer requires that the %default-file file not be modified in any way from the original download.', array('@drupal' => drupal_install_profile_distribution_name(), '%default-file' => $default_settings_file)), ); } // Otherwise, if settings.php does not exist yet, we can try to copy @@ -2143,7 +2139,11 @@ 'title' => st('Default settings file'), 'value' => st('The default settings file does not exist.'), 'severity' => REQUIREMENT_ERROR, - 'description' => st('The @drupal installer requires that the %default-file file not be modified in any way from the original download.', array('@drupal' => drupal_install_profile_distribution_name(), '%default-file' => $default_settings_file)), + 'description' => st('You must not modify the %default-file file in any way from the original download. Restore the %default-file file and reload this page. Additional information about installing Drupal is available in the INSTALL.txt.', array( + '@drupal' => drupal_install_profile_distribution_name(), + '%default-file' => $default_settings_file, + '@install_txt' => base_path() . 'core/INSTALL.txt' + )), ); } // Otherwise, if settings.php does not exist yet, we can try to copy @@ -2158,11 +2158,7 @@ 'title' => st('Settings file'), 'value' => st('The settings file does not exist.'), 'severity' => REQUIREMENT_ERROR, - 'description' => st('You must create a settings.php file to proceed with the installation. Copy the template settings file %default_settings_file_path to %settings_file_path and reload this page. Additional information about installing Drupal is available in the INSTALL.txt.', array( - '%settings_file_path' => $settings_file, - '%default_settings_file_path' => $default_settings_file, - '@install_txt' => base_path() . 'core/INSTALL.txt' - )), + 'description' => st('The @drupal installer requires that you create a settings file as part of the installation process. Copy the %default_file file to %file. More details about installing Drupal are available in INSTALL.txt.', array('@drupal' => drupal_install_profile_distribution_name(), '%file' => $file, '%default_file' => $default_settings_file, '@install_txt' => base_path() . 'core/INSTALL.txt')), ); } else { @@ -2202,7 +2198,11 @@ 'title' => st('Settings file'), 'value' => st('The settings file does not exist.'), 'severity' => REQUIREMENT_ERROR, - 'description' => st('The @drupal installer requires that you create a settings file as part of the installation process. Copy the %default_file file to %file. More details about installing Drupal are available in INSTALL.txt.', array('@drupal' => drupal_install_profile_distribution_name(), '%file' => $file, '%default_file' => $default_settings_file, '@install_txt' => base_path() . 'core/INSTALL.txt')), + 'description' => st('You must create a settings.php file to proceed with the installation. Copy the template settings file %default_settings_file_path to %settings_file_path and reload this page. Additional information about installing Drupal is available in the INSTALL.txt.', array( + '%settings_file_path' => $settings_file, + '%default_settings_file_path' => $default_settings_file, + '@install_txt' => base_path() . 'core/INSTALL.txt' + )), ); } else { @@ -2236,9 +2236,7 @@ if ($install_state['interactive']) { drupal_set_title(st('Requirements problem')); $status_report = theme('status_report', array('requirements' => $requirements)); - $status_report .= st('Resolve the listed issues to proceed with the installation.', array( - '!url' => request_uri(), - )); + $status_report .= st('Check the messages and try again.', array('!url' => check_url(drupal_requirements_url($severity)))); return $status_report; } else { @@ -2278,7 +2276,9 @@ if ($install_state['interactive']) { drupal_set_title(st('Requirements problem')); $status_report = theme('status_report', array('requirements' => $requirements)); - $status_report .= st('Check the messages and try again.', array('!url' => check_url(drupal_requirements_url($severity)))); + $status_report .= st('Resolve the listed issues to proceed with the installation.', array( + '!url' => request_uri(), + )); return $status_report; } else {