diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php index b3d7b84..e2a03a7 100644 --- a/core/lib/Drupal/Core/DrupalKernel.php +++ b/core/lib/Drupal/Core/DrupalKernel.php @@ -521,7 +521,7 @@ protected function buildContainer() { // default language can be configured using the configuration factory. This // avoids the circular dependencies that would created by // \Drupal\language\LanguageServiceProvider::alter() and allows the default - // language to not be english in the installer. + // language to not be English in the installer. $system = BootstrapConfigStorageFactory::get()->read('system.site'); $default_language_values = Language::$defaultValues; if ($default_language_values['id'] != $system['langcode']) { diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigLanguageOverride.php b/core/modules/config/lib/Drupal/config/Tests/ConfigLanguageOverride.php index 4da038c..2f93950 100644 --- a/core/modules/config/lib/Drupal/config/Tests/ConfigLanguageOverride.php +++ b/core/modules/config/lib/Drupal/config/Tests/ConfigLanguageOverride.php @@ -47,7 +47,7 @@ function testConfigLanguageOverride() { // \Drupal\language\LanguageServiceProvider::alter() calls // \Drupal\Core\Config\ConfigFactory::setLanguageFromDefault() to set the // language when the Language module is enabled. This test ensures that - // english overrides work. + // English overrides work. \Drupal::configFactory()->setLanguageFromDefault(\Drupal::service('language.default')); $config = \Drupal::config('config_test.system'); $this->assertIdentical($config->get('foo'), 'en bar'); diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigLanguageOverrideWebTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigLanguageOverrideWebTest.php index 30cba5a..3ffb54f 100644 --- a/core/modules/config/lib/Drupal/config/Tests/ConfigLanguageOverrideWebTest.php +++ b/core/modules/config/lib/Drupal/config/Tests/ConfigLanguageOverrideWebTest.php @@ -66,8 +66,8 @@ function testSiteNameTranslation() { $this->drupalGet('xx'); $this->assertText('XX site name'); - // Set the xx language to be the default language and delete the english - // language so the site is no longer multi-lingual and confirm configuration + // Set the xx language to be the default language and delete the English + // language so the site is no longer multilingual and confirm configuration // overrides still work. $language_manager = \Drupal::languageManager()->reset(); $this->assertTrue($language_manager->isMultilingual(), 'The test site is multilingual.'); diff --git a/core/modules/language/lib/Drupal/language/LanguageServiceProvider.php b/core/modules/language/lib/Drupal/language/LanguageServiceProvider.php index a37a612..8c11eca 100644 --- a/core/modules/language/lib/Drupal/language/LanguageServiceProvider.php +++ b/core/modules/language/lib/Drupal/language/LanguageServiceProvider.php @@ -55,9 +55,9 @@ public function alter(ContainerBuilder $container) { ->addArgument(new Reference('module_handler')); if ($default_language_values = $this->getDefaultLanguageValues()) { $container->setParameter('language.default_values', $default_language_values); - // Ensure that configuration is can be localised if site is monolingual - // but the Language module is enabled. This will the case for monolingual - // sites not in english. + // Ensure that configuration can be localised if the site is monolingual + // but the Language module is enabled. This is the case for monolingual + // sites not in English. $definition = $container->getDefinition('config.factory'); $definition->addMethodCall('setLanguageFromDefault', array(new Reference('language.default'))); }