diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/comment/comment.test | 2 | ||||
| -rw-r--r-- | modules/overlay/overlay.install | 2 | ||||
| -rw-r--r-- | modules/simpletest/tests/module.test | 10 | ||||
| -rw-r--r-- | modules/simpletest/tests/requirements1_test.install | 2 | ||||
| -rw-r--r-- | modules/system/system.admin.inc | 6 | ||||
| -rw-r--r-- | modules/system/system.api.php | 4 | ||||
| -rw-r--r-- | modules/system/system.install | 10 | ||||
| -rw-r--r-- | modules/system/system.module | 8 |
8 files changed, 22 insertions, 22 deletions
diff --git a/modules/comment/comment.test b/modules/comment/comment.test index e787d25d1..b6a707a66 100644 --- a/modules/comment/comment.test +++ b/modules/comment/comment.test @@ -2011,7 +2011,7 @@ class CommentFieldsTest extends CommentHelperCase { */ function testCommentDefaultFields() { // Do not make assumptions on default node types created by the test - // install profile, and create our own. + // installation profile, and create our own. $this->drupalCreateContentType(array('type' => 'test_node_type')); // Check that the 'comment_body' field is present on all comment bundles. diff --git a/modules/overlay/overlay.install b/modules/overlay/overlay.install index 2fa7c84bc..8939e2a61 100644 --- a/modules/overlay/overlay.install +++ b/modules/overlay/overlay.install @@ -9,7 +9,7 @@ * Implements hook_enable(). * * If the module is being enabled through the admin UI, and not from an - * install profile, reopen the modules page in an overlay. + * installation profile, reopen the modules page in an overlay. */ function overlay_enable() { if (strpos(current_path(), 'admin/modules') === 0) { diff --git a/modules/simpletest/tests/module.test b/modules/simpletest/tests/module.test index f55c08af4..769c4cf89 100644 --- a/modules/simpletest/tests/module.test +++ b/modules/simpletest/tests/module.test @@ -25,7 +25,7 @@ class ModuleUnitTest extends DrupalWebTestCase { $profile_info = install_profile_info('standard', 'en'); $module_list = $profile_info['dependencies']; - // Install profile is a module that is expected to be loaded. + // Installation profile is a module that is expected to be loaded. $module_list[] = 'standard'; sort($module_list); @@ -171,12 +171,12 @@ class ModuleUnitTest extends DrupalWebTestCase { $this->assertFalse(module_exists('php'), t('Disabling a module with unlisted dependents succeeded.')); $this->assertEqual(variable_get('test_module_disable_order', array()), array('forum', 'poll', 'php'), t('Modules were disabled in the correct order by module_disable().')); - // Disable a module that is listed as a dependency by the install profile. - // Make sure that the profile itself is not on the list of dependent - // modules to be disabled. + // Disable a module that is listed as a dependency by the installation + // profile. Make sure that the profile itself is not on the list of + // dependent modules to be disabled. $profile = drupal_get_profile(); $info = install_profile_info($profile); - $this->assertTrue(in_array('comment', $info['dependencies']), t('Comment module is listed as a dependency of the install profile.')); + $this->assertTrue(in_array('comment', $info['dependencies']), t('Comment module is listed as a dependency of the installation profile.')); $this->assertTrue(module_exists('comment'), t('Comment module is enabled.')); module_disable(array('comment')); $this->assertFalse(module_exists('comment'), t('Comment module was disabled.')); diff --git a/modules/simpletest/tests/requirements1_test.install b/modules/simpletest/tests/requirements1_test.install index 651d911ab..91caca3f5 100644 --- a/modules/simpletest/tests/requirements1_test.install +++ b/modules/simpletest/tests/requirements1_test.install @@ -5,7 +5,7 @@ */ function requirements1_test_requirements($phase) { $requirements = array(); - // Ensure translations don't break at install time. + // Ensure translations don't break during installation. $t = get_t(); // Always fails requirements. diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index c9d623ca9..061898c85 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -813,7 +813,7 @@ function system_modules($form, $form_state = array()) { // Used when checking if module implements a help page. $help_arg = module_exists('help') ? drupal_help_arg() : FALSE; - // Used when displaying modules that are required by the install profile. + // Used when displaying modules that are required by the installation profile. require_once DRUPAL_ROOT . '/includes/install.inc'; $distribution_name = check_plain(drupal_install_profile_distribution_name()); @@ -1274,8 +1274,8 @@ function system_modules_uninstall($form, $form_state = NULL) { '#title_display' => 'invisible', ); // All modules which depend on this one must be uninstalled first, before - // we can allow this module to be uninstalled. (The install profile is - // excluded from this list.) + // we can allow this module to be uninstalled. (The installation profile + // is excluded from this list.) foreach (array_keys($module->required_by) as $dependent) { if ($dependent != $profile && drupal_get_installed_schema_version($dependent) != SCHEMA_UNINSTALLED) { $dependent_name = isset($all_modules[$dependent]->info['name']) ? $all_modules[$dependent]->info['name'] : $dependent; diff --git a/modules/system/system.api.php b/modules/system/system.api.php index 6ed576696..53d3cb282 100644 --- a/modules/system/system.api.php +++ b/modules/system/system.api.php @@ -3004,7 +3004,7 @@ function hook_file_url_alter(&$uri) { */ function hook_requirements($phase) { $requirements = array(); - // Ensure translations don't break at install time + // Ensure translations don't break during installation. $t = get_t(); // Report Drupal version @@ -3056,7 +3056,7 @@ function hook_requirements($phase) { * more tables and their related keys and indexes. A schema is defined by * hook_schema() which must live in your module's .install file. * - * This hook is called at both install and uninstall time, and in the latter + * This hook is called at install and uninstall time, and in the latter * case, it cannot rely on the .module file being loaded or hooks being known. * If the .module file is needed, it may be loaded with drupal_load(). * diff --git a/modules/system/system.install b/modules/system/system.install index d468b05e2..df0db710c 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -16,7 +16,7 @@ function system_requirements($phase) { global $base_url; $requirements = array(); - // Ensure translations don't break at install time + // Ensure translations don't break during installation. $t = get_t(); // Report Drupal version @@ -28,8 +28,8 @@ function system_requirements($phase) { 'weight' => -10, ); - // Display the currently active install profile, if the site - // is not running the default install profile. + // Display the currently active installation profile, if the site + // is not running the default installation profile. $profile = drupal_get_profile(); if ($profile != 'standard') { $info = system_get_info('module', $profile); @@ -308,7 +308,7 @@ function system_requirements($phase) { variable_get('file_private_path', FALSE), ); - // Do not check for the temporary files directory at install time + // Do not check for the temporary files directory during installation // unless it has been set in settings.php. In this case the user has // no alternative but to fix the directory if it is not writable. if ($phase == 'install') { @@ -412,7 +412,7 @@ function system_requirements($phase) { $profile = drupal_get_profile(); $files = system_rebuild_module_data(); foreach ($files as $module => $file) { - // Ignore disabled modules and install profiles. + // Ignore disabled modules and installation profiles. if (!$file->status || $module == $profile) { continue; } diff --git a/modules/system/system.module b/modules/system/system.module index 971c7c99d..a8fb53fa6 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -2348,14 +2348,14 @@ function _system_rebuild_module_data() { // Find modules $modules = drupal_system_listing('/^' . DRUPAL_PHP_FUNCTION_PATTERN . '\.module$/', 'modules', 'name', 0); - // Include the install profile in modules that are loaded. + // Include the installation profile in modules that are loaded. $profile = drupal_get_profile(); $modules[$profile] = new stdClass(); $modules[$profile]->name = $profile; $modules[$profile]->uri = 'profiles/' . $profile . '/' . $profile . '.profile'; $modules[$profile]->filename = $profile . '.profile'; - // Install profile hooks are always executed last. + // Installation profile hooks are always executed last. $modules[$profile]->weight = 1000; // Set defaults for module info. @@ -2396,7 +2396,7 @@ function _system_rebuild_module_data() { $module->info['scripts'] = _system_info_add_path($module->info['scripts'], $path); } - // Install profiles are hidden by default, unless explicitly specified + // Installation profiles are hidden by default, unless explicitly specified // otherwise in the .info file. if ($key == $profile && !isset($modules[$key]->info['hidden'])) { $modules[$key]->info['hidden'] = TRUE; @@ -2409,7 +2409,7 @@ function _system_rebuild_module_data() { } if (isset($modules[$profile])) { - // The install profile is required, if it's a valid module. + // The installation profile is required, if it's a valid module. $modules[$profile]->info['required'] = TRUE; // Add a default distribution name if the profile did not provide one. This // matches the default value used in install_profile_info(). |