diff --git a/core/modules/content_translation/src/ContentTranslationHandler.php b/core/modules/content_translation/src/ContentTranslationHandler.php
index 1aae420..030b55e 100644
--- a/core/modules/content_translation/src/ContentTranslationHandler.php
+++ b/core/modules/content_translation/src/ContentTranslationHandler.php
@@ -12,6 +12,7 @@
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageInterface;
+use Drupal\Core\Language\LanguageManager;
 use Drupal\Core\Render\Element;
 
 /**
@@ -158,7 +159,7 @@ public function entityFormAlter(array &$form, FormStateInterface $form_state, En
       $language_select = &$language_widget['widget'][0]['value'];
       if ($language_select['#type'] == 'language_select') {
         $options = array();
-        foreach (language_list(LanguageInterface::STATE_CONFIGURABLE) as $language) {
+        foreach (\Drupal::languageManager()->getLanguages() as $language) {
           // Show the current language, and the languages for which no
           // translation already exists.
           if (empty($translations[$language->getId()]) || $language->getId() == $entity_langcode) {
@@ -168,7 +169,6 @@ public function entityFormAlter(array &$form, FormStateInterface $form_state, En
         $language_select['#options'] = $options;
       }
     }
-
     if ($is_translation) {
       if (isset($language_widget)) {
         $language_widget['#access'] = FALSE;
diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index 9d86940..f32fed2 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -20,7 +20,6 @@
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Access\AccessResult;
 
-
 /**
  * Implements hook_help().
  */
@@ -182,7 +181,8 @@ function language_process_language_select($element) {
  */
 function language_entity_base_field_info_alter(&$fields) {
   foreach ($fields as $definition) {
-    if ($definition->getType() == 'language' && ($options = $definition->getDisplayOptions('form'))) {
+    // Set configurable form display for language fields with display options.
+    if ($definition->getType() == 'language' && $definition->getDisplayOptions('form')) {
       $definition->setDisplayConfigurable('form', TRUE);
     }
   }