diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index 2e1c257..9995c82 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -2651,12 +2651,12 @@ function language_list($flags = LANGUAGE_CONFIGURABLE) { if (language_multilingual() || module_exists('language')) { // Use language module configuration if available. Always reset the entity // cache as the language objects are statically cached. - $language_entities = entity_load_multiple('language', NULL, TRUE); + $language_entities = entity_load_multiple('language_entity', NULL, TRUE); uasort($language_entities, function ($a, $b) { $a_weight = isset($a->weight) ? $a->weight : 0; $b_weight = isset($b->weight) ? $b->weight : 0; if ($a_weight == $b_weight) { - return strnatcasecmp($a->name, $b->name); + return strnatcasecmp($a->label, $b->label); } return ($a_weight < $b_weight) ? -1 : 1; }); @@ -2665,9 +2665,9 @@ function language_list($flags = LANGUAGE_CONFIGURABLE) { // save the same object without data loss. foreach ($language_entities as $langcode => $info) { $languages[$langcode] = new Language(array( - 'default' => ($langcode == $default->langcode), - 'name' => $info->name, - 'langcode' => $langcode, + 'default' => ($info->id() == $default->langcode), + 'name' => $info->label(), + 'langcode' => $info->id(), 'direction' => $info->direction, 'locked' => $info->locked, 'weight' => $info->weight, diff --git a/core/modules/language/language.install b/core/modules/language/language.install index 33624c7..c09686c 100644 --- a/core/modules/language/language.install +++ b/core/modules/language/language.install @@ -83,7 +83,7 @@ function language_update_8000() { foreach ($result as $language) { config('language.entity.' . $language->langcode) ->set('id', $language->langcode) - ->set('name', $language->name) + ->set('label', $language->name) ->set('direction', $language->direction) ->set('weight', $language->weight) ->set('locked', $language->locked) diff --git a/core/modules/language/language.module b/core/modules/language/language.module index 9bc2b9f..9a020ce 100644 --- a/core/modules/language/language.module +++ b/core/modules/language/language.module @@ -473,10 +473,10 @@ function language_get_default_langcode($entity_type, $bundle) { * configuration properties. */ function language_save($language) { - $language_entity = entity_load('language', $language->langcode); + $language_entity = entity_load('language_entity', $language->langcode); if (!$language_entity) { $language->is_new = TRUE; - $language_entity = entity_create('language', array( + $language_entity = entity_create('language_entity', array( 'id' => $language->langcode, )); } @@ -487,7 +487,7 @@ function language_save($language) { // Let other modules modify $language before saved. module_invoke_all('language_presave', $language); - $language_entity->name = isset($language->name) ? $language->name : ''; + $language_entity->label = isset($language->name) ? $language->name : ''; $language_entity->direction = isset($language->direction) ? $language->direction : '0'; $language_entity->locked = isset($language->locked) ? $language->locked : '0'; $language_entity->weight = isset($language->weight) ? $language->weight : '0'; @@ -536,7 +536,7 @@ function language_save($language) { */ function language_update_count() { $count = 0; - $languages = entity_load_multiple('language', NULL, TRUE); + $languages = entity_load_multiple('language_entity', NULL, TRUE); foreach ($languages as $language) { if (!$language->locked) { $count++; @@ -562,7 +562,7 @@ function language_delete($langcode) { module_invoke_all('language_delete', $language); // Remove the language. - entity_delete_multiple('language', array($language->langcode)); + entity_delete_multiple('language_entity', array($language->langcode)); language_update_count(); @@ -872,7 +872,7 @@ function language_update_locked_weights() { $max_weight = 0; // Get maximum weight to update the system languages to keep them on bottom. - $languages = entity_load_multiple('language', NULL, TRUE); + $languages = entity_load_multiple('language_entity', NULL, TRUE); foreach ($languages as $language) { if (!$language->locked && $language->weight > $max_weight) { $max_weight = $language->weight; diff --git a/core/modules/language/lib/Drupal/language/LanguageInterface.php b/core/modules/language/lib/Drupal/language/LanguageInterface.php new file mode 100644 index 0000000..35db887 --- /dev/null +++ b/core/modules/language/lib/Drupal/language/LanguageInterface.php @@ -0,0 +1,17 @@ +locked && $language->weight > $max_weight) { $max_weight = $language->weight; diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php b/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php index 7380c20..89b9fa7 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php @@ -40,7 +40,7 @@ function testEnableWithoutDependency() { $this->assertModules(array('translation_entity', 'language'), TRUE); // Assert that the language YAML files were created. - $storage = drupal_container()->get('config.storage'); + $storage = $this->container->get('config.storage'); $this->assertTrue(count($storage->listAll('language.entity.')) > 0, 'Language config entity files exist.'); }