diff --git a/core/modules/language/language.admin.inc b/core/modules/language/language.admin.inc index 11c6e62..d0bbfdd 100644 --- a/core/modules/language/language.admin.inc +++ b/core/modules/language/language.admin.inc @@ -1057,7 +1057,7 @@ function language_content_settings_form(array $form, array $form_state, array $s // Check whether we have any custom setting. foreach (entity_get_bundles($entity_type) as $bundle) { $conf = language_get_default_configuration($entity_type, $bundle); - if (empty($conf['language_hidden']) || $conf['langcode'] != 'site_default') { + if (!empty($conf['language_show']) || $conf['langcode'] != 'site_default') { $default[$entity_type] = $entity_type; } $language_configuration[$entity_type][$bundle] = $conf; diff --git a/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationSettingsTest.php b/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationSettingsTest.php index 2157b98..80d4202 100644 --- a/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationSettingsTest.php +++ b/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationSettingsTest.php @@ -70,7 +70,7 @@ function testSettingsUI() { $edit = array( 'entity_types[comment]' => TRUE, 'settings[comment][comment_node_article][settings][language][langcode]' => LANGUAGE_NOT_SPECIFIED, - 'settings[comment][comment_node_article][settings][language][language_hidden]' => TRUE, + 'settings[comment][comment_node_article][settings][language][language_show]' => FALSE, 'settings[comment][comment_node_article][translatable]' => TRUE, 'settings[comment][comment_node_article][fields][comment_body]' => TRUE, ); @@ -82,7 +82,7 @@ function testSettingsUI() { $edit = array( 'entity_types[comment]' => TRUE, 'settings[comment][comment_node_article][settings][language][langcode]' => 'current_interface', - 'settings[comment][comment_node_article][settings][language][language_hidden]' => FALSE, + 'settings[comment][comment_node_article][settings][language][language_show]' => TRUE, 'settings[comment][comment_node_article][translatable]' => TRUE, 'settings[comment][comment_node_article][fields][comment_body]' => TRUE, ); @@ -93,7 +93,7 @@ function testSettingsUI() { // Test that language settings are correctly stored. $language_configuration = language_get_default_configuration('comment', 'comment_node_article'); $this->assertEqual($language_configuration['langcode'], 'current_interface', 'The default language for article comments is set to the current interface language.'); - $this->assertFalse($language_configuration['language_hidden'], 'The language selector for article comments is shown.'); + $this->assertTrue($language_configuration['language_show'], 'The language selector for article comments is shown.'); } /** diff --git a/core/modules/translation_entity/translation_entity.admin.inc b/core/modules/translation_entity/translation_entity.admin.inc index b6ceba0..c4f5277 100644 --- a/core/modules/translation_entity/translation_entity.admin.inc +++ b/core/modules/translation_entity/translation_entity.admin.inc @@ -75,7 +75,7 @@ function translation_entity_form_language_content_settings_validate(array $form, } $values = $bundle_settings['settings']['language']; - if (language_is_locked($values['langcode']) && $values['language_hidden']) { + if (language_is_locked($values['langcode']) && empty($values['language_show'])) { foreach (language_list(LANGUAGE_LOCKED) as $language) { $locked_languages[] = $language->name; } diff --git a/core/modules/translation_entity/translation_entity.admin.js b/core/modules/translation_entity/translation_entity.admin.js index 7ea51bb..2f9f49f 100644 --- a/core/modules/translation_entity/translation_entity.admin.js +++ b/core/modules/translation_entity/translation_entity.admin.js @@ -22,7 +22,7 @@ Drupal.behaviors.translationEntity = { var $bundleSettings = $target.closest('.bundle-settings'); var $fieldSettings = $bundleSettings.nextUntil('.bundle-settings'); if ($target.is(':checked')) { - $bundleSettings.find('.operations :input[name$="[language_hidden]"]').attr('checked', false); + $bundleSettings.find('.operations :input[name$="[language_show]"]').attr('checked', true); $fieldSettings.find('.translatable :input').attr('checked', true); $fieldSettings.show(); }