Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1869292 by Gábor Hojtsy: Remove confusing 'multiple' language from core.

8.0.x
Dries 2012-12-19 15:35:47 -05:00
parent 2df1b2a2a9
commit d24c6ee7e8
3 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/includes/bootstrap.inc
View File

@ -216,18 +216,6 @@ const LANGUAGE_NOT_SPECIFIED = 'und';
*/ */
const LANGUAGE_NOT_APPLICABLE = 'zxx'; 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. * 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'), 'name' => t('Not applicable'),
'weight' => ++$weight, 'weight' => ++$weight,
) + $locked_language); ) + $locked_language);
$languages[LANGUAGE_MULTIPLE] = new Language(array(
'langcode' => LANGUAGE_MULTIPLE,
'name' => t('Multiple'),
'weight' => ++$weight,
) + $locked_language);
return $languages; return $languages;
} }

3
core/modules/language/language.admin.inc
View File

@ -40,9 +40,6 @@ function language_admin_overview_form($form, &$form_state) {
case LANGUAGE_NOT_SPECIFIED: case LANGUAGE_NOT_SPECIFIED:
$description = t('Use this when the language is not (yet) known.'); $description = t('Use this when the language is not (yet) known.');
break; break;
case LANGUAGE_MULTIPLE:
$description = t('Use this when multiple languages can be assigned, such as a multilingual PDF.');
break;
} }
if (!empty($description)) { if (!empty($description)) {
$title .= '<div class="description">' . $description . '</div>'; $title .= '<div class="description">' . $description . '</div>';

4
core/modules/language/lib/Drupal/language/Tests/LanguageListTest.php
View File

@ -177,8 +177,8 @@ class LanguageListTest extends WebTestBase {
language_save(new Language(array('name' => $this->randomName(), 'langcode' => 'l2', 'locked' => TRUE))); 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' => 'l3')));
language_save(new Language(array('name' => $this->randomName(), 'langcode' => 'l4', 'locked' => TRUE))); 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_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', 'mul' => 'mul'); $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'); $expected_conf_languages = array('l3' => 'l3', 'l1' => 'l1', 'en' => 'en');
$locked_languages = language_list(LANGUAGE_LOCKED); $locked_languages = language_list(LANGUAGE_LOCKED);