diff --git a/core/modules/language/language.install b/core/modules/language/language.install index 0ff2912..3738831 100644 --- a/core/modules/language/language.install +++ b/core/modules/language/language.install @@ -19,8 +19,10 @@ function language_install() { $language_manager = \Drupal::languageManager(); if ($language_manager instanceof ConfigurableLanguageManagerInterface) { $negotiator = \Drupal::service('language_negotiator'); + $types = $language_manager->getLanguageTypes(); + $negotiator->updateConfiguration($types); // Enable URL language detection for each configurable language type. - foreach ($language_manager->getLanguageTypes() as $type) { + foreach ($types as $type) { $negotiator->saveConfiguration($type, array(LanguageNegotiationUrl::METHOD_ID => 0)); } } diff --git a/core/modules/language/lib/Drupal/language/ConfigurableLanguageManager.php b/core/modules/language/lib/Drupal/language/ConfigurableLanguageManager.php index 873bf7a..9dfacdc 100644 --- a/core/modules/language/lib/Drupal/language/ConfigurableLanguageManager.php +++ b/core/modules/language/lib/Drupal/language/ConfigurableLanguageManager.php @@ -247,6 +247,7 @@ public function getNegotiator() { public function setNegotiator(LanguageNegotiatorInterface $negotiator) { $this->negotiator = $negotiator; $this->reset(); + // TODO is this necessary? $this->init(); } diff --git a/core/modules/language/tests/language_elements_test/language_elements_test.info.yml b/core/modules/language/tests/language_elements_test/language_elements_test.info.yml index 9fc44c1..254c5f6 100644 --- a/core/modules/language/tests/language_elements_test/language_elements_test.info.yml +++ b/core/modules/language/tests/language_elements_test/language_elements_test.info.yml @@ -4,4 +4,4 @@ description: 'Support module for the language form elements tests.' core: 8.x package: Testing version: VERSION -#hidden: true +hidden: true