diff --git a/core/modules/node/node.module b/core/modules/node/node.module index bde18d2..5d67784 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -644,8 +644,6 @@ function node_type_get_default_langcode($node_type) { return LANGUAGE_NOT_SPECIFIED; } - drupal_container()->get(LANGUAGE_TYPE_CONTENT); - switch ($default_value) { case 'site_default': $default_value = language_default()->langcode; diff --git a/core/modules/translation/language_types.js b/core/modules/translation/language_types.js new file mode 100644 index 0000000..0fe5f3d --- /dev/null +++ b/core/modules/translation/language_types.js @@ -0,0 +1,7 @@ +jQuery(document).ready(function() { + jQuery("form select[name='node_type_language_default']").change( function(data) { + if (data.target.value == 'zxx' || data.target.value == 'und' || data.target.value == 'mul') { + jQuery(".form-item-node-type-language-translation-enabled").hide(); + } else { jQuery(".form-item-node-type-language-translation-enabled").show(); }; + }) +}); diff --git a/core/modules/translation/translation.module b/core/modules/translation/translation.module index 8148cf0..2654aac 100644 --- a/core/modules/translation/translation.module +++ b/core/modules/translation/translation.module @@ -119,6 +119,11 @@ function translation_permission() { * Implements hook_form_FORM_ID_alter() for node_type_form(). */ function translation_form_node_type_form_alter(&$form, &$form_state) { + // Hide form element if default language is a constant. + // TODO: When form #states allows OR values change this to use form #states. + $form['#attached']['js'] = array( + drupal_get_path('module', 'translation') . '/language_types.js', + ); // Add translation option to content type form. $form['language']['node_type_language_translation_enabled'] = array( '#type' => 'checkbox', @@ -126,11 +131,6 @@ function translation_form_node_type_form_alter(&$form, &$form_state) { '#return_value' => TRANSLATION_ENABLED, '#default_value' => variable_get('node_type_language_translation_enabled_' . $form['#node_type']->type, FALSE), '#element_validate' => array('translation_node_type_language_translation_enabled_validate'), - '#states' => array( - 'invisible' => array( - ':input[name="node_type_language_default"]' => array('value' => 'und'), - ), - ), ); }