diff --git a/core/lib/Drupal/Core/Language/LanguageManager.php b/core/lib/Drupal/Core/Language/LanguageManager.php index ff2aa56..581e6b4 100644 --- a/core/lib/Drupal/Core/Language/LanguageManager.php +++ b/core/lib/Drupal/Core/Language/LanguageManager.php @@ -130,7 +130,7 @@ public function getLanguages($flags = LanguageInterface::STATE_CONFIGURABLE) { // Filter the full list of languages based on the value of the $all flag. By // default we remove the locked languages, but the caller may request for // those languages to be added as well. - return $this->languageFilter($languages, $flags); + return $this->filterLanguages($languages, $flags); } /** @@ -371,7 +371,7 @@ public function getConfigOverrideLanguage() { * @return \Drupal\Core\Language\LanguageInterface[] * An associative array of languages, keyed by the language code. */ - protected function languageFilter(array $languages, $flags = LanguageInterface::STATE_CONFIGURABLE) { + protected function filterLanguages(array $languages, $flags = LanguageInterface::STATE_CONFIGURABLE) { $filtered_languages = array(); // Add the site's default language if flagged as allowed value. if ($flags & LanguageInterface::STATE_SITE_DEFAULT) { diff --git a/core/modules/language/src/ConfigurableLanguageManager.php b/core/modules/language/src/ConfigurableLanguageManager.php index 354616f..7dff690 100644 --- a/core/modules/language/src/ConfigurableLanguageManager.php +++ b/core/modules/language/src/ConfigurableLanguageManager.php @@ -283,7 +283,7 @@ public function getLanguages($flags = LanguageInterface::STATE_CONFIGURABLE) { // Sort the language list by weight then title. Language::sort($languages); - return $this->languageFilter($languages, $flags); + return $this->filterLanguages($languages, $flags); } /** diff --git a/core/modules/language/tests/language_test/language_test.module b/core/modules/language/tests/language_test/language_test.module index 0a89198..17cad00 100644 --- a/core/modules/language/tests/language_test/language_test.module +++ b/core/modules/language/tests/language_test/language_test.module @@ -96,5 +96,5 @@ function language_test_language_fallback_candidates_test_alter(array &$candidate * Implements hook_module_preinstall(). */ function language_test_module_preinstall() { - \Drupal::state()->set('language_test.language_count_preinstall', count(\Drupal::languageManager()->getLanguages())); + \Drupal::state()->set('language_test.language_count_preinstall', count(\Drupal::configFactory()->listAll('language.entity.'))); }