diff --git a/core/modules/content_translation/content_translation.admin.inc b/core/modules/content_translation/content_translation.admin.inc index 820cb9f..b2a83b1 100644 --- a/core/modules/content_translation/content_translation.admin.inc +++ b/core/modules/content_translation/content_translation.admin.inc @@ -100,7 +100,7 @@ function _content_translation_form_language_content_settings_form_alter(array &$ // We special case Field API fields as they always natively support // translation. - // @todo Remove this special casing as soon as condfigurable and + // @todo Remove this special casing as soon as configurable and // base field definitions are "unified". if (!empty($definition['configurable']) && ($field = FieldService::fieldInfo()->getField($entity_type, $field_name))) { $instance = FieldService::fieldInfo()->getInstance($entity_type, $bundle, $field_name); @@ -110,7 +110,7 @@ function _content_translation_form_language_content_settings_form_alter(array &$ '#title' => $instance->getFieldLabel(), '#default_value' => $translatable, ); - $column_element = content_translation_field_sync_widget($field, $instance); + $column_element = content_translation_field_sync_widget($instance); if ($column_element) { $form['settings'][$entity_type][$bundle]['columns'][$field_name] = $column_element; diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSyncImageTest.php b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSyncImageTest.php index 9789dc5..f974837 100644 --- a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSyncImageTest.php +++ b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSyncImageTest.php @@ -108,10 +108,13 @@ function testImageFieldSync() { $this->assertNoFieldChecked('edit-settings-entity-test-mul-entity-test-mul-columns-field-test-et-ui-image-alt'); $this->assertNoFieldChecked('edit-settings-entity-test-mul-entity-test-mul-columns-field-test-et-ui-image-title'); $edit = array( + 'settings[entity_test_mul][entity_test_mul][fields][field_test_et_ui_image]' => TRUE, 'settings[entity_test_mul][entity_test_mul][columns][field_test_et_ui_image][alt]' => TRUE, 'settings[entity_test_mul][entity_test_mul][columns][field_test_et_ui_image][title]' => TRUE, ); $this->drupalPostForm('admin/config/regional/content-language', $edit, t('Save')); + $errors = $this->xpath('//div[contains(@class, "messages--error")]'); + $this->assertFalse($errors, 'Settings correctly stored.'); $this->assertFieldChecked('edit-settings-entity-test-mul-entity-test-mul-columns-field-test-et-ui-image-alt'); $this->assertFieldChecked('edit-settings-entity-test-mul-entity-test-mul-columns-field-test-et-ui-image-title'); $this->drupalLogin($this->translator);