diff options
Diffstat (limited to 'modules/system')
| -rw-r--r-- | modules/system/system.admin.inc | 8 | ||||
| -rw-r--r-- | modules/system/system.api.php | 2 | ||||
| -rw-r--r-- | modules/system/system.install | 18 | ||||
| -rw-r--r-- | modules/system/system.module | 6 | ||||
| -rw-r--r-- | modules/system/system.tar.inc | 2 | ||||
| -rw-r--r-- | modules/system/system.test | 6 |
6 files changed, 21 insertions, 21 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index 491b2f7a8..bcadbe790 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -1452,7 +1452,7 @@ function system_ip_blocking_form_validate($form, &$form_state) { form_set_error('ip', t('You may not block your own IP address.')); } elseif (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE) == FALSE) { - form_set_error('ip', t('Please enter a valid IP address.')); + form_set_error('ip', t('Enter a valid IP address.')); } } @@ -1659,7 +1659,7 @@ function system_performance_settings() { $disabled = !$is_writable; $disabled_message = ''; if(!$is_writable) { - $disabled_message = ' ' . t('<strong class="error">Please set up the <a href="!file-system">public files directory</a> to make these optimizations available.</strong>', array('!file-system' => url('admin/config/media/file-system'))); + $disabled_message = ' ' . t('<strong class="error">Set up the <a href="!file-system">public files directory</a> to make these optimizations available.</strong>', array('!file-system' => url('admin/config/media/file-system'))); } $form['bandwidth_optimization'] = array( @@ -2102,7 +2102,7 @@ function system_add_date_format_type_form_validate($form, &$form_state) { } $types = system_get_date_types(); if (in_array(trim($form_state['values']['machine_name']), array_keys($types))) { - form_set_error('machine_name', t('This date type already exists. Please enter a unique type.')); + form_set_error('machine_name', t('This date type already exists. Enter a unique type.')); } } } @@ -2809,7 +2809,7 @@ function system_add_date_formats_form_validate($form, &$form_state) { $formats = system_get_date_formats('custom'); $format = trim($form_state['values']['date_format']); if (!empty($formats) && in_array($format, array_keys($formats)) && (!isset($form_state['values']['dfid']) || $form_state['values']['dfid'] != $formats[$format]['dfid'])) { - form_set_error('date_format', t('This format already exists. Please enter a unique format string.')); + form_set_error('date_format', t('This format already exists. Enter a unique format string.')); } } diff --git a/modules/system/system.api.php b/modules/system/system.api.php index 9a77da925..f78556c4c 100644 --- a/modules/system/system.api.php +++ b/modules/system/system.api.php @@ -1844,7 +1844,7 @@ function hook_requirements($phase) { } else { $requirements['cron'] = array( - 'description' => $t('Cron has not run. It appears cron jobs have not been setup on your system. Please check the help pages for <a href="@url">configuring cron jobs</a>.', array('@url' => 'http://drupal.org/cron')), + 'description' => $t('Cron has not run. It appears cron jobs have not been setup on your system. Check the help pages for <a href="@url">configuring cron jobs</a>.', array('@url' => 'http://drupal.org/cron')), 'severity' => REQUIREMENT_ERROR, 'value' => $t('Never run'), ); diff --git a/modules/system/system.install b/modules/system/system.install index a272b4142..b9a3ae2ef 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -66,7 +66,7 @@ function system_requirements($phase) { $requirements['php'] = array( 'title' => $t('PHP'), 'value' => $phpversion, - 'description' => $t('The phpinfo() function has been disabled for security reasons. To see your server\'s phpinfo() information, change your PHP settings or contact your server administrator. For more information, please read the <a href="@phpinfo">Enabling and disabling phpinfo()</a> handbook page.', array('@phpinfo' => 'http://drupal.org/node/243993')), + 'description' => $t('The phpinfo() function has been disabled for security reasons. To see your server\'s phpinfo() information, change your PHP settings or contact your server administrator. For more information, <a href="@phpinfo">Enabling and disabling phpinfo()</a> handbook page.', array('@phpinfo' => 'http://drupal.org/node/243993')), 'severity' => REQUIREMENT_INFO, ); } @@ -241,7 +241,7 @@ function system_requirements($phase) { elseif ($phase == 'install') { // For the installer UI, we need different wording. 'value' will // be treated as version, so provide none there. - $description = $error . $t('An automated attempt to create this directory failed, possibly due to a permissions problem. To proceed with the installation, either create the directory and modify its permissions manually, or ensure that the installer has the permissions to create it automatically. For more information, please see INSTALL.txt or the <a href="@handbook_url">online handbook</a>.', array('@handbook_url' => 'http://drupal.org/server-permissions')); + $description = $error . $t('An automated attempt to create this directory failed, possibly due to a permissions problem. To proceed with the installation, either create the directory and modify its permissions manually or ensure that the installer has the permissions to create it automatically. For more information, see INSTALL.txt or the <a href="@handbook_url">online handbook</a>.', array('@handbook_url' => 'http://drupal.org/server-permissions')); $requirements['file system']['value'] = ''; } if (!empty($description)) { @@ -320,7 +320,7 @@ function system_requirements($phase) { $requirements['update status'] = array( 'value' => $t('Not enabled'), 'severity' => REQUIREMENT_WARNING, - 'description' => $t('Update notifications are not enabled. It is <strong>highly recommended</strong> that you enable the update status module from the <a href="@module">module administration page</a> in order to stay up-to-date on new releases. For more information please read the <a href="@update">Update status handbook page</a>.', array('@update' => 'http://drupal.org/handbook/modules/update', '@module' => url('admin/modules'))), + 'description' => $t('Update notifications are not enabled. It is <strong>highly recommended</strong> that you enable the update status module from the <a href="@module">module administration page</a> in order to stay up-to-date on new releases. For more information, <a href="@update">Update status handbook page</a>.', array('@update' => 'http://drupal.org/handbook/modules/update', '@module' => url('admin/modules'))), ); } else { @@ -1986,7 +1986,7 @@ function system_update_7013() { $timezone = 'UTC'; } variable_set('date_default_timezone', $timezone); - drupal_set_message('The default time zone has been set to <em>' . check_plain($timezone) . '</em>. Please check the ' . l('date and time configuration page', 'admin/config/regional/settings') . ' to configure it correctly.', 'warning'); + drupal_set_message('The default time zone has been set to <em>' . check_plain($timezone) . '</em>. Check the ' . l('date and time configuration page', 'admin/config/regional/settings') . ' to configure it correctly.', 'warning'); } /** @@ -2158,7 +2158,7 @@ function system_update_7021() { 'cache' => -1, )); } - drupal_set_message('The contact form information setting was migrated to <a href="' . url('admin/structure/block/manage/block/' . $bid . '/configure') . '">a custom block</a> and set up to only show on the site-wide contact page. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right.'); + drupal_set_message('The contact form information setting was migrated to <a href="' . url('admin/structure/block/manage/block/' . $bid . '/configure') . '">a custom block</a> and set up to only show on the site-wide contact page. The block was set to use the default text format, which might differ from the HTML based format used before. Check the block and ensure that the output is right.'); } $insert->execute(); @@ -2181,7 +2181,7 @@ function system_update_7021() { 'cache' => -1, )); } - drupal_set_message('The user registration guidelines were migrated to <a href="' . url('admin/structure/block/manage/block/' . $bid . '/configure') . '">a custom block</a> and set up to only show on the user registration page. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right.'); + drupal_set_message('The user registration guidelines were migrated to <a href="' . url('admin/structure/block/manage/block/' . $bid . '/configure') . '">a custom block</a> and set up to only show on the user registration page. The block was set to use the default text format, which might differ from the HTML based format used before. Check the block and ensure that the output is right.'); $insert->execute(); } @@ -2204,7 +2204,7 @@ function system_update_7021() { 'cache' => -1, )); } - drupal_set_message('The site mission was migrated to <a href="' . url('admin/structure/block/manage/block/' . $bid . '/configure') . '">a custom block</a> and set up to only show on the front page in the highlighted content region. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right. If your theme does not have a highlighted content region, you might need to <a href="' . url('admin/structure/block') . '">relocate the block</a>.'); + drupal_set_message('The site mission was migrated to <a href="' . url('admin/structure/block/manage/block/' . $bid . '/configure') . '">a custom block</a> and set up to only show on the front page in the highlighted content region. The block was set to use the default text format, which might differ from the HTML based format used before. Check the block and ensure that the output is right. If your theme does not have a highlighted content region, you might need to <a href="' . url('admin/structure/block') . '">relocate the block</a>.'); $insert->execute(); // Migrate mission to RSS site description. variable_set('feed_description', $mission); @@ -2230,7 +2230,7 @@ function system_update_7021() { 'cache' => -1, )); } - drupal_set_message('The footer message was migrated to <a href="' . url('admin/structure/block/manage/block/' . $bid . '/configure') . '">a custom block</a> and set up to appear in the footer. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right. If your theme does not have a footer region, you might need to <a href="' . url('admin/structure/block') . '">relocate the block</a>.'); + drupal_set_message('The footer message was migrated to <a href="' . url('admin/structure/block/manage/block/' . $bid . '/configure') . '">a custom block</a> and set up to appear in the footer. The block was set to use the default text format, which might differ from the HTML based format used before. Check the block and ensure that the output is right. If your theme does not have a footer region, you might need to <a href="' . url('admin/structure/block') . '">relocate the block</a>.'); $insert->execute(); } @@ -2363,7 +2363,7 @@ function system_update_7032() { function system_update_7033() { if (variable_get('cache') == 2) { variable_set('cache', CACHE_NORMAL); - return t('Aggressive caching was disabled and replaced with normal caching, please read the page caching section in default.settings.php for more information on how to enable similar functionality.'); + return t('Aggressive caching was disabled and replaced with normal caching. Read the page caching section in default.settings.php for more information on how to enable similar functionality.'); } } diff --git a/modules/system/system.module b/modules/system/system.module index 6247fcb2f..d81246dc5 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -1805,7 +1805,7 @@ function system_form_user_register_form_alter(&$form, &$form_state) { function system_user_login(&$edit, $account) { // If the user has a NULL time zone, notify them to set a time zone. if (!$account->timezone && variable_get('configurable_timezones', 1) && variable_get('empty_timezone_message', 0)) { - drupal_set_message(t('Please configure your <a href="@user-edit">account time zone setting</a>.', array('@user-edit' => url("user/$account->uid/edit", array('query' => drupal_get_destination(), 'fragment' => 'edit-timezone'))))); + drupal_set_message(t('Configure your <a href="@user-edit">account time zone setting</a>.', array('@user-edit' => url("user/$account->uid/edit", array('query' => drupal_get_destination(), 'fragment' => 'edit-timezone'))))); } } @@ -1831,7 +1831,7 @@ function system_user_timezone(&$form, &$form_state) { '#description' => t('Select the desired local time and time zone. Dates and times throughout this site will be displayed using this time zone.'), ); if (!isset($account->timezone) && $account->uid == $user->uid && empty($form_state['input']['timezone'])) { - $form['timezone']['#description'] = t('Your time zone setting will be automatically detected if possible. Please confirm the selection and click save.'); + $form['timezone']['#description'] = t('Your time zone setting will be automatically detected if possible. Confirm the selection and click save.'); $form['timezone']['timezone']['#attributes'] = array('class' => array('timezone-detect')); drupal_add_js('misc/timezone.js'); } @@ -2832,7 +2832,7 @@ function system_send_email_action_validate($form, $form_state) { // Validate the configuration form. if (!valid_email_address($form_values['recipient']) && $form_values['recipient'] != '%author') { // We want the literal %author placeholder to be emphasized in the error message. - form_set_error('recipient', t('Please enter a valid email address or %author.', array('%author' => '%author'))); + form_set_error('recipient', t('Enter a valid email address or %author.', array('%author' => '%author'))); } } diff --git a/modules/system/system.tar.inc b/modules/system/system.tar.inc index 948a793d4..5f1587d70 100644 --- a/modules/system/system.tar.inc +++ b/modules/system/system.tar.inc @@ -154,7 +154,7 @@ class Archive_Tar } if (!extension_loaded($extname)) { die("The extension '$extname' couldn't be found.\n". - "Please make sure your version of PHP was built ". + "Make sure your version of PHP was built ". "with '$extname' support.\n"); return false; } diff --git a/modules/system/system.test b/modules/system/system.test index 4626fa4e0..03545ce94 100644 --- a/modules/system/system.test +++ b/modules/system/system.test @@ -358,19 +358,19 @@ class IPAddressBlockingTestCase extends DrupalWebTestCase { $edit = array(); $edit['ip'] = '255.255.255.255'; $this->drupalPost('admin/config/people/ip-blocking', $edit, t('Save')); - $this->assertText(t('Please enter a valid IP address.')); + $this->assertText(t('Enter a valid IP address.')); // Try to block a reserved IP address. $edit = array(); $edit['ip'] = 'test.example.com'; $this->drupalPost('admin/config/people/ip-blocking', $edit, t('Save')); - $this->assertText(t('Please enter a valid IP address.')); + $this->assertText(t('Enter a valid IP address.')); // Submit an empty form. $edit = array(); $edit['ip'] = ''; $this->drupalPost('admin/config/people/ip-blocking', $edit, t('Save')); - $this->assertText(t('Please enter a valid IP address.')); + $this->assertText(t('Enter a valid IP address.')); // Submit your own IP address. This fails, although it works when testing manually. // TODO: on some systems this test fails due to a bug or inconsistency in cURL. |