diff --git a/core/modules/language/language.module b/core/modules/language/language.module index 1c96ac2..735bb58 100644 --- a/core/modules/language/language.module +++ b/core/modules/language/language.module @@ -225,16 +225,11 @@ function language_process_language_select($element) { $element['#options'][$langcode] = $language->locked ? t('- @name -', array('@name' => $language->name)) : $language->name; } } - // Add the language from the default value to #options when two conditions - // exist: 1) the element has a default value set 2) The default value is not - // already in #options - if (isset($element['#default_value']) && !isset($element['#options'][$element['#default_value']])) { - $list = \Drupal\Core\Language\LanguageManager::getStandardLanguageList(); - $langcode = $element['#default_value']; - if (isset($list[$langcode])) { - // Prepend the default language at the beginning of the list. - $element['#options'] = array($langcode => $list[$langcode][0]) + $element['#options']; - } + // Add "Built-in English" language to the select when the default value is + // set to english but it does not exist in the options list. + if (isset($element['#default_value']) && $element['#default_value'] == 'en' && !isset($element['#options']['en'])) { + // Prepend the default language at the beginning of the list. + $element['#options'] = array('en' => t('Built-in English')) + $element['#options']; } return $element; }