diff --git a/field_collection.entity.inc b/field_collection.entity.inc index 33308dd..f555198 100644 --- a/field_collection.entity.inc +++ b/field_collection.entity.inc @@ -390,7 +390,6 @@ class FieldCollectionItemEntity extends Entity { // Copy the values of translatable fields for a new field collection item. if (field_collection_item_is_translatable() && !empty($this->is_new) && $this->langcode == LANGUAGE_NONE) { $this->copyTranslations(); - } // Only save directly if we are told to skip saving the host entity. Else, @@ -446,7 +445,6 @@ class FieldCollectionItemEntity extends Entity { } $source_language = isset($source_language) ? $source_language : $host_et_handler->getLanguage(); $target_languages = array_diff($host_languages, array($source_language)); - $et_handler = entity_translation_get_handler($this->entityType(), $this); $fields = array_keys(field_info_instances('field_collection_item', $this->field_name)); foreach ($fields as $translatable_field) { diff --git a/field_collection.module b/field_collection.module index 2455913..cfce84b 100644 --- a/field_collection.module +++ b/field_collection.module @@ -1086,7 +1086,7 @@ function field_collection_field_widget_form(&$form, &$form_state, $field, $insta field_attach_form('field_collection_item', $field_collection_item, $element, $form_state, $entity_langcode); // Make sure subfields get translatable clues (like 'all languages') - if (field_collection_item_is_translatable()) { + if (field_collection_item_is_translatable() && variable_get('entity_translation_shared_labels', TRUE)) { foreach (element_children($element) as $key) { $element[$key]['#process'][] = 'entity_translation_element_translatability_clue'; }