diff --git a/includes/entity.inline_entity_form.inc b/includes/entity.inline_entity_form.inc index 22e2fcf..6536630 100644 --- a/includes/entity.inline_entity_form.inc +++ b/includes/entity.inline_entity_form.inc @@ -284,7 +284,7 @@ class EntityInlineEntityFormController { */ protected function entityFormTranslation(&$entity_form) { if (($handler = module_invoke('entity_translation', 'get_handler', $this->entityType, $entity_form['#entity'])) && !$handler->isNewEntity()) { - $form_langcode = $handler->getFormLanguage(); + $form_langcode = $handler->getActiveLanguage(); $langcode = !empty($entity_form['#parent_language']) ? $entity_form['#parent_language'] : $handler->getLanguage(); $translations = $handler->getTranslations(); $update_langcode = $form_langcode && ($form_langcode != $langcode); @@ -399,7 +399,7 @@ class EntityInlineEntityFormController { if (isset($parent_info['entity keys']['language']) && isset($form_state['values'][$parent_info['entity keys']['language']])) { $entity->{$info['entity keys']['language']} = $form_state['values'][$parent_info['entity keys']['language']]; $handler = module_invoke('entity_translation', 'get_handler', $this->entityType, $entity); - $lang = $handler->getFormLanguage(); + $lang = $handler->getActiveLanguage(); if ($lang == LANGUAGE_NONE) { if ($entity_form['#parent_language'] != LANGUAGE_NONE) { $handler->setFormLanguage($entity_form['#parent_language']); @@ -443,7 +443,7 @@ class EntityInlineEntityFormController { $translation = array( 'entity_type' => $this->entityType, 'entity_id' => $id, - 'language' => $handler->getFormLanguage(), + 'language' => $handler->getActiveLanguage(), 'source' => $source, 'status' => 1, ); diff --git a/inline_entity_form.module b/inline_entity_form.module index 111c606..267baa5 100644 --- a/inline_entity_form.module +++ b/inline_entity_form.module @@ -1712,7 +1712,7 @@ function inline_entity_form_field_attach_submit($parent_entity_type, $parent_ent // Fetch the parent language - with entity_translation this will // return the current form language and thus match perfectly. $parent_entity_language = entity_language($parent_entity_type, $parent_entity); - $entity_form_language = $handler->getFormLanguage(); + $entity_form_language = $handler->getActiveLanguage(); // If the field is language independent set the parent entity // language as form language of the entity. if ($langcode == LANGUAGE_NONE && $entity_form_language != $parent_entity_language) {