diff --git a/includes/media.fields.inc b/includes/media.fields.inc index 5fb04b0..0f33635 100644 --- a/includes/media.fields.inc +++ b/includes/media.fields.inc @@ -119,9 +119,8 @@ function media_field_widget_form(&$form, &$form_state, $field, $instance, $langc '#extended' => TRUE, ); - // If entity translation is enabled for the entity, store its form/source - // langcodes on the elements for further usage in - /* @see media_element_process() */ + // If translation is enabled for the entity, store its form/source langcodes + // on the elements for further usage in media_element_process(). if (module_invoke('entity_translation', 'enabled', $element['#entity_type'], $element['#entity'])) { $translation_handler = entity_translation_get_handler($element['#entity_type'], $element['#entity']); $element['#media_parent_entity_form_langcode'] = $translation_handler->getFormLanguage(); @@ -129,6 +128,10 @@ function media_field_widget_form(&$form, &$form_state, $field, $instance, $langc $element['#media_parent_entity_source_langcode'] = $source_langcode; } } + elseif (module_exists('translation') && $element['#entity_type'] == 'node' && translation_supported_type($element['#entity']->type)) { + $element['#media_parent_entity_form_langcode'] = $element['#entity']->language; + $element['#media_parent_entity_source_langcode'] = $element['#entity']->language; + } // Add image field specific validators. if ($field['type'] == 'image') {