diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index 88f48c25593e2c67ad087620be707cfe1ed0d8b3..91ca3497f128b3f464a5ee76e358533316b7a480 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -216,18 +216,6 @@ */ const LANGUAGE_NOT_APPLICABLE = 'zxx'; -/** - * The language code used when multiple languages could be applied. - * - * Should be used when individual parts of the data cannot be marked with - * language, but we know there are multiple languages involved. Such as a - * PDF file for an electronic appliance, which has usage manuals in 8 - * languages but is uploaded as one file in Drupal. - * - * Defined by ISO639-2 for "Multiple languages". - */ -const LANGUAGE_MULTIPLE = 'mul'; - /** * Language code referring to the default language of data, e.g. of an entity. * @@ -2763,11 +2751,6 @@ function language_default_locked_languages($weight = 0) { 'name' => t('Not applicable'), 'weight' => ++$weight, ) + $locked_language); - $languages[LANGUAGE_MULTIPLE] = new Language(array( - 'langcode' => LANGUAGE_MULTIPLE, - 'name' => t('Multiple'), - 'weight' => ++$weight, - ) + $locked_language); return $languages; } diff --git a/core/modules/language/language.admin.inc b/core/modules/language/language.admin.inc index 1872146bba9cb67af871b1c8580309052a52cecc..14bbeb7a8177d7ca8563a2bb3a652f08904b2c51 100644 --- a/core/modules/language/language.admin.inc +++ b/core/modules/language/language.admin.inc @@ -40,9 +40,6 @@ function language_admin_overview_form($form, &$form_state) { case LANGUAGE_NOT_SPECIFIED: $description = t('Use this when the language is not (yet) known.'); break; - case LANGUAGE_MULTIPLE: - $description = t('Use this when multiple languages can be assigned, such as a multilingual PDF.'); - break; } if (!empty($description)) { $title .= '<div class="description">' . $description . '</div>'; diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageListTest.php b/core/modules/language/lib/Drupal/language/Tests/LanguageListTest.php index 54a5f0ef8fe62d3c5fa6c0d71e7bf2cd3db006c7..9128bf720530b5ef03a97a6b581069564a46d002 100644 --- a/core/modules/language/lib/Drupal/language/Tests/LanguageListTest.php +++ b/core/modules/language/lib/Drupal/language/Tests/LanguageListTest.php @@ -177,8 +177,8 @@ function testLanguageStates() { language_save(new Language(array('name' => $this->randomName(), 'langcode' => 'l2', 'locked' => TRUE))); language_save(new Language(array('name' => $this->randomName(), 'langcode' => 'l3'))); language_save(new Language(array('name' => $this->randomName(), 'langcode' => 'l4', 'locked' => TRUE))); - $expected_locked_languages = array('l4' => 'l4', 'l2' => 'l2', 'und' => 'und', 'zxx' => 'zxx', 'mul' => 'mul'); - $expected_all_languages = array('l4' => 'l4', 'l3' => 'l3', 'l2' => 'l2', 'l1' => 'l1', 'en' => 'en', 'und' => 'und', 'zxx' => 'zxx', 'mul' => 'mul'); + $expected_locked_languages = array('l4' => 'l4', 'l2' => 'l2', 'und' => 'und', 'zxx' => 'zxx'); + $expected_all_languages = array('l4' => 'l4', 'l3' => 'l3', 'l2' => 'l2', 'l1' => 'l1', 'en' => 'en', 'und' => 'und', 'zxx' => 'zxx'); $expected_conf_languages = array('l3' => 'l3', 'l1' => 'l1', 'en' => 'en'); $locked_languages = language_list(LANGUAGE_LOCKED);