Skip to content

GitLab

Commit 8aa4fdba authored by Jennifer Hodgdon's avatar Jennifer Hodgdon
Browse files

Issue #1799116 by jwilson3: Standardize on installation profile term vs. install profile

parent a67e5371
Hide whitespace changes
Inline Side-by-side
core/CHANGELOG.txt
View file @ 8aa4fdba
......@@ -128,8 +128,8 @@ Drupal 7.0, 2011-01-05
order can now be customized using the Views module.
* Removed the 'related terms' feature from taxonomy module since this can
now be achieved with Field API.
* Added additional features to the default install profile, and implemented
a "slimmed down" install profile designed for developers.
* Added additional features to the default installation profile, and
implemented a "slimmed down" profile designed for developers.
* Added a built-in, automated cron run feature, which is triggered by site
visitors.
* Added an administrator role which is assigned all permissions for
......@@ -321,7 +321,7 @@ Drupal 6.0, 2008-02-13
* Expands the severity levels from 3 (Error, Warning, Notice) to the 8
levels defined in RFC 3164.
* The watchdog module is now called dblog, and is optional, but enabled by
default in the default install profile.
default in the default installation profile.
* Extended the database log module so log messages can be filtered.
* Added syslog module: useful for monitoring large Drupal installations.
- Added optional e-mail notifications when users are approved, blocked, or
......@@ -376,7 +376,7 @@ Drupal 6.0, 2008-02-13
* Themed the installer with the Garland theme.
* Added form to provide initial site information during installation.
* Added ability to provide extra installation steps programmatically.
* Made it possible to import interface translations at install time.
* Made it possible to import interface translations during installation.
- Added the HTML corrector filter:
* Fixes faulty and chopped off HTML in postings.
* Tags are now automatically closed at the end of the teaser.
......@@ -466,7 +466,7 @@ Drupal 5.0, 2007-01-15
- Added web-based installer which can:
* Check installation and run-time requirements
* Automatically generate the database configuration file
* Install pre-made 'install profiles' or distributions
* Install pre-made installation profiles or distributions
* Import the database structure with automatic table prefixing
* Be localized
- Added new default Garland theme
......
core/includes/common.inc
View file @ 8aa4fdba
......@@ -229,7 +229,7 @@ function drupal_get_region_content($region = NULL, $delimiter = ' ') {
}
/**
* Gets the name of the currently active install profile.
* Gets the name of the currently active installation profile.
*
* When this function is called during Drupal's initial installation process,
* the name of the profile that's about to be installed is stored in the global
......@@ -238,7 +238,7 @@ function drupal_get_region_content($region = NULL, $delimiter = ' ') {
* variable_get() to determine what one is active.
*
* @return $profile
* The name of the install profile.
* The name of the installation profile.
*/
function drupal_get_profile() {
global $install_state;
......@@ -5100,7 +5100,7 @@ function drupal_cron_cleanup() {
* drupal_system_listing("/\.module$/", "modules", 'name', 0);
* @endcode
* this function will search the site-wide modules directory (i.e., /modules/),
* your install profile's directory (i.e.,
* your installation profile's directory (i.e.,
* /profiles/your_site_profile/modules/), the all-sites directory (i.e.,
* /modules/), and your site-specific directory (i.e.,
* /sites/your_site_dir/modules/), in that order, and return information about
......
core/includes/form.inc
View file @ 8aa4fdba
......@@ -4771,7 +4771,7 @@ function batch_set($batch_definition) {
}
// Base and default properties for the batch set.
// Use get_t() to allow batches at install time.
// Use get_t() to allow batches during installation.
$t = get_t();
$init = array(
'sandbox' => array(),
......
core/includes/install.core.inc
View file @ 8aa4fdba
......@@ -624,7 +624,7 @@ function install_tasks($install_state) {
$needs_translations = count($install_state['translations']) > 1 && !empty($install_state['parameters']['langcode']) && $install_state['parameters']['langcode'] != 'en';
// Start with the core installation tasks that run before handing control
// to the install profile.
// to the installation profile.
$tasks = array(
'install_select_language' => array(
'display_name' => st('Choose language'),
......@@ -655,7 +655,7 @@ function install_tasks($install_state) {
'run' => INSTALL_TASK_RUN_IF_REACHED,
),
'install_profile_modules' => array(
'display_name' => count($install_state['profiles']) == 1 ? st('Install site') : st('Install profile'),
'display_name' => count($install_state['profiles']) == 1 ? st('Install site') : st('Installation profile'),
'type' => 'batch',
),
'install_import_translations' => array(
......@@ -905,7 +905,7 @@ function install_base_system(&$install_state) {
// variable_set() can be used now that system.module is installed.
$modules = $install_state['profile_info']['dependencies'];
// The install profile is also a module, which needs to be installed
// The installation profile is also a module, which needs to be installed
// after all the dependencies have been installed.
$modules[] = drupal_get_profile();
......@@ -1596,7 +1596,7 @@ function install_configure_form($form, &$form_state, &$install_state) {
// Add JavaScript time zone detection.
drupal_add_library('system', 'drupal.timezone');
// We add these strings as settings because JavaScript translation does not
// work on install time.
// work during installation.
drupal_add_js(array('copyFieldValue' => array('edit-site-mail' => array('edit-account-mail'))), 'setting');
// Add JS to show / hide the 'Email administrator about site updates' elements
drupal_add_js('jQuery(function () { Drupal.hideEmailAdministratorCheckbox() });', 'inline');
......@@ -1646,7 +1646,7 @@ function install_finished(&$install_state) {
// Remember the profile which was used.
variable_set('install_profile', drupal_get_profile());
// Install profiles are always loaded last.
// Installation profiles are always loaded last.
db_update('system')
->fields(array('weight' => 1000))
->condition('type', 'module')
......@@ -1655,7 +1655,7 @@ function install_finished(&$install_state) {
// Flush all caches to ensure that any full bootstraps during the installer
// do not leave stale cached data, and that any content types or other items
// registered by the install profile are registered correctly.
// registered by the installation profile are registered correctly.
drupal_flush_all_caches();
drupal_set_title(st('@drupal installation complete', array('@drupal' => drupal_install_profile_distribution_name())), PASS_THROUGH);
......
core/includes/install.inc
View file @ 8aa4fdba
......@@ -90,11 +90,11 @@ function drupal_load_updates() {
}
/**
* Loads the install profile, extracting its defined distribution name.
* Loads the installation profile, extracting its defined distribution name.
*
* @return
* The distribution name defined in the profile's .info file. Defaults to
* "Drupal" if none is explicitly provided by the install profile.
* "Drupal" if none is explicitly provided by the installation profile.
*
* @see install_profile_info()
*/
......@@ -356,7 +356,7 @@ function install_ensure_config_directory($type) {
}
/**
* Verifies an install profile for installation.
* Verifies that all dependencies are met for a given installation profile.
*
* @param $install_state
* An array of information about the current installation state.
......@@ -382,8 +382,8 @@ function drupal_verify_profile($install_state) {
$present_modules[] = $present_module->name;
}
// The install profile is also a module, which needs to be installed after all the other dependencies
// have been installed.
// The installation profile is also a module, which needs to be installed
// after all the other dependencies have been installed.
$present_modules[] = drupal_get_profile();
// Verify that all of the profile's required modules are present.
......@@ -788,15 +788,15 @@ function st($string, array $args = array(), array $options = array()) {
}
/**
* Checks an install profile's requirements.
* Checks an installation profile's requirements.
*
* @param string $profile
* Name of install profile to check.
* Name of installation profile to check.
* @param array $install_state
* The current state in the install process.
*
* @return array
* Array of the install profile's requirements.
* Array of the installation profile's requirements.
*/
function drupal_check_profile($profile, array $install_state) {
include_once DRUPAL_ROOT . '/core/includes/file.inc';
......@@ -873,11 +873,11 @@ function drupal_check_module($module) {
}
/**
* Retrieves information about an install profile from its .info file.
* Retrieves information about an installation profile from its .info file.
*
* The information stored in a profile .info file is similar to that stored in
* a normal Drupal module .info file. For example:
* - name: The real name of the install profile for display purposes.
* - name: The real name of the installation profile for display purposes.
* - description: A brief description of the profile.
* - dependencies: An array of shortnames of other modules that this install
* profile requires.
......
core/includes/module.inc
View file @ 8aa4fdba
......@@ -946,7 +946,7 @@ function drupal_required_modules() {
$files = drupal_system_listing('/^' . DRUPAL_PHP_FUNCTION_PATTERN . '\.info$/', 'modules', 'name', 0);
$required = array();
// An install profile is required and one must always be loaded.
// An installation profile is required and one must always be loaded.
$required[] = drupal_get_profile();
foreach ($files as $name => $file) {
......
core/includes/unicode.inc
View file @ 8aa4fdba
......@@ -65,7 +65,7 @@
* Return Unicode library status and errors.
*/
function unicode_requirements() {
// Ensure translations don't break at install time
// Ensure translations don't break during installation.
$t = get_t();
$libraries = array(
......
core/modules/comment/lib/Drupal/comment/Tests/CommentFieldsTest.php
View file @ 8aa4fdba
......@@ -24,7 +24,7 @@ public static function getInfo() {
*/
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.
......
core/modules/field/lib/Drupal/field/Tests/FieldInfoTest.php
View file @ 8aa4fdba
......@@ -238,7 +238,7 @@ function testInstanceDisabledEntityType() {
* Test field_info_field_map().
*/
function testFieldMap() {
// We will overlook fields created by the 'standard' install profile.
// We will overlook fields created by the 'standard' installation profile.
$exclude = field_info_field_map();
// Create a new bundle for 'test_entity' entity type.
......
core/modules/overlay/overlay.install
View file @ 8aa4fdba
......@@ -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) {
......
core/modules/system/lib/Drupal/system/Tests/Bootstrap/GetFilenameUnitTest.php
View file @ 8aa4fdba
......@@ -41,7 +41,7 @@ function testDrupalGetFilename() {
// Retrieving the location of a profile. Profiles are a special case with
// a fixed location and naming.
$this->assertIdentical(drupal_get_filename('profile', 'standard'), 'core/profiles/standard/standard.profile', 'Retrieve install profile location.');
$this->assertIdentical(drupal_get_filename('profile', 'standard'), 'core/profiles/standard/standard.profile', 'Retrieve installation profile location.');
// When a file is not found in the database cache, drupal_get_filename()
// searches several locations on the filesystem, including the core/
......
core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php
View file @ 8aa4fdba
......@@ -32,7 +32,7 @@ function testModuleList() {
$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);
......@@ -189,12 +189,12 @@ function testDependencyResolution() {
$this->assertFalse(module_exists('php'), 'Disabling a module with unlisted dependents succeeded.');
$this->assertEqual(variable_get('test_module_disable_order', array()), array('forum', 'poll', 'php'), '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']), 'Comment module is listed as a dependency of the install profile.');
$this->assertTrue(in_array('comment', $info['dependencies']), 'Comment module is listed as a dependency of the installation profile.');
$this->assertTrue(module_exists('comment'), 'Comment module is enabled.');
module_disable(array('comment'));
$this->assertFalse(module_exists('comment'), 'Comment module was disabled.');
......
core/modules/system/system.admin.inc
View file @ 8aa4fdba
......@@ -814,7 +814,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 . '/core/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;
......
core/modules/system/system.api.php
View file @ 8aa4fdba
......@@ -2521,7 +2521,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
......@@ -2573,7 +2573,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().
*
......
core/modules/system/system.install
View file @ 8aa4fdba
......@@ -18,7 +18,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
......@@ -30,13 +30,13 @@ 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);
$requirements['install_profile'] = array(
'title' => $t('Install profile'),
'title' => $t('Installation profile'),
'value' => $t('%profile_name (%profile-%version)', array(
'%profile_name' => $info['name'],
'%profile' => $profile,
......@@ -317,7 +317,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') {
......@@ -436,7 +436,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;
}
......
core/modules/system/system.module
View file @ 8aa4fdba
......@@ -2840,11 +2840,11 @@ function _system_rebuild_module_data() {
// Find installation profiles.
$profiles = drupal_system_listing('/^' . DRUPAL_PHP_FUNCTION_PATTERN . '\.profile$/', 'profiles', '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] = $profiles[$profile];
// Install profile hooks are always executed last.
// Installation profile hooks are always executed last.
$modules[$profile]->weight = 1000;
// Set defaults for module info.
......@@ -2889,7 +2889,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;
......@@ -2902,7 +2902,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().
......
core/modules/system/tests/modules/requirements1_test/requirements1_test.install
View file @ 8aa4fdba
......@@ -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.
......
core/profiles/minimal/minimal.install
View file @ 8aa4fdba
<?php
/**
* @file
* Install, update and uninstall functions for the minimal install profile.
* Install, update and uninstall functions for the minimal installation profile.
*/
/**
......
core/profiles/standard/standard.install
View file @ 8aa4fdba
<?php
/**
* @file
* Install, update and uninstall functions for the standard install profile.
* Install, update and uninstall functions for the standard installation profile.
*/
/**
......
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