diff --git a/core/lib/Drupal/Core/Config/ConfigImporter.php b/core/lib/Drupal/Core/Config/ConfigImporter.php index 007282e..715138f 100644 --- a/core/lib/Drupal/Core/Config/ConfigImporter.php +++ b/core/lib/Drupal/Core/Config/ConfigImporter.php @@ -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; diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php index 627bb83..ad5f0d1 100644 --- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php +++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php @@ -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(); } diff --git a/core/lib/Drupal/Core/Config/StorageComparer.php b/core/lib/Drupal/Core/Config/StorageComparer.php index b720abb..e3e42d8 100644 --- a/core/lib/Drupal/Core/Config/StorageComparer.php +++ b/core/lib/Drupal/Core/Config/StorageComparer.php @@ -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 { diff --git a/core/lib/Drupal/Core/Extension/ModuleInstaller.php b/core/lib/Drupal/Core/Extension/ModuleInstaller.php index 20a6506..c77dd34 100644 --- a/core/lib/Drupal/Core/Extension/ModuleInstaller.php +++ b/core/lib/Drupal/Core/Extension/ModuleInstaller.php @@ -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(); diff --git a/core/modules/config/src/Form/ConfigSync.php b/core/modules/config/src/Form/ConfigSync.php old mode 100644 new mode 100755 index dd271a3..58451e7 --- a/core/modules/config/src/Form/ConfigSync.php +++ b/core/modules/config/src/Form/ConfigSync.php @@ -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) { diff --git a/core/modules/config/src/Tests/AssertConfigEntityImportTrait.php b/core/modules/config/src/Tests/AssertConfigEntityImportTrait.php index 0f8ad2b..6d9b298 100644 --- a/core/modules/config/src/Tests/AssertConfigEntityImportTrait.php +++ b/core/modules/config/src/Tests/AssertConfigEntityImportTrait.php @@ -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. diff --git a/core/modules/language/src/Tests/LanguageConfigOverrideImportTest.php b/core/modules/language/src/Tests/LanguageConfigOverrideImportTest.php index a39899d..cedfb96 100644 --- a/core/modules/language/src/Tests/LanguageConfigOverrideImportTest.php +++ b/core/modules/language/src/Tests/LanguageConfigOverrideImportTest.php @@ -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. diff --git a/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php b/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php index 5497ee8..63b1ce6 100644 --- a/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php +++ b/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php @@ -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 */