summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/field/field.crud.inc1
-rw-r--r--modules/field/field.test14
2 files changed, 10 insertions, 5 deletions
diff --git a/modules/field/field.crud.inc b/modules/field/field.crud.inc
index 88e153a03..89d0b2d37 100644
--- a/modules/field/field.crud.inc
+++ b/modules/field/field.crud.inc
@@ -324,6 +324,7 @@ function field_create_field($field) {
'locked' => $field['locked'],
'data' => $data,
'cardinality' => $field['cardinality'],
+ 'translatable' => $field['translatable'],
'deleted' => $field['deleted'],
);
diff --git a/modules/field/field.test b/modules/field/field.test
index c77d790c9..2c1b74bf4 100644
--- a/modules/field/field.test
+++ b/modules/field/field.test
@@ -2194,7 +2194,7 @@ class FieldTranslationsTestCase extends FieldTestCase {
$this->obj_type = 'test_entity';
- $this->field = array(
+ $field = array(
'field_name' => $this->field_name,
'type' => 'test_field',
'cardinality' => 4,
@@ -2203,9 +2203,10 @@ class FieldTranslationsTestCase extends FieldTestCase {
'test_hook_in' => FALSE,
),
);
- field_create_field($this->field);
+ field_create_field($field);
+ $this->field = field_read_field($this->field_name);
- $this->instance = array(
+ $instance = array(
'field_name' => $this->field_name,
'bundle' => 'test_bundle',
'label' => $this->randomName() . '_label',
@@ -2222,7 +2223,8 @@ class FieldTranslationsTestCase extends FieldTestCase {
),
),
);
- field_create_instance($this->instance);
+ field_create_instance($instance);
+ $this->instance = field_read_instance($this->field_name, 'test_bundle');
for ($i = 0; $i < 3; ++$i) {
locale_inc_callback('locale_add_language', 'l' . $i, $this->randomString(), $this->randomString());
@@ -2380,7 +2382,9 @@ class FieldTranslationsTestCase extends FieldTestCase {
$obj_type = 'test_entity';
$object = field_test_create_stub_entity($eid, $evid, $this->instance['bundle']);
$field_translations = array();
- foreach (field_multilingual_available_languages($obj_type, $this->field) as $langcode) {
+ $available_languages = field_multilingual_available_languages($obj_type, $this->field);
+ $this->assertTrue(count($available_languages) > 1, t('Field is translatable.'));
+ foreach ($available_languages as $langcode) {
$field_translations[$langcode] = $this->_generateTestFieldValues($this->field['cardinality']);
}