diff --git a/core/modules/field/field.views.inc b/core/modules/field/field.views.inc index 8269575a97d6dcc018246ae0d0e0f7b580bad387..62799dd37f55b6321dcf6443cf9e4cda157da376 100644 --- a/core/modules/field/field.views.inc +++ b/core/modules/field/field.views.inc @@ -177,8 +177,7 @@ function field_views_field_default_views_data(FieldInterface $field) { ); } - // Override Node to Content. - $group_name = ($entity_info['label'] == t('Node')) ? t('Content') : $entity_info['label']; + $group_name = $entity_info['label']; // Get the list of bundles the field appears in. $bundles_names = $field->getBundles(); // Build the list of additional fields to add to queries. diff --git a/core/modules/file/file.views.inc b/core/modules/file/file.views.inc index 501ce7cae71d143d1a49709acee03719caaed3a8..6ae04af259e2303e850f702e5345507e122a028e 100644 --- a/core/modules/file/file.views.inc +++ b/core/modules/file/file.views.inc @@ -490,11 +490,10 @@ function file_field_views_data_views_data_alter(array &$data, FieldInterface $fi $pseudo_field_name = 'reverse_' . $field['field_name'] . '_' . $entity_type; list($label,) = field_views_field_label($entity_type, $field['field_name']); - $entity_label = ($entity_info['label'] == t('Node')) ? t('Content') : $entity_info['label']; $data['file_managed'][$pseudo_field_name]['relationship'] = array( - 'title' => t('@entity using @field', array('@entity' => $entity_label, '@field' => $label)), - 'help' => t('Relate each @entity with a @field set to the file.', array('@entity' => $entity_label, '@field' => $label)), + 'title' => t('@entity using @field', array('@entity' => $entity_info['label'], '@field' => $label)), + 'help' => t('Relate each @entity with a @field set to the file.', array('@entity' => $entity_info['label'], '@field' => $label)), 'id' => 'entity_reverse', 'field_name' => $field['field_name'], 'entity_type' => $field['entity_type'], diff --git a/core/modules/image/image.views.inc b/core/modules/image/image.views.inc index 356f140ce17eb03d548c186cdb838296b544c62d..3cba1213a70a3f32f8214a1e943823f070151ea6 100644 --- a/core/modules/image/image.views.inc +++ b/core/modules/image/image.views.inc @@ -44,11 +44,10 @@ function image_field_views_data_views_data_alter(array &$data, FieldInterface $f $pseudo_field_name = 'reverse_' . $field['field_name'] . '_' . $entity_type; list($label,) = field_views_field_label($entity_type, $field['field_name']); - $entity_label = ($entity_info['label'] == t('Node')) ? t('Content') : $entity_info['label']; $data['file_managed'][$pseudo_field_name]['relationship'] = array( - 'title' => t('@entity using @field', array('@entity' => $entity_label, '@field' => $label)), - 'help' => t('Relate each @entity with a @field set to the image.', array('@entity' => $entity_label, '@field' => $label)), + 'title' => t('@entity using @field', array('@entity' => $entity_info['label'], '@field' => $label)), + 'help' => t('Relate each @entity with a @field set to the image.', array('@entity' => $entity_info['label'], '@field' => $label)), 'id' => 'entity_reverse', 'field_name' => $field['field_name'], 'entity_type' => $field['entity_type'], diff --git a/core/modules/taxonomy/taxonomy.views.inc b/core/modules/taxonomy/taxonomy.views.inc index 4e9f27cdd8d80b4eff907ac3fb800a920707d78f..e7583099a6e273f65fdcf5cfd2d267b56732f13a 100644 --- a/core/modules/taxonomy/taxonomy.views.inc +++ b/core/modules/taxonomy/taxonomy.views.inc @@ -440,11 +440,10 @@ function taxonomy_field_views_data_views_data_alter(array &$data, FieldInterface $pseudo_field_name = 'reverse_' . $field['field_name'] . '_' . $entity_type; list($label,) = field_views_field_label($entity_type, $field['field_name']); - $entity_label = ($entity_info['label'] == t('Node')) ? t('Content') : $entity_info['label']; $data['taxonomy_term_data'][$pseudo_field_name]['relationship'] = array( - 'title' => t('@entity using @field', array('@entity' => $entity_label, '@field' => $label)), - 'help' => t('Relate each @entity with a @field set to the term.', array('@entity' => $entity_label, '@field' => $label)), + 'title' => t('@entity using @field', array('@entity' => $entity_info['label'], '@field' => $label)), + 'help' => t('Relate each @entity with a @field set to the term.', array('@entity' => $entity_info['label'], '@field' => $label)), 'id' => 'entity_reverse', 'field_name' => $field['field_name'], 'entity_type' => $field['entity_type'],