diff --git a/configuration.drush.inc b/configuration.drush.inc
index 0c81353..28a483d 100644
--- a/configuration.drush.inc
+++ b/configuration.drush.inc
@@ -327,7 +327,7 @@ function _configuration_export_to_datastore() {
$export_optionals = !drush_get_option('exclude-optionals');
$start_tracking = drush_get_option('start-tracking');
- $result = ConfigurationManagement::exportToDataStore($args, $export_dependencies, $export_optionals, $start_tracking);
+ $result = ConfigurationManagement::exportToStaging($args, $export_dependencies, $export_optionals, $start_tracking);
$hashes = $result->getInfo('hash');
foreach ($result->getInfo('exported') as $id => $exported) {
$rows[] = array(
diff --git a/configuration.install b/configuration.install
index 441c0ee..f398649 100644
--- a/configuration.install
+++ b/configuration.install
@@ -27,14 +27,14 @@ function configuration_schema() {
'default' => '',
),
'hash' => array(
- 'description' => 'A sha1 hash that respresent the configuration. Used to track differences between the ActiveStore, DataStore and tracked area.',
+ 'description' => 'A sha1 hash that respresents the configuration. Used to track differences between active and staged configuration.',
'type' => 'varchar',
'length' => 255,
'not null' => TRUE,
'default' => '',
),
'file' => array(
- 'description' => 'The name of the file that storage the configuration in the config directory.',
+ 'description' => 'The name of the file that storage the configuration in the staging directory.',
'type' => 'varchar',
'length' => 255,
'not null' => TRUE,
diff --git a/configuration.module b/configuration.module
index 8936b60..d642601 100644
--- a/configuration.module
+++ b/configuration.module
@@ -15,7 +15,7 @@ function configuration_stream_wrappers() {
'config' => array(
'name' => t('Configuration files'),
'class' => 'ConfigurationStreamWrapper',
- 'description' => t('Configuration files export directory.'),
+ 'description' => t('Configuration staging directory.'),
'type' => STREAM_WRAPPERS_LOCAL_HIDDEN,
),
);
diff --git a/lib/Drupal/configuration/Config/Configuration.php b/lib/Drupal/configuration/Config/Configuration.php
index c0b5af7..67cedeb 100644
--- a/lib/Drupal/configuration/Config/Configuration.php
+++ b/lib/Drupal/configuration/Config/Configuration.php
@@ -94,7 +94,7 @@ abstract class Configuration {
/**
* A boolean flag to indicate if the configuration object was already
- * populated from the ActiveStore, or from the DataStore.
+ * populated from active storage, or from staging.
*/
protected $built;
@@ -167,9 +167,9 @@ abstract class Configuration {
}
/**
- * Returns the list of components available in the DataStore.
+ * Returns the list of components available in staging.
*/
- public static function scanDataStore($component, $source = FALSE) {
+ public static function scanStaging($component, $source = FALSE) {
$list_of_components = array();
if ($source) {
@@ -292,7 +292,7 @@ abstract class Configuration {
*/
public function removeConfiguration(ConfigIteratorSettings &$settings) {
$this->stopTracking($settings);
- $this->removeFromDataStore($settings);
+ $this->removeFromStaging($settings);
}
/**
@@ -311,14 +311,14 @@ abstract class Configuration {
}
/**
- * Removes the configuration file from the dataStore folder.
+ * Removes the configuration file from the staging folder.
*/
- public function removeFromDataStore(ConfigIteratorSettings &$settings) {
+ public function removeFromStaging(ConfigIteratorSettings &$settings) {
$this->storage->delete();
}
/**
- * Load a configuration from the DataStore and save it into the ActiveStore.
+ * Load a configuration from staging and save it to active storage.
* This function is called from iterator().
*
* @see iterate()
@@ -338,7 +338,7 @@ abstract class Configuration {
}
/**
- * Save a configuration into the ActiveStore.
+ * Save a configuration to active storage.
*
* Each configuration should implement their own version of saveToActiveStore.
* I.e, content types should call to node_save_type(), variables should call
@@ -436,15 +436,15 @@ abstract class Configuration {
/**
* Return the current status of the configuration.
*
- * @param boolean $human_name
+ * @param boolean $human_name
* If TRUE a human readable name will be return for the status of the
* configuration. If FALSE a numeric code will be returned.
* @return string|integer
- * The status of the configuration. (ActiveStore only, In Sync, Overriden).
+ * The status of the configuration. (In Active Storage Only, In Sync, Overriden).
*/
public function getStatus($human_name = TRUE) {
if ($this->broken) {
- return $human_name ? t('Removed from ActiveStore') : 0;
+ return $human_name ? t('Removed From Active Storage') : 0;
}
$tracking_file = ConfigurationManagement::readTrackingFile();
$tracked = array();
@@ -456,7 +456,7 @@ abstract class Configuration {
$file_hash = $tracked[$this->getUniqueId()];
}
if (!isset($file_hash)) {
- return $human_name ? t('ActiveStore only') : Configuration::notTracked;
+ return $human_name ? t('In Active Storage Only') : Configuration::notTracked;
}
else {
if ($this->getHash() == $file_hash) {
@@ -862,7 +862,7 @@ abstract class Configuration {
* processed too, and storage the cache of already processed configurations.
*
* @see importToActiveStore()
- * @see exportToDataStore()
+ * @see exportToStaging()
* @see revertActiveStore()
* @see discoverRequiredModules()
*/
diff --git a/lib/Drupal/configuration/Config/ConfigurationManagement.php b/lib/Drupal/configuration/Config/ConfigurationManagement.php
index 97a767a..c4bf035 100644
--- a/lib/Drupal/configuration/Config/ConfigurationManagement.php
+++ b/lib/Drupal/configuration/Config/ConfigurationManagement.php
@@ -156,7 +156,7 @@ class ConfigurationManagement {
/**
* Includes a record of each configuration tracked in the
- * configuration_tracked table and export the configurations to the DataStore.
+ * configuration_tracked table and export the configurations to staging.
*
* @param array $list
* The list of components that have to will be tracked.
@@ -171,12 +171,12 @@ class ConfigurationManagement {
* configurations.
*/
static public function startTracking($list = array(), $track_dependencies = TRUE, $track_optionals = TRUE) {
- return static::exportToDataStore($list, $track_dependencies, $track_optionals, TRUE);
+ return static::exportToStaging($list, $track_dependencies, $track_optionals, TRUE);
}
/**
* Removes a record of each configuration that is not tracked anymore and
- * deletes the configuration file in the DataStore.
+ * deletes the configuration file in staging.
*
* @param array $list
* The list of components that have to will be tracked.
@@ -222,14 +222,14 @@ class ConfigurationManagement {
}
}
- static::exportToDataStore($args, TRUE, TRUE, TRUE);
+ static::exportToStaging($args, TRUE, TRUE, TRUE);
}
return $settings;
}
/**
- * Loads the configuration from the DataStore into the ActiveStore.
+ * Loads the configuration from staging to active storage.
*
* @param array $list
* The list of components that have to will be imported.
@@ -288,7 +288,7 @@ class ConfigurationManagement {
drupal_flush_all_caches();
if ($start_tracking) {
- static::exportToDataStore($list, $import_dependencies, $import_optionals, TRUE);
+ static::exportToStaging($list, $import_dependencies, $import_optionals, TRUE);
}
module_invoke_all('configuration_post_import', $settings);
@@ -297,7 +297,7 @@ class ConfigurationManagement {
}
/**
- * Export the configuration from the ActiveStore to the DataStore.
+ * Export the configuration from active storage to staging.
*
* @param array $list
* The list of components that have to will be exported.
@@ -313,7 +313,7 @@ class ConfigurationManagement {
* An ConfigIteratorSettings object that contains the exported
* configurations.
*/
- static public function exportToDataStore($list = array(), $export_dependencies = TRUE, $export_optionals = TRUE, $start_tracking = FALSE) {
+ static public function exportToStaging($list = array(), $export_dependencies = TRUE, $export_optionals = TRUE, $start_tracking = FALSE) {
$settings = new ConfigIteratorSettings(
array(
'build_callback' => 'build',
diff --git a/lib/Drupal/configuration/Storage/Storage.php b/lib/Drupal/configuration/Storage/Storage.php
index f1c1a2c..a9392b6 100644
--- a/lib/Drupal/configuration/Storage/Storage.php
+++ b/lib/Drupal/configuration/Storage/Storage.php
@@ -104,12 +104,12 @@ class Storage {
public function import($file_content) { }
/**
- * Saves the configuration object into the DataStore.
+ * Saves the configuration object to staging.
*/
public function save() { }
/**
- * Loads the configuration object from the DataStore.
+ * Loads the configuration object from staging.
*
* @param $file_content
* Optional. The content to load directly.
diff --git a/lib/Drupal/configuration/Storage/StorageCtools.php b/lib/Drupal/configuration/Storage/StorageCtools.php
index e92cb53..59b02fc 100644
--- a/lib/Drupal/configuration/Storage/StorageCtools.php
+++ b/lib/Drupal/configuration/Storage/StorageCtools.php
@@ -20,7 +20,7 @@ class StorageCtools extends StoragePHP {
}
/**
- * Saves the configuration object into the DataStore.
+ * Saves the configuration object to staging.
*/
public function getDataToSave() {
$filename = $this->filename;
diff --git a/lib/Drupal/configuration/Storage/StorageEntityApi.php b/lib/Drupal/configuration/Storage/StorageEntityApi.php
index 70715ae..918a79a 100644
--- a/lib/Drupal/configuration/Storage/StorageEntityApi.php
+++ b/lib/Drupal/configuration/Storage/StorageEntityApi.php
@@ -20,7 +20,7 @@ class StorageEntityApi extends StoragePHP {
}
/**
- * Saves the configuration object into the DataStore.
+ * Saves the configuration object to staging.
*/
public function getDataToSave() {
diff --git a/lib/Drupal/configuration/Storage/StoragePhp.php b/lib/Drupal/configuration/Storage/StoragePhp.php
index 39fa2e9..9327651 100644
--- a/lib/Drupal/configuration/Storage/StoragePhp.php
+++ b/lib/Drupal/configuration/Storage/StoragePhp.php
@@ -63,7 +63,7 @@ class StoragePhp extends Storage {
}
/**
- * Saves the configuration object into the DataStore.
+ * Saves the configuration object to staging.
*/
public function getDataToSave() {
$data_is_array = FALSE;
@@ -119,7 +119,7 @@ class StoragePhp extends Storage {
}
/**
- * Loads the configuration object from the DataStore.
+ * Loads the configuration object from staging.
*
* @param $file_content
* Optional. The content to load directly.
diff --git a/tests/configuration.test b/tests/configuration.test
index 6f4141d..1eb4819 100644
--- a/tests/configuration.test
+++ b/tests/configuration.test
@@ -97,8 +97,8 @@ class ConfigurationApiTest extends ConfigurationWebTestCase {
$this->drupalPost('admin/structure/types/manage/article', $edit, t('Save content type'));
}
- public function testExportToDatastore() {
- $results = ConfigurationManagement::exportToDataStore(array('content_type.article'));
+ public function testExportToStaging() {
+ $results = ConfigurationManagement::exportToStaging(array('content_type.article'));
$exported = $results->getInfo('exported');
foreach ($this->configurations as $config) {
diff --git a/tests/handlers/ConfigurationHandlerBaseTestCase.test b/tests/handlers/ConfigurationHandlerBaseTestCase.test
index 8b4dec2..4fdfdcf 100644
--- a/tests/handlers/ConfigurationHandlerBaseTestCase.test
+++ b/tests/handlers/ConfigurationHandlerBaseTestCase.test
@@ -34,7 +34,7 @@ abstract class ConfigurationHandlerBaseTestCase extends ConfigurationWebTestCase
}
/**
- * Import a configuration from the DataStore into the ActiveStore.
+ * Import configuration from staging to active storage.
*
* Configuration to import should be defined in importConfig().
*/
@@ -64,21 +64,21 @@ abstract class ConfigurationHandlerBaseTestCase extends ConfigurationWebTestCase
}
}
- $this->assertTrue($this->savedInActiveStore(), "The configuration was saved in the ActiveStore.");
+ $this->assertTrue($this->savedInActiveStore(), "The configuration was saved in active storage.");
$this->extraChecksOnImport();
}
/**
- * Import a configuration from the ActiveStore to the DataStore.
+ * Import configuration from active storage to staging.
*
* Configuration to import should be defined in exportConfig().
*/
- public function testExportToDataStore() {
+ public function testExportToStaging() {
$this->createConfigToExport();
$configToExport = $this->configToExport();
- $results = ConfigurationManagement::exportToDataStore($configToExport, $this->exportDependencies(), $this->exportOptionals());
+ $results = ConfigurationManagement::exportToStaging($configToExport, $this->exportDependencies(), $this->exportOptionals());
$exported = $results->getInfo('exported');
foreach ($configToExport as $config) {
diff --git a/tests/handlers/TestPageManagerConfiguration.test b/tests/handlers/TestPageManagerConfiguration.test
index 0fb941d..328dbb5 100644
--- a/tests/handlers/TestPageManagerConfiguration.test
+++ b/tests/handlers/TestPageManagerConfiguration.test
@@ -109,7 +109,7 @@ class TestPageManagerConfiguration extends ConfigurationHandlerBaseTestCase {
*/
protected function savedInActiveStore() {
$view_exists = views_get_view('test');
- $result = $this->assertTrue(!empty($view_exists->name), "The view was saved in the ActiveStore.");
+ $result = $this->assertTrue(!empty($view_exists->name), "The view was saved in active storage.");
$web_user = $this->drupalCreateUser(
array(
'use page manager',
@@ -251,7 +251,7 @@ class TestPageManagerConfiguration extends ConfigurationHandlerBaseTestCase {
$edit['page[title]'] = 'My custom view';
$edit['page[path]'] = 'custom_view';
$this->drupalPost('admin/structure/views/add', $edit, t('Save & exit'));
- $this->assertRaw('My custom view', "The view was saved in the ActiveStore.");
+ $this->assertRaw('My custom view', "The view was saved in active storage.");
}
/**
diff --git a/tests/handlers/menu_links.test b/tests/handlers/menu_links.test
index dac4094..22a9f02 100644
--- a/tests/handlers/menu_links.test
+++ b/tests/handlers/menu_links.test
@@ -58,10 +58,10 @@ class ConfigurationHandlerMenuLinksTestCase extends ConfigurationWebTestCase {
$this->assertTrue(in_array($level_two, $imported) && in_array($level_one, $imported), "Parents of the menu link also imported.");
$imported_menu_links = db_query('SELECT COUNT(*) FROM {menu_links} WHERE menu_name = :menu_name', array(':menu_name' => 'menu-test'))->fetchField();
- $this->assertTrue($imported_menu_links == 3, "The three menus were saved in the ActiveStore.");
+ $this->assertTrue($imported_menu_links == 3, "The three menus were saved in active storage.");
}
- public function testExportToDataStore() {
+ public function testExportToStaging() {
$menu_link = array(
'link_path' => 'admin',
'link_title' => 'My link',
@@ -73,10 +73,10 @@ class ConfigurationHandlerMenuLinksTestCase extends ConfigurationWebTestCase {
);
$saved = menu_link_save($menu_link);
- $this->assertTrue($saved, "The menu was saved in the ActiveStore.");
+ $this->assertTrue($saved, "The menu was saved in active storage.");
$config = 'menu.' . sha1(str_replace('-', '_', $menu_link['menu_name']) . ':' . $menu_link['link_path']);
- $results = ConfigurationManagement::exportToDataStore(array($config), FALSE, FALSE);
+ $results = ConfigurationManagement::exportToStaging(array($config), FALSE, FALSE);
$exported = $results->getInfo('exported');
$this->assertTrue(in_array($config, $exported), "Configuration for $config was exported.");
@@ -95,7 +95,7 @@ class ConfigurationHandlerMenuLinksTestCase extends ConfigurationWebTestCase {
drupal_flush_all_caches();
$imported_menu_links = db_query('SELECT COUNT(*) FROM {menu_links} WHERE menu_name = :menu_name', array(':menu_name' => 'menu-test'))->fetchField();
- $this->assertTrue($imported_menu_links == 3, "The three menus were saved in the ActiveStore.");
+ $this->assertTrue($imported_menu_links == 3, "The three menus were saved in active storage.");
$menu = ConfigurationManagement::createConfigurationInstance($config);
diff --git a/tests/handlers/page_manager.test b/tests/handlers/page_manager.test
index 79a6fea..b23ed00 100644
--- a/tests/handlers/page_manager.test
+++ b/tests/handlers/page_manager.test
@@ -58,7 +58,7 @@ class ConfigurationHandlerPageManagerTestCase extends ConfigurationWebTestCase {
$this->assertTrue(in_array($component, $imported), "Dependency $component was imported.");
}
$view_exists = views_get_view('test');
- $this->assertTrue(!empty($view_exists->name), "The view was saved in the ActiveStore.");
+ $this->assertTrue(!empty($view_exists->name), "The view was saved in active storage.");
$web_user = $this->drupalCreateUser(
array(
'access content',
@@ -70,7 +70,7 @@ class ConfigurationHandlerPageManagerTestCase extends ConfigurationWebTestCase {
$this->assertRaw('Configuration Test Page', 'Page Manager Page was created correctly.');
}
- public function testExportToDataStore() {
+ public function testExportToStaging() {
variable_set('configuration_config_path', $this->datastore_path);
$config_path = variable_get('configuration_config_path', $this->datastore_path);
file_prepare_directory($config_path);
@@ -145,11 +145,11 @@ class ConfigurationHandlerPageManagerTestCase extends ConfigurationWebTestCase {
menu_save($custom_menu);
$menu_exists = menu_load('menu-configuration-test-menu');
- $this->assertTrue($menu_exists, "The menu was created in the ActiveStore.");
- $this->assertTrue(menu_link_save($custom_menu_link), "The menu link was created in the ActiveStore.");
+ $this->assertTrue($menu_exists, "The menu was created in active storage.");
+ $this->assertTrue(menu_link_save($custom_menu_link), "The menu link was created in active storage.");
$config = 'menu_link.menu-configuration-test-menu.218.Top_Level_link_1';
- $results = ConfigurationManagement::exportToDataStore(array($config), TRUE, TRUE);
+ $results = ConfigurationManagement::exportToStaging(array($config), TRUE, TRUE);
$exported = $results->getInfo('exported');
$this->assertTrue(in_array('menu_link.menu-configuration-test-menu.218.Top_Level_link_1', $exported), "Configuration for menu_link.menu-configuration-test-menu.218.Top_Level_link_1 was exported.");
$this->assertTrue(in_array('menu.menu-configuration-test-menu', $exported), "Configuration for menu.menu-configuration-test-menu was exported.");
diff --git a/tests/handlers/vocabularies.test b/tests/handlers/vocabularies.test
index 032d767..4350788 100644
--- a/tests/handlers/vocabularies.test
+++ b/tests/handlers/vocabularies.test
@@ -52,10 +52,10 @@ class ConfigurationHandlerVariableTestCase extends ConfigurationWebTestCase {
$this->assertTrue(in_array($config, $imported), "Configuration for $config was imported.");
$vocabulary_exists = db_query('SELECT 1 FROM {taxonomy_vocabulary} WHERE machine_name = :machine_name', array(':machine_name' => 'tags'))->fetchField();
- $this->assertTrue($vocabulary_exists, "The vocabulary was saved in the ActiveStore.");
+ $this->assertTrue($vocabulary_exists, "The vocabulary was saved in active storage.");
}
- public function testExportToDataStore() {
+ public function testExportToStaging() {
$vocabulary = new stdClass();
$vocabulary->name = $this->randomName();
$vocabulary->description = $this->randomName();
@@ -66,10 +66,10 @@ class ConfigurationHandlerVariableTestCase extends ConfigurationWebTestCase {
taxonomy_vocabulary_save($vocabulary);
$vocabulary_exists = db_query('SELECT 1 FROM {taxonomy_vocabulary} WHERE machine_name = :machine_name', array(':machine_name' => $vocabulary->machine_name))->fetchField();
- $this->assertTrue($vocabulary_exists, "The vocabulary was saved in the ActiveStore.");
+ $this->assertTrue($vocabulary_exists, "The vocabulary was saved in active storage.");
$config = 'vocabulary.' . $vocabulary->machine_name;
- $results = ConfigurationManagement::exportToDataStore(array($config), FALSE, FALSE);
+ $results = ConfigurationManagement::exportToStaging(array($config), FALSE, FALSE);
$exported = $results->getInfo('exported');
$this->assertTrue(in_array($config, $exported), "Configuration for $config was exported.");
diff --git a/ui/configuration_ui.admin.inc b/ui/configuration_ui.admin.inc
index 2334e83..162e794 100644
--- a/ui/configuration_ui.admin.inc
+++ b/ui/configuration_ui.admin.inc
@@ -21,29 +21,29 @@ function configuration_ui_tracking_form($form, &$form_state) {
if (!empty($form_state['component_exists'])) {
$form['buttons'] = array('#theme' => 'configuration_ui_form_buttons', '#tree' => FALSE);
- // Do not allow writing to datastore if on remote server.
+ // Do not allow writing to staging if on remote server.
if (variable_get('configuration_remote_server', 0) < 1) {
$form['buttons']['submit'] = array(
'#type' => 'submit',
- '#value' => t('Write Activestore to Datastore'),
- '#submit' => array('configuration_ui_export_to_datastore_form_submit'),
+ '#value' => t('Write active configuration to staging'),
+ '#submit' => array('configuration_ui_export_to_staging_form_submit'),
);
}
else {
$form['buttons']['export'] = array(
'#type' => 'submit',
- '#value' => t('Export All Tracked Configurations'),
- '#submit' => array('configuration_ui_export_traked_to_tar_file_form_submit'),
+ '#value' => t('Export all tracked configurations'),
+ '#submit' => array('configuration_ui_export_tracked_to_tar_file_form_submit'),
);
}
$form['buttons']['stop_tracking'] = array(
'#type' => 'submit',
- '#value' => t('Stop Tracking'),
+ '#value' => t('Stop tracking'),
'#submit' => array('configuration_ui_stop_tracking_form_submit'),
);
$form['buttons']['import'] = array(
'#type' => 'submit',
- '#value' => t('Import Datastore to Activestore'),
+ '#value' => t('Import from staging'),
'#submit' => array('configuration_ui_activate_form_submit'),
);
}
@@ -348,7 +348,7 @@ function configuration_ui_config_status($component) {
*/
function configuration_ui_config_diff($config_id) {
$activestore = ConfigurationManagement::createConfigurationInstance($config_id);
- $datastore = ConfigurationManagement::createConfigurationInstance($config_id);
+ $staging = ConfigurationManagement::createConfigurationInstance($config_id);
drupal_add_css(drupal_get_path('module', 'configuration_ui') . '/theme/configuration.css');
@@ -362,11 +362,11 @@ function configuration_ui_config_diff($config_id) {
$rows[] = array();
- $diff = new Diff(explode("\n", $datastore->loadFromStorage()->raw()), explode("\n", $activestore->loadFromActiveStore()->raw()));
+ $diff = new Diff(explode("\n", $staging->loadFromStorage()->raw()), explode("\n", $activestore->loadFromActiveStore()->raw()));
$rows = array_merge($rows, $formatter->format($diff));
$header = array(
- array('data' => t('Datastore'), 'colspan' => 2),
+ array('data' => t('Staging'), 'colspan' => 2),
array('data' => t('Activestore'), 'colspan' => 2),
);
$output .= theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('class' => array('diff', 'configuration-diff'))));
@@ -469,13 +469,13 @@ function configuration_ui_start_tracking_single_confirm_submit($form, &$form_sta
}
/**
- * Submit handler for export to datastore.
+ * Submit handler for export to staging.
*/
-function configuration_ui_export_to_datastore_form_submit($form, &$form_state) {
+function configuration_ui_export_to_staging_form_submit($form, &$form_state) {
$args = configuration_ui_get_form_components($form, $form_state);
$export_dependencies = $form_state['values']['include_dependencies'];
$export_optionals = $form_state['values']['include_optionals'];
- $result = ConfigurationManagement::exportToDataStore($args, $export_dependencies, $export_optionals, TRUE);
+ $result = ConfigurationManagement::exportToStaging($args, $export_dependencies, $export_optionals, TRUE);
$configurations = $result->getInfo('exported');
if (!empty($configurations)) {
foreach ($configurations as $configuration) {
@@ -538,7 +538,7 @@ function configuration_ui_export_to_tar_file_form_submit($form, &$form_state) {
/**
* Submit handler for export tracked configurations to a tar file.
*/
-function configuration_ui_export_traked_to_tar_file_form_submit($form, &$form_state) {
+function configuration_ui_export_tracked_to_tar_file_form_submit($form, &$form_state) {
$args = array();
//get tracked file
$tracked = ConfigurationManagement::trackedConfigurations();
@@ -565,7 +565,7 @@ function configuration_ui_import_form_submit($form, &$form_state) {
file_delete($file);
$imported = $settings->getInfo('imported');
if (!empty($imported)) {
- drupal_set_message(t('The following configurations have been migrated into the ActiveStore:'));
+ drupal_set_message(t('The following configurations have been migrated to active storage:'));
$imported = $optionals = array('items' => $imported);
drupal_set_message(filter_xss(theme('item_list', $imported), array('ul', 'li')));
}
@@ -582,7 +582,7 @@ function configuration_ui_sync_form($form, &$form_state) {
'#title' => t('Configuration Operations'),
'#collapsible' => TRUE,
'#collapsed' => FALSE,
- '#description' => '' . t('Updates the tracked configurations using the configurations defined in tracked.inc file. You should click on this button every time you update the DataStore and want to see the changes materialized in your site.') . '
',
+ '#description' => '
' . t('Updates the tracked configurations using the configurations defined in tracked.inc file. You should click on this button every time you update staging and want to see the changes materialized in your site.') . '
',
);
$form['configuration_ops']['sync_configurations'] = array(
'#type' => 'submit',
@@ -592,7 +592,7 @@ function configuration_ui_sync_form($form, &$form_state) {
$form['configuration_ops']['preserve_tracked'] = array(
'#type' => 'checkbox',
'#title' => t('Preserve tracked configurations.'),
- '#description' => '
' . t('If checked, all the configurations current being tracked will still be tracked even if they are not in listed in the tracked.inc file of your DataStore. If not checked, those configurations that are not listed in the configuration.inc file and are currently being tracked will be automatically untracked.') . '
',
+ '#description' => '
' . t('If checked, all the configurations currently being tracked will still be tracked even if they are not in listed in the tracked.inc file on staging. If not checked, those configurations that are not listed in the configuration.inc file and are currently being tracked will be automatically untracked.') . '
',
'#default_value' => TRUE,
);
@@ -613,8 +613,8 @@ function configuration_ui_settings_form($form, &$form_state) {
$form['general_settings']['configuration_config_path'] = array(
'#type' => 'textfield',
- '#title' => t('Configuration directory configs are stored in.'),
- '#description' => t('Configuration directory to store config files. This defaults to inside the files directory for easy write access. Since most users ignore the files directory in their VCS, you may want to set this outside of your files directory so that configs are included in version control.'),
+ '#title' => t('Configuration staging directory.'),
+ '#description' => t('Defaults to inside the files directory for easy write access. Since most users ignore the files directory in their VCS, you may want to set this outside of your files directory so that configs are included in version control.'),
'#size' => 40,
'#maxlength' => 255,
'#default_value' => variable_get('configuration_config_path', conf_path() . '/files/config'),
@@ -623,7 +623,7 @@ function configuration_ui_settings_form($form, &$form_state) {
$form['general_settings']['configuration_remote_server'] = array(
'#type' => 'checkbox',
'#title' => t('This is a remote server'),
- '#description' => t('If this is a remote server and you do not have access to the filesystem of this server, the ability to write files to datastore should not be allowed.'),
+ '#description' => t('If this is a remote server and you do not have access to the filesystem of this server, the ability to write files to staging should not be allowed.'),
'#default_value' => variable_get('configuration_remote_server', -1),
);