diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module index 65553f7..bf25bb0 100644 --- a/core/modules/content_translation/content_translation.module +++ b/core/modules/content_translation/content_translation.module @@ -857,7 +857,7 @@ function content_translation_form_field_ui_field_edit_form_alter(array &$form, a '#weight' => 20, ); // Provide helpful pointers for administrators. - if (user_access('administer entity translation')) { + if (user_access('administer content translation')) { if ($field_has_data) { $toggle_url = url('admin/config/regional/translation_entity/translatable/' . $field_name, array( 'query' => drupal_get_destination(), diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php index 7408ef7..5ee2c4e 100644 --- a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php +++ b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php @@ -39,7 +39,7 @@ function setUp() { $this->drupalCreateContentType(array('type' => 'page')); $this->container->get('comment.manager')->addDefaultField('node', 'article', 'comment_article'); - $admin_user = $this->drupalCreateUser(array('administer languages', 'administer content translation', 'administer content types', 'administer comment fields')); + $admin_user = $this->drupalCreateUser(array('administer languages', 'administer content translation', 'administer content types', 'administer comment fields', 'administer node fields')); $this->drupalLogin($admin_user); } @@ -159,22 +159,23 @@ function testFieldTranslatableSettingsUI() { // At least one field needs to be translatable to enable article for // translation. Create an extra field to be used for this purpose. $field = array( - 'field_name' => 'article_text', + 'name' => 'article_text', + 'entity_type' => 'node', 'type' => 'text', ); - field_create_field($field); + entity_create('field_entity', $field)->save(); $instance = array( 'field_name' => 'article_text', 'entity_type' => 'node', 'bundle' => 'article', ); - field_create_instance($instance); + entity_create('field_instance', $instance)->save(); // Tests that field instance doesn't have translatable setting if bundle // is not translatable. - $path = 'admin/structure/types/manage/article/fields/body/field-settings'; + $path = 'admin/structure/types/manage/article/fields/node.article.body/field'; $this->drupalGet($path); - $this->assertNoText('Enable translation', 'No translatable setting for field.'); + $this->assertText('To enable translation of this field, enable language support for this type.', 'No translatable setting for field.'); // Tests that field instance has translatable setting if bundle is // translatable. Note: this field instance is not translatable when @@ -187,7 +188,7 @@ function testFieldTranslatableSettingsUI() { ); $this->assertSettings('node', 'article', TRUE, $edit); $this->drupalGet($path); - $this->assertText('Enable translation', 'Translatable setting is available for field.'); + $this->assertNoText('To enable translation of this field, enable language support for this type.', 'No translatable setting for field.'); } }