Commit a198ce63 authored by alexpott's avatar alexpott

Issue #2388925 by xjm, preshetin: British again invade config sync

parent 6031d0bb
......@@ -560,7 +560,7 @@ protected function processExtensions(array &$context) {
$operation = $this->getNextExtensionOperation();
if (!empty($operation)) {
$this->processExtension($operation['type'], $operation['op'], $operation['name']);
$context['message'] = t('Synchronising extensions: @op @name.', array('@op' => $operation['op'], '@name' => $operation['name']));
$context['message'] = t('Synchronizing extensions: @op @name.', array('@op' => $operation['op'], '@name' => $operation['name']));
$processed_count = count($this->processedExtensions['module']['install']) + count($this->processedExtensions['module']['uninstall']);
$processed_count += count($this->processedExtensions['theme']['uninstall']) + count($this->processedExtensions['theme']['install']);
$context['finished'] = $processed_count / $this->totalExtensionsToProcess;
......@@ -857,8 +857,8 @@ protected function checkOp($collection, $op, $name) {
case 'update':
if (!$target_exists) {
$this->logError($this->t('Update target "@name" is missing.', array('@name' => $name)));
// Mark as processed so that the synchronisation continues. Once the
// the current synchronisation is complete it will show up as a
// Mark as processed so that the synchronization continues. Once the
// the current synchronization is complete it will show up as a
// create.
$this->setProcessedConfiguration($collection, $op, $name);
return FALSE;
......
......@@ -304,7 +304,7 @@ public function preSave(EntityStorageInterface $storage) {
}
if (!$this->isSyncing()) {
// Ensure the correct dependencies are present. If the configuration is
// being written during a configuration synchronisation then there is no
// being written during a configuration synchronization then there is no
// need to recalculate the dependencies.
$this->calculateDependencies();
}
......
......@@ -262,7 +262,7 @@ protected function addChangelistUpdate($collection) {
if (isset($this->sourceData[$collection][$name]['uuid']) && $this->sourceData[$collection][$name]['uuid'] != $this->targetData[$collection][$name]['uuid']) {
// The entity has the same file as an existing entity but the UUIDs do
// not match. This means that the entity has been recreated so config
// synchronisation should do the same.
// synchronization should do the same.
$recreates[] = $name;
}
else {
......
......@@ -216,7 +216,7 @@ public function install(array $module_list, $enable_dependencies = TRUE) {
->setSourceStorage($source_storage);
}
else {
// If we're not in a config synchronisation reset the source storage
// If we're not in a config synchronization reset the source storage
// so that the extension install storage will pick up the new
// configuration.
$config_installer->resetSourceStorage();
......
......@@ -353,7 +353,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
* @param \Drupal\Core\Config\ConfigImporter $config_importer
* The batch config importer object to persist.
* @param string $sync_step
* The synchronisation step to do.
* The synchronization step to do.
* @param $context
* The batch context.
*/
......@@ -375,7 +375,7 @@ public static function processBatch(ConfigImporter $config_importer, $sync_step,
/**
* Finish batch.
*
* This function is a static function to avoid serialising the ConfigSync
* This function is a static function to avoid serializing the ConfigSync
* object unnecessarily.
*/
public static function finishBatch($success, $results, $operations) {
......
......@@ -10,7 +10,7 @@
use Drupal\Core\Config\Entity\ConfigEntityInterface;
/**
* Provides test assertions for testing config entity synchronisation.
* Provides test assertions for testing config entity synchronization.
*
* Can be used by test classes that extend \Drupal\simpletest\WebTestBase or
* \Drupal\simpletest\KernelTestBase.
......
......@@ -35,7 +35,7 @@ public function testConfigOverrideImport() {
// Uninstall the language module and its dependencies so we can test
// enabling the language module and creating overrides at the same time
// during a configuration synchronisation.
// during a configuration synchronization.
\Drupal::service('module_installer')->uninstall(array('language'));
// Ensure that the current site has no overrides registered to the
// ConfigFactory.
......
......@@ -13,7 +13,7 @@
use Drupal\simpletest\WebTestBase;
/**
* Tests importing renamed node type via configuration synchronisation.
* Tests importing renamed node type via configuration synchronization.
*
* @group node
*/
......
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