From f100d942e34603ec0cef33e5f6ea1a1eca482cd5 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Thu, 5 Feb 2015 10:33:13 +0000
Subject: [PATCH] =?UTF-8?q?Issue=20#2394883=20by=20G=C3=A1bor=20Hojtsy,=20?=
=?UTF-8?q?plach,=20jhodgdon:=20Language=20setup=20for=20entity=20and=20fi?=
=?UTF-8?q?eld=20based=20rendering=20in=20views=20is=20independent,=20conf?=
=?UTF-8?q?using=20UI,=20lacking=20test=20coverage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../install/views.view.test_bulk_form.yml | 6 -
.../views.view.aggregator_rss_feed.yml | 4 -
.../install/views.view.aggregator_sources.yml | 6 -
.../views.view.test_aggregator_items.yml | 4 -
.../test_views/views.view.test_view_block.yml | 5 -
.../views.view.test_view_block2.yml | 11 --
...ws.view.test_block_content_revision_id.yml | 2 -
...est_block_content_revision_revision_id.yml | 2 -
.../views.view.test_block_content_view.yml | 4 -
.../views.view.test_field_filters.yml | 12 +-
.../test_views/views.view.test_field_type.yml | 2 -
.../install/views.view.comments_recent.yml | 4 -
.../views.view.test_comment_rest.yml | 4 -
.../views.view.test_comment_row.yml | 4 -
.../views.view.test_comment_rss.yml | 4 -
.../views.view.test_comment_user_uid.yml | 2 -
.../views.view.test_field_filters.yml | 12 +-
.../views.view.test_contact_link.yml | 4 -
...ews.view.test_entity_translations_link.yml | 4 -
.../test_views/views.view.test_dblog.yml | 4 -
.../views.view.test_entity_reference.yml | 4 -
.../views.view.test_entity_reference_view.yml | 4 -
.../views.view.test_view_fieldapi.yml | 2 -
.../file/config/install/views.view.files.yml | 6 -
.../views.view.file_extension_view.yml | 2 -
.../views.view.test_forum_index.yml | 2 -
.../config/install/views.view.archive.yml | 6 -
.../config/install/views.view.content.yml | 4 -
.../install/views.view.content_recent.yml | 6 -
.../config/install/views.view.frontpage.yml | 6 -
.../config/install/views.view.glossary.yml | 6 -
.../node/src/Tests/NodeTranslationUITest.php | 2 +-
.../views.view.test_contextual_links.yml | 4 -
.../views.view.test_field_filters.yml | 12 +-
.../test_views/views.view.test_field_type.yml | 2 -
...ews.view.test_filter_node_uid_revision.yml | 2 -
.../test_views/views.view.test_language.yml | 4 -
.../views.view.test_node_bulk_form.yml | 4 -
.../views.view.test_node_revision_nid.yml | 2 -
.../views.view.test_node_revision_vid.yml | 2 -
.../views.view.test_node_row_plugin.yml | 4 -
.../test_views/views.view.test_node_view.yml | 4 -
.../views.view.test_status_extra.yml | 4 -
...iew.test_options_list_argument_numeric.yml | 4 -
...view.test_options_list_argument_string.yml | 4 -
.../views.view.test_options_list_filter.yml | 4 -
...ws.view.test_serializer_display_entity.yml | 4 -
...ews.view.test_serializer_display_field.yml | 6 -
...iew.test_serializer_node_display_field.yml | 4 -
...views.view.test_statistics_integration.yml | 4 -
.../install/views.view.taxonomy_term.yml | 6 -
...ws.view.taxonomy_default_argument_test.yml | 4 +-
.../views.view.test_field_filters.yml | 14 ---
...ws.view.test_filter_taxonomy_index_tid.yml | 2 -
.../views.view.test_groupwise_term.yml | 2 -
...iews.view.test_taxonomy_node_term_data.yml | 2 -
.../views.view.test_taxonomy_parent.yml | 2 -
.../views.view.test_taxonomy_tid_field.yml | 2 -
.../views.view.test_tracker_user_uid.yml | 2 -
.../install/views.view.user_admin_people.yml | 4 -
.../config/install/views.view.who_s_new.yml | 4 -
.../install/views.view.who_s_online.yml | 4 -
.../views.view.test_access_perm.yml | 2 -
.../views.view.test_access_role.yml | 4 -
.../views.view.test_field_permission.yml | 2 -
.../views.view.test_filter_permission.yml | 2 -
.../views.view.test_groupwise_user.yml | 2 -
...t_plugin_argument_default_current_user.yml | 2 -
.../views.view.test_user_bulk_form.yml | 4 -
.../views.view.test_user_changed.yml | 4 -
.../test_views/views.view.test_user_data.yml | 2 -
.../test_views/views.view.test_user_name.yml | 4 -
.../views.view.test_user_relationship.yml | 2 -
.../views.view.test_user_uid_argument.yml | 2 -
....view.test_view_argument_validate_user.yml | 2 -
...w.test_view_argument_validate_username.yml | 2 -
...ews.view.test_views_handler_field_role.yml | 4 -
...iew.test_views_handler_field_user_name.yml | 2 -
.../config/schema/views.data_types.schema.yml | 6 -
.../Render/ConfigurableLanguageRenderer.php | 51 +++++++++
.../Entity/Render/CurrentLanguageRenderer.php | 26 -----
.../Entity/Render/DefaultLanguageRenderer.php | 10 +-
.../Render/EntityTranslationRenderTrait.php | 92 ++++++++++++++++
.../views/src/Entity/Render/RendererBase.php | 13 ++-
.../Render/TranslationLanguageRenderer.php | 4 +-
.../views/src/Plugin/views/PluginBase.php | 22 +++-
.../views/display/DisplayPluginBase.php | 64 ++---------
.../views/src/Plugin/views/field/Field.php | 81 ++++++++------
.../views/src/Plugin/views/row/EntityRow.php | 58 +++++-----
.../Tests/Entity/RowEntityRenderersTest.php | 103 ++++++++++++++----
.../views.view.test_access_none.yml | 2 -
.../views.view.test_aggregate_count.yml | 2 -
.../test_views/views.view.test_ajax_view.yml | 4 -
.../test_views/views.view.test_alias.yml | 2 -
.../test_views/views.view.test_area_title.yml | 4 -
.../test_views/views.view.test_area_view.yml | 2 -
.../views.view.test_argument_date.yml | 12 --
...iew.test_argument_default_current_user.yml | 2 -
...views.view.test_argument_default_fixed.yml | 2 -
.../views.view.test_argument_dependency.yml | 2 -
.../views.view.test_attachment_ui.yml | 9 --
.../test_views/views.view.test_cache.yml | 2 -
.../test_views/views.view.test_click_sort.yml | 4 -
.../test_views/views.view.test_destroy.yml | 8 --
.../views.view.test_disabled_display.yml | 14 ---
.../test_views/views.view.test_display.yml | 6 -
.../views.view.test_display_attachment.yml | 6 -
.../views.view.test_display_defaults.yml | 2 -
.../views.view.test_display_empty.yml | 2 -
.../views.view.test_display_feed.yml | 6 -
.../views.view.test_display_invalid.yml | 7 --
.../views.view.test_display_more.yml | 4 -
.../test_views/views.view.test_dropbutton.yml | 4 -
.../views.view.test_entity_area.yml | 2 -
.../views.view.test_entity_operations.yml | 4 -
.../test_views/views.view.test_entity_row.yml | 2 -
.../views.view.test_entity_row_renderers.yml | 34 +++++-
.../views.view.test_entity_type_filter.yml | 2 -
.../views.view.test_example_area.yml | 2 -
.../views.view.test_executable_displays.yml | 8 --
.../views.view.test_exposed_admin_ui.yml | 4 -
.../views.view.test_exposed_block.yml | 4 -
.../views.view.test_exposed_form_buttons.yml | 4 -
.../views.view.test_field_classes.yml | 4 -
.../views.view.test_field_get_entity.yml | 2 -
.../views.view.test_field_output.yml | 2 -
.../views.view.test_field_tokens.yml | 2 -
.../test_views/views.view.test_filter.yml | 2 -
.../views.view.test_filter_date_between.yml | 2 -
.../views.view.test_filter_group_override.yml | 4 -
.../views.view.test_filter_groups.yml | 4 -
.../views.view.test_filter_in_operator_ui.yml | 2 -
.../views.view.test_get_attach_displays.yml | 8 --
.../test_views/views.view.test_glossary.yml | 2 -
.../test_views/views.view.test_grid.yml | 4 -
.../views.view.test_group_by_count.yml | 2 -
.../views.view.test_group_by_in_filters.yml | 2 -
.../test_views/views.view.test_group_rows.yml | 2 -
.../views.view.test_groupwise_term_ui.yml | 2 -
.../views.view.test_handler_relationships.yml | 2 -
.../views.view.test_handler_test_access.yml | 2 -
.../test_views/views.view.test_history.yml | 6 -
.../views.view.test_http_status_code.yml | 4 -
.../test_views/views.view.test_mini_pager.yml | 8 --
.../views.view.test_page_display.yml | 8 --
...views.view.test_page_display_arguments.yml | 12 --
.../views.view.test_page_display_menu.yml | 12 --
.../views.view.test_page_display_route.yml | 16 ---
.../test_views/views.view.test_page_view.yml | 5 -
.../test_views/views.view.test_pager_full.yml | 2 -
.../test_views/views.view.test_pager_none.yml | 2 -
.../test_views/views.view.test_pager_some.yml | 2 -
.../views.view.test_plugin_dependencies.yml | 2 -
.../test_views/views.view.test_preview.yml | 2 -
.../views.view.test_redirect_view.yml | 4 -
...iews.view.test_relationship_dependency.yml | 2 -
.../test_views/views.view.test_search.yml | 6 -
.../views.view.test_simple_argument.yml | 2 -
.../views.view.test_store_pager_settings.yml | 2 -
.../views.view.test_style_html_list.yml | 2 -
.../views.view.test_style_mapping.yml | 2 -
.../test_views/views.view.test_style_opml.yml | 6 -
.../test_views/views.view.test_table.yml | 4 -
.../test_views/views.view.test_tag_cache.yml | 2 -
.../test_views/views.view.test_tokens.yml | 4 -
.../test_views/views.view.test_view.yml | 2 -
...ew.test_view_argument_validate_numeric.yml | 2 -
.../views.view.test_view_broken.yml | 2 -
.../views.view.test_view_delete.yml | 2 -
.../views.view.test_view_display_template.yml | 2 -
.../test_views/views.view.test_view_embed.yml | 2 -
.../test_views/views.view.test_view_empty.yml | 2 -
.../views.view.test_view_entity_test.yml | 2 -
...view_entity_test_additional_base_field.yml | 2 -
.../views.view.test_view_entity_test_data.yml | 2 -
...ws.view.test_view_entity_test_revision.yml | 2 -
.../views.view.test_view_handler_weight.yml | 2 -
...st_view_pager_full_zero_items_per_page.yml | 2 -
.../views.view.test_view_render.yml | 2 -
.../views.view.test_view_status.yml | 3 -
.../views.view.test_view_storage.yml | 6 -
.../views.view.test_views_groupby_save.yml | 2 -
.../views.view.test_access_static.yml | 4 -
.../views_test_language.info.yml | 9 ++
.../views_test_language.views.inc | 15 +++
.../tests/src/Unit/Plugin/field/FieldTest.php | 54 ++++++++-
.../views_ui/src/Tests/ViewEditTest.php | 18 +--
.../views.view.sa_contrib_2013_035.yml | 4 -
188 files changed, 470 insertions(+), 858 deletions(-)
create mode 100644 core/modules/views/src/Entity/Render/ConfigurableLanguageRenderer.php
delete mode 100644 core/modules/views/src/Entity/Render/CurrentLanguageRenderer.php
create mode 100644 core/modules/views/src/Entity/Render/EntityTranslationRenderTrait.php
create mode 100644 core/modules/views/tests/modules/views_test_language/views_test_language.info.yml
create mode 100644 core/modules/views/tests/modules/views_test_language/views_test_language.views.inc
diff --git a/core/modules/action/tests/action_bulk_test/config/install/views.view.test_bulk_form.yml b/core/modules/action/tests/action_bulk_test/config/install/views.view.test_bulk_form.yml
index c2ae02565c70..9dd0383e3aac 100644
--- a/core/modules/action/tests/action_bulk_test/config/install/views.view.test_bulk_form.yml
+++ b/core/modules/action/tests/action_bulk_test/config/install/views.view.test_bulk_form.yml
@@ -153,8 +153,6 @@ display:
entity_type: node
entity_field: created
title: form
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
@@ -162,8 +160,6 @@ display:
position: null
display_options:
path: test_bulk_form
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_2:
display_plugin: page
id: page_2
@@ -184,5 +180,3 @@ display:
empty: true
content: 'This view is empty.'
plugin_id: text_custom
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/aggregator/config/install/views.view.aggregator_rss_feed.yml b/core/modules/aggregator/config/install/views.view.aggregator_rss_feed.yml
index 6aeb947142b5..8482e001eca5 100644
--- a/core/modules/aggregator/config/install/views.view.aggregator_rss_feed.yml
+++ b/core/modules/aggregator/config/install/views.view.aggregator_rss_feed.yml
@@ -136,8 +136,6 @@ display:
empty: { }
relationships: { }
arguments: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
feed_items:
display_plugin: feed
id: feed_items
@@ -148,5 +146,3 @@ display:
display_description: ''
defaults:
arguments: true
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/aggregator/config/install/views.view.aggregator_sources.yml b/core/modules/aggregator/config/install/views.view.aggregator_sources.yml
index 8612cffbce7a..e2d82472697d 100644
--- a/core/modules/aggregator/config/install/views.view.aggregator_sources.yml
+++ b/core/modules/aggregator/config/install/views.view.aggregator_sources.yml
@@ -141,16 +141,12 @@ display:
empty: { }
relationships: { }
arguments: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
feed_1:
display_plugin: feed
id: feed_1
display_title: Feed
position: 2
display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
style:
type: opml
options:
@@ -389,8 +385,6 @@ display:
display_title: Page
position: 1
display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
path: aggregator/sources
menu:
type: normal
diff --git a/core/modules/aggregator/tests/modules/aggregator_test_views/test_views/views.view.test_aggregator_items.yml b/core/modules/aggregator/tests/modules/aggregator_test_views/test_views/views.view.test_aggregator_items.yml
index 5c094ae62e47..22c6c53ca104 100644
--- a/core/modules/aggregator/tests/modules/aggregator_test_views/test_views/views.view.test_aggregator_items.yml
+++ b/core/modules/aggregator/tests/modules/aggregator_test_views/test_views/views.view.test_aggregator_items.yml
@@ -168,8 +168,6 @@ display:
entity_field: description
filters: { }
sorts: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
feed_1:
display_plugin: feed
id: feed_1
@@ -181,5 +179,3 @@ display:
type: aggregator_rss
options:
view_mode: default
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block.yml b/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block.yml
index f5f931244588..18d34836ca17 100644
--- a/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block.yml
+++ b/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block.yml
@@ -38,13 +38,8 @@ display:
table: views_test_data
field: name
title: test_view_block
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
block_1:
display_plugin: block
id: block_1
display_title: Block
position: null
- display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block2.yml b/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block2.yml
index bf2de47abffb..61171527a0a8 100644
--- a/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block2.yml
+++ b/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block2.yml
@@ -40,29 +40,18 @@ display:
table: views_test_data
field: name
title: test_view_block2
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
block_1:
display_plugin: block
id: block_1
display_title: Block
position: null
- display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
block_2:
display_plugin: block
id: block_2
display_title: Block
position: null
- display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
block_3:
display_plugin: block
id: block_3
display_title: Block
position: null
- display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_revision_id.yml b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_revision_id.yml
index c872156bd65a..dcf60593fb6d 100644
--- a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_revision_id.yml
+++ b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_revision_id.yml
@@ -52,8 +52,6 @@ display:
plugin_id: numeric
entity_type: block_content
entity_field: id
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_revision_revision_id.yml b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_revision_revision_id.yml
index 7d35c4ce661b..64db56db7a91 100644
--- a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_revision_revision_id.yml
+++ b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_revision_revision_id.yml
@@ -54,8 +54,6 @@ display:
plugin_id: block_content_id
entity_type: block_content
entity_field: id
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_extenders: { }
display_plugin: default
display_title: Master
diff --git a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_view.yml b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_view.yml
index 198e9ce21f02..96ca656b5c37 100644
--- a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_view.yml
+++ b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_view.yml
@@ -126,8 +126,6 @@ display:
footer: { }
empty: { }
relationships: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_extenders: { }
arguments:
type:
@@ -178,6 +176,4 @@ display:
position: null
display_options:
path: test-block_content-view
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_extenders: { }
diff --git a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_field_filters.yml b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_field_filters.yml
index f4edfd8bffef..16b1be53fe06 100644
--- a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_field_filters.yml
+++ b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_field_filters.yml
@@ -150,9 +150,7 @@ display:
empty: { }
relationships: { }
arguments: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
- rendering_language: translation_language_renderer
+ rendering_language: '***LANGUAGE_entity_translation***'
display_extenders: { }
page_bf:
display_plugin: page
@@ -160,8 +158,6 @@ display:
display_title: 'Body filter page'
position: 1
display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
path: test-body-filter
display_description: ''
title: 'Test body filters'
@@ -219,8 +215,6 @@ display:
display_title: 'Body filter page Paris'
position: 1
display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
path: test-body-paris
display_description: ''
title: 'Test body filters'
@@ -278,8 +272,6 @@ display:
display_title: 'Info filter page'
position: 1
display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
path: test-info-filter
display_description: ''
title: 'Test info filter'
@@ -337,8 +329,6 @@ display:
display_title: 'Info filter page Paris'
position: 1
display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
path: test-info-paris
display_description: ''
title: 'Test info filter'
diff --git a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_field_type.yml b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_field_type.yml
index 674cf7f18a44..5c8fe275293d 100644
--- a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_field_type.yml
+++ b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_field_type.yml
@@ -22,8 +22,6 @@ display:
plugin_id: block_content_type
entity_type: block_content
entity_field: type
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/comment/config/install/views.view.comments_recent.yml b/core/modules/comment/config/install/views.view.comments_recent.yml
index 41ee8e600c55..347ca7c0f83e 100644
--- a/core/modules/comment/config/install/views.view.comments_recent.yml
+++ b/core/modules/comment/config/install/views.view.comments_recent.yml
@@ -234,8 +234,6 @@ display:
content: 'No comments available.'
tokenize: false
plugin_id: text_custom
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
block_1:
display_plugin: block
id: block_1
@@ -244,7 +242,5 @@ display:
display_options:
block_description: 'Recent comments'
block_category: 'Lists (Views)'
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
allow:
items_per_page: true
diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rest.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rest.yml
index bd04a83c59c3..05e301d814a8 100644
--- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rest.yml
+++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rest.yml
@@ -352,8 +352,6 @@ display:
break_phrase: false
not: false
plugin_id: numeric
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_extenders: { }
rest_export_1:
display_plugin: rest_export
@@ -361,8 +359,6 @@ display:
display_title: 'REST export'
position: 1
display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
path: node/%node/comments
pager:
type: some
diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_row.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_row.yml
index b92f2d69a610..b928ad4a6f26 100644
--- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_row.yml
+++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_row.yml
@@ -147,8 +147,6 @@ display:
footer: { }
empty: { }
arguments: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
@@ -156,5 +154,3 @@ display:
position: 1
display_options:
path: test-comment-row
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml
index 78fccb6c263d..b9b4c4862a46 100644
--- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml
+++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml
@@ -63,8 +63,6 @@ display:
entity_field: subject
filters: { }
sorts: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
feed_1:
display_plugin: feed
id: feed_1
@@ -72,5 +70,3 @@ display:
position: null
display_options:
path: test-comment-rss
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml
index 8e852ce6f38b..f468659f5d50 100644
--- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml
+++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml
@@ -55,8 +55,6 @@ display:
type: default
row:
type: 'entity:node'
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_field_filters.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_field_filters.yml
index 5b4a6bfa4129..3d529e2674c4 100644
--- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_field_filters.yml
+++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_field_filters.yml
@@ -147,17 +147,13 @@ display:
footer: { }
empty: { }
arguments: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
- rendering_language: translation_language_renderer
+ rendering_language: '***LANGUAGE_entity_translation***'
page_bf:
display_plugin: page
id: page_bf
display_title: 'Body Comida'
position: 1
display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
path: test-body-filter
display_description: ''
filters:
@@ -214,8 +210,6 @@ display:
display_title: 'Body Paris'
position: 1
display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
path: test-body-paris
display_description: ''
filters:
@@ -272,8 +266,6 @@ display:
display_title: 'Title Comida'
position: 1
display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
path: test-title-filter
display_description: ''
page_tp:
@@ -282,8 +274,6 @@ display:
display_title: 'Title Paris'
position: 1
display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
path: test-title-paris
display_description: ''
filters:
diff --git a/core/modules/contact/tests/modules/contact_test_views/test_views/views.view.test_contact_link.yml b/core/modules/contact/tests/modules/contact_test_views/test_views/views.view.test_contact_link.yml
index 23ad0d759c68..cb3b7cefdd92 100644
--- a/core/modules/contact/tests/modules/contact_test_views/test_views/views.view.test_contact_link.yml
+++ b/core/modules/contact/tests/modules/contact_test_views/test_views/views.view.test_contact_link.yml
@@ -130,8 +130,6 @@ display:
empty: { }
relationships: { }
arguments: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
@@ -139,5 +137,3 @@ display:
position: 1
display_options:
path: test-contact-link
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/content_translation/tests/modules/content_translation_test_views/test_views/views.view.test_entity_translations_link.yml b/core/modules/content_translation/tests/modules/content_translation_test_views/test_views/views.view.test_entity_translations_link.yml
index 8b41eb5eb0f8..6a0515d61ed7 100644
--- a/core/modules/content_translation/tests/modules/content_translation_test_views/test_views/views.view.test_entity_translations_link.yml
+++ b/core/modules/content_translation/tests/modules/content_translation_test_views/test_views/views.view.test_entity_translations_link.yml
@@ -104,8 +104,6 @@ display:
value: 'No people available.'
format: plain_text
plugin_id: text
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
@@ -113,5 +111,3 @@ display:
position: null
display_options:
path: test-entity-translations-link
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/dblog/tests/modules/dblog_test_views/test_views/views.view.test_dblog.yml b/core/modules/dblog/tests/modules/dblog_test_views/test_views/views.view.test_dblog.yml
index a53325d720c6..0a9e3567d98a 100644
--- a/core/modules/dblog/tests/modules/dblog_test_views/test_views/views.view.test_dblog.yml
+++ b/core/modules/dblog/tests/modules/dblog_test_views/test_views/views.view.test_dblog.yml
@@ -56,8 +56,6 @@ display:
field: wid
order: ASC
plugin_id: standard
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
@@ -65,5 +63,3 @@ display:
position: null
display_options:
path: test-dblog
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/entity_reference/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference.yml b/core/modules/entity_reference/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference.yml
index 3597b6f30e42..393c681d8884 100644
--- a/core/modules/entity_reference/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference.yml
+++ b/core/modules/entity_reference/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference.yml
@@ -109,8 +109,6 @@ display:
plugin_id: date
entity_type: node
entity_field: created
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
entity_reference_1:
display_plugin: entity_reference
id: entity_reference_1
@@ -127,5 +125,3 @@ display:
type: none
options:
offset: 0
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/entity_reference/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_view.yml b/core/modules/entity_reference/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_view.yml
index 8b92cb6e3b12..2129235479d8 100644
--- a/core/modules/entity_reference/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_view.yml
+++ b/core/modules/entity_reference/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_view.yml
@@ -55,8 +55,6 @@ display:
field: field_test
relationship: none
plugin_id: standard
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -72,8 +70,6 @@ display:
field: reverse_field_test
relationship: none
plugin_id: standard
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: embed
display_title: Embed
id: embed_1
diff --git a/core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_fieldapi.yml b/core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_fieldapi.yml
index ed68d092ac64..2c352dd3a848 100644
--- a/core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_fieldapi.yml
+++ b/core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_fieldapi.yml
@@ -58,8 +58,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/file/config/install/views.view.files.yml b/core/modules/file/config/install/views.view.files.yml
index 550a9cc5ad2f..6c805da53414 100644
--- a/core/modules/file/config/install/views.view.files.yml
+++ b/core/modules/file/config/install/views.view.files.yml
@@ -680,8 +680,6 @@ display:
arguments: { }
group_by: true
show_admin_links: true
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
@@ -709,8 +707,6 @@ display:
group_type: group
admin_label: 'File usage'
required: false
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_2:
display_plugin: page
id: page_2
@@ -1060,5 +1056,3 @@ display:
group_type: group
admin_label: 'File usage'
required: true
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml b/core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml
index c5149b0d0da1..6f07b0c09b5a 100644
--- a/core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml
+++ b/core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml
@@ -47,8 +47,6 @@ display:
relationship: none
table: views_test_data
plugin_id: numeric
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/forum/tests/modules/forum_test_views/test_views/views.view.test_forum_index.yml b/core/modules/forum/tests/modules/forum_test_views/test_views/views.view.test_forum_index.yml
index e421d2400459..0775d27e2abf 100644
--- a/core/modules/forum/tests/modules/forum_test_views/test_views/views.view.test_forum_index.yml
+++ b/core/modules/forum/tests/modules/forum_test_views/test_views/views.view.test_forum_index.yml
@@ -148,5 +148,3 @@ display:
plugin_id: numeric
filters: { }
sorts: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/node/config/install/views.view.archive.yml b/core/modules/node/config/install/views.view.archive.yml
index 047d0623643a..da261db448ad 100644
--- a/core/modules/node/config/install/views.view.archive.yml
+++ b/core/modules/node/config/install/views.view.archive.yml
@@ -165,8 +165,6 @@ display:
empty: { }
relationships: { }
fields: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
block_1:
id: block_1
display_title: Block
@@ -196,8 +194,6 @@ display:
specify_validation: true
plugin_id: date_year_month
entity_type: node
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
id: page_1
display_title: Page
@@ -208,5 +204,3 @@ display:
type: views_query
options: { }
path: archive
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/node/config/install/views.view.content.yml b/core/modules/node/config/install/views.view.content.yml
index 7fd418ac8883..fcef7caf9e08 100644
--- a/core/modules/node/config/install/views.view.content.yml
+++ b/core/modules/node/config/install/views.view.content.yml
@@ -501,8 +501,6 @@ display:
operator: AND
groups:
1: AND
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -523,8 +521,6 @@ display:
description: 'Find and manage content'
menu_name: admin
weight: -10
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
diff --git a/core/modules/node/config/install/views.view.content_recent.yml b/core/modules/node/config/install/views.view.content_recent.yml
index 4bbe54f0b2da..8e061250eed5 100644
--- a/core/modules/node/config/install/views.view.content_recent.yml
+++ b/core/modules/node/config/install/views.view.content_recent.yml
@@ -413,8 +413,6 @@ display:
plugin_id: standard
arguments: { }
display_extenders: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
use_more: true
use_more_always: true
use_more_text: More
@@ -425,7 +423,3 @@ display:
id: block_1
display_title: Block
position: 1
- display_options:
- display_extenders: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/node/config/install/views.view.frontpage.yml b/core/modules/node/config/install/views.view.frontpage.yml
index b5d02e938db2..a932d3ab8861 100644
--- a/core/modules/node/config/install/views.view.frontpage.yml
+++ b/core/modules/node/config/install/views.view.frontpage.yml
@@ -233,8 +233,6 @@ display:
relationships: { }
fields: { }
arguments: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -266,13 +264,9 @@ display:
options:
relationship: none
view_mode: rss
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_options:
path: node
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
diff --git a/core/modules/node/config/install/views.view.glossary.yml b/core/modules/node/config/install/views.view.glossary.yml
index 1625bddfa90a..b780209a58dd 100644
--- a/core/modules/node/config/install/views.view.glossary.yml
+++ b/core/modules/node/config/install/views.view.glossary.yml
@@ -306,8 +306,6 @@ display:
footer: { }
empty: { }
sorts: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
filters:
langcode:
id: langcode
@@ -406,8 +404,6 @@ display:
default: default
page_1: page_1
inherit_arguments: false
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
id: page_1
display_title: Page
@@ -424,5 +420,3 @@ display:
weight: 0
menu_name: main
parent: ''
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/node/src/Tests/NodeTranslationUITest.php b/core/modules/node/src/Tests/NodeTranslationUITest.php
index 01185b57305c..d16d13a9da38 100644
--- a/core/modules/node/src/Tests/NodeTranslationUITest.php
+++ b/core/modules/node/src/Tests/NodeTranslationUITest.php
@@ -245,7 +245,7 @@ function testTranslationRendering() {
// Enable the translation language renderer.
$view = \Drupal::entityManager()->getStorage('view')->load('frontpage');
$display = &$view->getDisplay('default');
- $display['display_options']['rendering_language'] = 'translation_language_renderer';
+ $display['display_options']['rendering_language'] = '***LANGUAGE_entity_translation***';
$view->save();
// Need to check from the beginning, including the base_path, in the url
diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_contextual_links.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_contextual_links.yml
index ad1e38f6823e..0543c9fc9660 100644
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_contextual_links.yml
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_contextual_links.yml
@@ -68,8 +68,6 @@ display:
relationships: { }
fields: { }
arguments: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -95,8 +93,6 @@ display:
menu_name: tools
weight: 0
context: '1'
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_filters.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_filters.yml
index d23420b67782..0284d4d1156a 100644
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_filters.yml
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_filters.yml
@@ -162,17 +162,13 @@ display:
empty: { }
relationships: { }
arguments: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
- rendering_language: translation_language_renderer
+ rendering_language: '***LANGUAGE_entity_translation***'
page_bf:
display_plugin: page
id: page_bf
display_title: 'Body filter page'
position: 1
display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
path: test-body-filter
display_description: ''
title: 'Test body filters'
@@ -240,8 +236,6 @@ display:
display_title: 'Body filter page Paris'
position: 1
display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
path: test-body-paris
display_description: ''
title: 'Test body filters'
@@ -309,8 +303,6 @@ display:
display_title: 'Title filter page'
position: 1
display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
path: test-title-filter
display_description: ''
title: 'Test title filter'
@@ -378,8 +370,6 @@ display:
display_title: 'Title filter page Paris'
position: 1
display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
path: test-title-paris
display_description: ''
title: 'Test title filter'
diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_type.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_type.yml
index b2f9b3f9ffbb..f7e1e8246099 100644
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_type.yml
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_type.yml
@@ -22,8 +22,6 @@ display:
plugin_id: node_type
entity_type: node
entity_field: type
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_uid_revision.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_uid_revision.yml
index 8ce5ac0ecd3b..f34d6631bbc2 100644
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_uid_revision.yml
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_uid_revision.yml
@@ -65,8 +65,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_language.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_language.yml
index 462d371b3501..7b379f89dbbd 100644
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_language.yml
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_language.yml
@@ -282,14 +282,10 @@ display:
plugin_id: language
entity_type: node
entity_field: langcode
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
display_title: Page
position: 1
display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
path: test-language
diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_bulk_form.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_bulk_form.yml
index f01d13db8bd2..094f9eca065e 100644
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_bulk_form.yml
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_bulk_form.yml
@@ -45,8 +45,6 @@ display:
plugin_id: standard
entity_type: node
entity_field: nid
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
@@ -54,5 +52,3 @@ display:
position: null
display_options:
path: test-node-bulk-form
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml
index d9faafd4fce8..4c4c5faf473b 100644
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml
@@ -52,8 +52,6 @@ display:
plugin_id: node_nid
entity_type: node
entity_field: nid
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml
index 72e818289f82..dea39a7ea79f 100644
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml
@@ -52,8 +52,6 @@ display:
plugin_id: node_nid
entity_type: node
entity_field: nid
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_row_plugin.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_row_plugin.yml
index 0139a99bd9b2..3579defde984 100644
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_row_plugin.yml
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_row_plugin.yml
@@ -47,8 +47,6 @@ display:
style:
type: default
title: test_node_row_plugin
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -56,8 +54,6 @@ display:
page_1:
display_options:
path: test-node-row-plugin
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_view.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_view.yml
index 2302614d34d4..ace4be036be9 100644
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_view.yml
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_view.yml
@@ -197,8 +197,6 @@ display:
plugin_id: node_type
entity_type: node
entity_field: type
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
@@ -206,5 +204,3 @@ display:
position: null
display_options:
path: test-node-view
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_status_extra.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_status_extra.yml
index 59b44088411d..bf3dcd355182 100644
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_status_extra.yml
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_status_extra.yml
@@ -137,13 +137,9 @@ display:
operator: AND
groups:
1: AND
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_options:
path: test_status_extra
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
diff --git a/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_argument_numeric.yml b/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_argument_numeric.yml
index 69398b389527..af7ba6c7a092 100644
--- a/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_argument_numeric.yml
+++ b/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_argument_numeric.yml
@@ -192,8 +192,6 @@ display:
not: false
plugin_id: number_list_field
display_extenders: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
block_1:
display_plugin: block
id: block_1
@@ -201,5 +199,3 @@ display:
position: 1
display_options:
display_extenders: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_argument_string.yml b/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_argument_string.yml
index ef09354f35c3..32f9d4ecd8a9 100644
--- a/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_argument_string.yml
+++ b/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_argument_string.yml
@@ -191,8 +191,6 @@ display:
break_phrase: false
plugin_id: string_list_field
display_extenders: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
block_1:
display_plugin: block
id: block_1
@@ -200,5 +198,3 @@ display:
position: 1
display_options:
display_extenders: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_filter.yml b/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_filter.yml
index 4da80eae7e42..cf91e09e05cd 100644
--- a/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_filter.yml
+++ b/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_filter.yml
@@ -196,8 +196,6 @@ display:
relationships: { }
arguments: { }
display_extenders: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
block_1:
display_plugin: block
id: block_1
@@ -205,5 +203,3 @@ display:
position: 1
display_options:
display_extenders: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity.yml b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity.yml
index 03d3aa610763..26facb78b916 100644
--- a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity.yml
+++ b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity.yml
@@ -44,8 +44,6 @@ display:
entity_field: id
title: 'Test serialize'
arguments: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
rest_export_1:
display_plugin: rest_export
id: rest_export_1
@@ -55,5 +53,3 @@ display:
defaults:
access: false
path: test/serialize/entity
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_field.yml b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_field.yml
index 84fc0e690f4f..04b0d754d11c 100644
--- a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_field.yml
+++ b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_field.yml
@@ -67,8 +67,6 @@ display:
plugin_id: date
title: 'Test serialize'
arguments: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
rest_export_1:
display_plugin: rest_export
id: rest_export_1
@@ -86,8 +84,6 @@ display:
type: serializer
row:
type: data_field
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
rest_export_2:
display_plugin: rest_export
id: rest_export_2
@@ -107,5 +103,3 @@ display:
type: serializer
row:
type: data_field
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_node_display_field.yml b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_node_display_field.yml
index feac2e80e5ba..80bc8ac71728 100644
--- a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_node_display_field.yml
+++ b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_node_display_field.yml
@@ -112,8 +112,6 @@ display:
entity_field: body
title: 'Test serialize'
arguments: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
rest_export_1:
display_plugin: rest_export
id: rest_export_1
@@ -131,5 +129,3 @@ display:
type: serializer
row:
type: data_field
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/statistics/tests/modules/statistics_test_views/test_views/views.view.test_statistics_integration.yml b/core/modules/statistics/tests/modules/statistics_test_views/test_views/views.view.test_statistics_integration.yml
index a82936f3485f..07a6e06cf304 100644
--- a/core/modules/statistics/tests/modules/statistics_test_views/test_views/views.view.test_statistics_integration.yml
+++ b/core/modules/statistics/tests/modules/statistics_test_views/test_views/views.view.test_statistics_integration.yml
@@ -244,8 +244,6 @@ display:
order: DESC
entity_type: node
entity_field: created
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
@@ -253,5 +251,3 @@ display:
position: null
display_options:
path: test_statistics_integration
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/taxonomy/config/install/views.view.taxonomy_term.yml b/core/modules/taxonomy/config/install/views.view.taxonomy_term.yml
index 885d416c7c30..b8518f8f393a 100644
--- a/core/modules/taxonomy/config/install/views.view.taxonomy_term.yml
+++ b/core/modules/taxonomy/config/install/views.view.taxonomy_term.yml
@@ -235,8 +235,6 @@ display:
empty: { }
relationships: { }
fields: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
feed_1:
id: feed_1
display_title: Feed
@@ -282,8 +280,6 @@ display:
options:
relationship: none
view_mode: default
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
id: page_1
display_title: Page
@@ -294,5 +290,3 @@ display:
type: views_query
options: { }
path: taxonomy/term/%
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_default_argument_test.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_default_argument_test.yml
index c65d9c963f6f..1e6469526f75 100644
--- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_default_argument_test.yml
+++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_default_argument_test.yml
@@ -161,6 +161,4 @@ display:
plugin_id: taxonomy
entity_type: taxonomy_term
entity_field: tid
- field_langcode: '***LANGUAGE_site_default***'
- field_langcode_add_to_query: null
- rendering_language: translation_language_renderer
+ rendering_language: '***LANGUAGE_entity_translation***'
diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_field_filters.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_field_filters.yml
index 66b30fbae423..4642b075fd3d 100644
--- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_field_filters.yml
+++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_field_filters.yml
@@ -135,16 +135,12 @@ display:
empty: { }
relationships: { }
arguments: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_dc:
display_plugin: page
id: page_dc
display_title: 'Description Comida'
position: 3
display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_description: ''
path: test-desc-filter
filters:
@@ -201,8 +197,6 @@ display:
display_title: 'Description Comida'
position: 3
display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_description: ''
path: test-desc-paris
filters:
@@ -259,8 +253,6 @@ display:
display_title: 'Field Comida'
position: 3
display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_description: ''
path: test-field-filter
filters:
@@ -317,8 +309,6 @@ display:
display_title: 'Field Paris'
position: 3
display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_description: ''
path: test-field-paris
filters:
@@ -375,8 +365,6 @@ display:
display_title: 'Name Comida'
position: 1
display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
path: test-name-filter
display_description: ''
page_np:
@@ -385,8 +373,6 @@ display:
display_title: 'Name Paris'
position: 1
display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
path: test-name-paris
display_description: ''
filters:
diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml
index c8b3192fb55c..f6ea2dfd1404 100644
--- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml
+++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml
@@ -177,5 +177,3 @@ display:
empty: { }
relationships: { }
arguments: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml
index 30ed9f5a5858..e2eee61a8a18 100644
--- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml
+++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml
@@ -73,8 +73,6 @@ display:
style:
type: default
title: test_groupwise
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml
index c96c7dab2368..5b482c14a748 100644
--- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml
+++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml
@@ -83,8 +83,6 @@ display:
type: default
row:
type: 'entity:node'
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_parent.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_parent.yml
index efaaa629678d..eb82cca95c14 100644
--- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_parent.yml
+++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_parent.yml
@@ -131,5 +131,3 @@ display:
required: true
plugin_id: standard
arguments: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_tid_field.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_tid_field.yml
index 10ef4ef49562..914ad91543d5 100644
--- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_tid_field.yml
+++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_tid_field.yml
@@ -154,5 +154,3 @@ display:
empty: { }
relationships: { }
arguments: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/tracker/tests/modules/tracker_test_views/test_views/views.view.test_tracker_user_uid.yml b/core/modules/tracker/tests/modules/tracker_test_views/test_views/views.view.test_tracker_user_uid.yml
index 223ac1bcc5e8..dc22ddff1356 100644
--- a/core/modules/tracker/tests/modules/tracker_test_views/test_views/views.view.test_tracker_user_uid.yml
+++ b/core/modules/tracker/tests/modules/tracker_test_views/test_views/views.view.test_tracker_user_uid.yml
@@ -181,5 +181,3 @@ display:
validate_options: { }
plugin_id: tracker_user_uid
entity_type: node
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/user/config/install/views.view.user_admin_people.yml b/core/modules/user/config/install/views.view.user_admin_people.yml
index a62860eea04f..9be97a9fc90b 100644
--- a/core/modules/user/config/install/views.view.user_admin_people.yml
+++ b/core/modules/user/config/install/views.view.user_admin_people.yml
@@ -815,8 +815,6 @@ display:
operator: AND
groups:
1: AND
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_extenders: { }
page_1:
display_plugin: page
@@ -841,6 +839,4 @@ display:
weight: 0
defaults:
show_admin_links: false
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_extenders: { }
diff --git a/core/modules/user/config/install/views.view.who_s_new.yml b/core/modules/user/config/install/views.view.who_s_new.yml
index 51ef2c5c92ab..6545b9413613 100644
--- a/core/modules/user/config/install/views.view.who_s_new.yml
+++ b/core/modules/user/config/install/views.view.who_s_new.yml
@@ -166,8 +166,6 @@ display:
empty: { }
relationships: { }
arguments: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
block_1:
display_plugin: block
id: block_1
@@ -177,5 +175,3 @@ display:
display_description: 'A list of new users'
block_description: 'Who''s new'
block_category: User
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/user/config/install/views.view.who_s_online.yml b/core/modules/user/config/install/views.view.who_s_online.yml
index 9c0faef384e5..13f4af845093 100644
--- a/core/modules/user/config/install/views.view.who_s_online.yml
+++ b/core/modules/user/config/install/views.view.who_s_online.yml
@@ -196,8 +196,6 @@ display:
plugin_id: text_custom
relationships: { }
arguments: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
who_s_online_block:
display_plugin: block
id: who_s_online_block
@@ -206,5 +204,3 @@ display:
display_options:
block_description: 'Who''s online'
display_description: 'A list of users that are currently logged in.'
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_perm.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_perm.yml
index caeeca3cf26f..194d67609e1a 100644
--- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_perm.yml
+++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_perm.yml
@@ -28,8 +28,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_role.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_role.yml
index 6f2f936ef1a0..5aa61782032a 100644
--- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_role.yml
+++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_role.yml
@@ -32,8 +32,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -41,8 +39,6 @@ display:
page_1:
display_options:
path: test-role
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_field_permission.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_field_permission.yml
index 6ae987e23898..a3d1ba6fa172 100644
--- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_field_permission.yml
+++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_field_permission.yml
@@ -138,5 +138,3 @@ display:
plugin_id: user_permissions
filters: { }
sorts: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_filter_permission.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_filter_permission.yml
index 48a476186b28..1490795c9bd4 100644
--- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_filter_permission.yml
+++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_filter_permission.yml
@@ -140,5 +140,3 @@ display:
plugin_id: standard
entity_type: user
entity_field: uid
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml
index 427c7cb2d5a3..4e90e9f004d2 100644
--- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml
+++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml
@@ -86,8 +86,6 @@ display:
style:
type: default
title: test_groupwise_user
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml
index 10beeb4c3d24..b9f33def3cff 100644
--- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml
+++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml
@@ -58,8 +58,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form.yml
index 3dd3a316eb9a..80ea23c08413 100644
--- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form.yml
+++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form.yml
@@ -55,8 +55,6 @@ display:
plugin_id: boolean
entity_type: user
entity_field: status
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
@@ -64,5 +62,3 @@ display:
position: null
display_options:
path: test-user-bulk-form
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_changed.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_changed.yml
index f5baa994fdc9..60b55d41fd50 100644
--- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_changed.yml
+++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_changed.yml
@@ -43,8 +43,6 @@ display:
entity_type: user
entity_field: changed
filters: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -52,8 +50,6 @@ display:
page_1:
display_options:
path: test_user_changed
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml
index 5bd259eaad61..72ce40642aef 100644
--- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml
+++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml
@@ -130,5 +130,3 @@ display:
plugin_id: date
entity_type: user
entity_field: created
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_name.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_name.yml
index ccd87b7b0d3c..86743039c7f3 100644
--- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_name.yml
+++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_name.yml
@@ -49,8 +49,6 @@ display:
anonymous: '0'
entity_type: user
entity_field: uid
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -58,8 +56,6 @@ display:
page_1:
display_options:
path: test_user_name
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_relationship.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_relationship.yml
index 6a3907d15089..b3f9811e7fc6 100644
--- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_relationship.yml
+++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_relationship.yml
@@ -111,8 +111,6 @@ display:
options:
default_field_elements: true
hide_empty: false
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_uid_argument.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_uid_argument.yml
index 945872903c3f..cf824cc72ec5 100644
--- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_uid_argument.yml
+++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_uid_argument.yml
@@ -32,8 +32,6 @@ display:
plugin_id: user_uid
entity_type: user
entity_field: uid
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml
index 99c541ad5836..496afc6bf555 100644
--- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml
+++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml
@@ -34,8 +34,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_username.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_username.yml
index af599f86684a..3318782fa445 100644
--- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_username.yml
+++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_username.yml
@@ -34,8 +34,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_role.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_role.yml
index 40f21bc61eaf..2044a1151774 100644
--- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_role.yml
+++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_role.yml
@@ -157,8 +157,6 @@ display:
entity_field: status
sorts: { }
title: test_user_role
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
@@ -166,5 +164,3 @@ display:
position: null
display_options:
path: test-views-handler-field-role
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml
index 8f2a9ee6892b..931e8b1b5735 100644
--- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml
+++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml
@@ -53,8 +53,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/config/schema/views.data_types.schema.yml b/core/modules/views/config/schema/views.data_types.schema.yml
index f2aece56712f..4dce050aaded 100644
--- a/core/modules/views/config/schema/views.data_types.schema.yml
+++ b/core/modules/views/config/schema/views.data_types.schema.yml
@@ -247,12 +247,6 @@ views_display:
hide_attachment_summary:
type: boolean
label: 'Hide attachments in summary'
- field_langcode:
- type: string
- label: 'Field langcode'
- field_langcode_add_to_query:
- type: string
- label: 'Add the field language to the query'
rendering_language:
type: string
label: 'Entity language'
diff --git a/core/modules/views/src/Entity/Render/ConfigurableLanguageRenderer.php b/core/modules/views/src/Entity/Render/ConfigurableLanguageRenderer.php
new file mode 100644
index 000000000000..8470efdd1097
--- /dev/null
+++ b/core/modules/views/src/Entity/Render/ConfigurableLanguageRenderer.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views\Entity\Render\ConfigurableLanguageRenderer.
+ */
+
+namespace Drupal\views\Entity\Render;
+
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Language\LanguageManagerInterface;
+use Drupal\views\ResultRow;
+use Drupal\views\ViewExecutable;
+
+/**
+ * Renders entities in a configured language.
+ */
+class ConfigurableLanguageRenderer extends RendererBase {
+
+ /**
+ * A specific language code for rendering if available.
+ *
+ * @var string|null
+ */
+ protected $langcode;
+
+ /**
+ * Constructs a renderer object.
+ *
+ * @param \Drupal\views\ViewExecutable $view
+ * The entity row being rendered.
+ * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
+ * The language manager.
+ * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+ * The entity type.
+ * @param string|null $langcode
+ * A specific language code to set, if available.
+ */
+ public function __construct(ViewExecutable $view, LanguageManagerInterface $language_manager, EntityTypeInterface $entity_type, $langcode) {
+ parent::__construct($view, $language_manager, $entity_type);
+ $this->langcode = $langcode;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getLangcode(ResultRow $row) {
+ return $this->langcode;
+ }
+
+}
diff --git a/core/modules/views/src/Entity/Render/CurrentLanguageRenderer.php b/core/modules/views/src/Entity/Render/CurrentLanguageRenderer.php
deleted file mode 100644
index fb917874df11..000000000000
--- a/core/modules/views/src/Entity/Render/CurrentLanguageRenderer.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Entity\Render\CurrentLanguageRenderer.
- */
-
-namespace Drupal\views\Entity\Render;
-
-use Drupal\views\ResultRow;
-
-/**
- * Renders entities in the current language.
- */
-class CurrentLanguageRenderer extends RendererBase {
-
- /**
- * Returns NULL so that the current language is used.
- *
- * @param \Drupal\views\ResultRow $row
- * The result row.
- */
- protected function getLangcode(ResultRow $row) {
- }
-
-}
diff --git a/core/modules/views/src/Entity/Render/DefaultLanguageRenderer.php b/core/modules/views/src/Entity/Render/DefaultLanguageRenderer.php
index 2e99c1271421..bab75d8c57a7 100644
--- a/core/modules/views/src/Entity/Render/DefaultLanguageRenderer.php
+++ b/core/modules/views/src/Entity/Render/DefaultLanguageRenderer.php
@@ -15,15 +15,9 @@
class DefaultLanguageRenderer extends RendererBase {
/**
- * Returns the language code associated to the given row.
- *
- * @param \Drupal\views\ResultRow $row
- * The result row.
- *
- * @return string
- * A language code.
+ * {@inheritdoc}
*/
- protected function getLangcode(ResultRow $row) {
+ public function getLangcode(ResultRow $row) {
return $row->_entity->getUntranslated()->language()->getId();
}
diff --git a/core/modules/views/src/Entity/Render/EntityTranslationRenderTrait.php b/core/modules/views/src/Entity/Render/EntityTranslationRenderTrait.php
new file mode 100644
index 000000000000..1be73642f1e5
--- /dev/null
+++ b/core/modules/views/src/Entity/Render/EntityTranslationRenderTrait.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views\Entity\Render\EntityTranslationRenderTrait.
+ */
+
+namespace Drupal\views\Entity\Render;
+
+use Drupal\views\Plugin\views\PluginBase;
+
+/**
+ * Trait used to instantiate the view's entity language render.
+ */
+trait EntityTranslationRenderTrait {
+
+ /**
+ * The renderer to be used to render the entity row.
+ *
+ * @var \Drupal\views\Entity\Render\RendererBase
+ */
+ protected $entityLanguageRenderer;
+
+ /**
+ * Returns the current renderer.
+ *
+ * @return \Drupal\views\Entity\Render\RendererBase
+ * The configured renderer.
+ */
+ protected function getEntityTranslationRenderer() {
+ if (!isset($this->entityLanguageRenderer)) {
+ $view = $this->getView();
+ $rendering_language = $view->display_handler->getOption('rendering_language');
+ $langcode = NULL;
+ $dynamic_renderers = array(
+ '***LANGUAGE_entity_translation***' => 'TranslationLanguageRenderer',
+ '***LANGUAGE_entity_default***' => 'DefaultLanguageRenderer',
+ );
+ if (isset($dynamic_renderers[$rendering_language])) {
+ // Dynamic language set based on result rows or instance defaults.
+ $renderer = $dynamic_renderers[$rendering_language];
+ }
+ else {
+ if (strpos($rendering_language, '***LANGUAGE_') !== FALSE) {
+ $langcode = PluginBase::queryLanguageSubstitutions()[$rendering_language];
+ }
+ else {
+ // Specific langcode set.
+ $langcode = $rendering_language;
+ }
+ $renderer = 'ConfigurableLanguageRenderer';
+ }
+ $class = '\Drupal\views\Entity\Render\\' . $renderer;
+ $entity_type = $this->getEntityManager()->getDefinition($this->getEntityTypeId());
+ $this->entityLanguageRenderer = new $class($view, $this->getLanguageManager(), $entity_type, $langcode);
+ }
+ return $this->entityLanguageRenderer;
+ }
+
+ /**
+ * Returns the entity type identifier.
+ *
+ * @return string
+ * The entity type identifier.
+ */
+ abstract public function getEntityTypeId();
+
+ /**
+ * Returns the entity manager.
+ *
+ * @return \Drupal\Core\Entity\EntityManagerInterface
+ * The entity manager.
+ */
+ abstract protected function getEntityManager();
+
+ /**
+ * Returns the language manager.
+ *
+ * @return \Drupal\Core\Language\LanguageManagerInterface
+ * The language manager.
+ */
+ abstract protected function getLanguageManager();
+
+ /**
+ * Returns the top object of a view.
+ *
+ * @return \Drupal\views\ViewExecutable
+ * The view object.
+ */
+ abstract protected function getView();
+
+}
diff --git a/core/modules/views/src/Entity/Render/RendererBase.php b/core/modules/views/src/Entity/Render/RendererBase.php
index c74964dbfb54..be8aea64ea2c 100644
--- a/core/modules/views/src/Entity/Render/RendererBase.php
+++ b/core/modules/views/src/Entity/Render/RendererBase.php
@@ -23,7 +23,7 @@ abstract class RendererBase {
*
* @var \Drupal\views\ViewExecutable
*/
- public $view = NULL;
+ public $view;
/**
* The language manager.
@@ -62,6 +62,17 @@ public function __construct(ViewExecutable $view, LanguageManagerInterface $lang
$this->entityType = $entity_type;
}
+ /**
+ * Returns the language code associated to the given row.
+ *
+ * @param \Drupal\views\ResultRow $row
+ * The result row.
+ *
+ * @return string
+ * A language code.
+ */
+ abstract public function getLangcode(ResultRow $row);
+
/**
* Alters the query if needed.
*
diff --git a/core/modules/views/src/Entity/Render/TranslationLanguageRenderer.php b/core/modules/views/src/Entity/Render/TranslationLanguageRenderer.php
index 9b0e0da8a2ef..58c8ff099890 100644
--- a/core/modules/views/src/Entity/Render/TranslationLanguageRenderer.php
+++ b/core/modules/views/src/Entity/Render/TranslationLanguageRenderer.php
@@ -13,7 +13,7 @@
/**
* Renders entity translations in their active language.
*/
-class TranslationLanguageRenderer extends DefaultLanguageRenderer {
+class TranslationLanguageRenderer extends RendererBase {
/**
* Stores the field alias of the langcode column.
@@ -71,7 +71,7 @@ public function render(ResultRow $row) {
/**
* {@inheritdoc}
*/
- protected function getLangcode(ResultRow $row) {
+ public function getLangcode(ResultRow $row) {
return isset($row->{$this->langcodeAlias}) ? $row->{$this->langcodeAlias} : $this->languageManager->getDefaultLanguage()->getId();
}
diff --git a/core/modules/views/src/Plugin/views/PluginBase.php b/core/modules/views/src/Plugin/views/PluginBase.php
index e09545fb0a51..d26a5ea536b2 100644
--- a/core/modules/views/src/Plugin/views/PluginBase.php
+++ b/core/modules/views/src/Plugin/views/PluginBase.php
@@ -51,6 +51,13 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
*/
const INCLUDE_NEGOTIATED = 16;
+ /**
+ * Include entity row languages when listing languages.
+ *
+ * @see \Drupal\views\Plugin\views\PluginBase::listLanguages()
+ */
+ const INCLUDE_ENTITY = 32;
+
/**
* Query string to indicate the site default language.
*
@@ -490,16 +497,25 @@ public function getProvider() {
* note that this is not included in STATE_ALL.
* - \Drupal\views\Plugin\views\PluginBase::INCLUDE_NEGOTIATED: Add
* negotiated language types.
+ * - \Drupal\views\Plugin\views\PluginBase::INCLUDE_ENTITY: Add
+ * entity row language types. Note that these are only supported for
+ * display options, not substituted in queries.
*
* @return array
* An array of language names, keyed by the language code. Negotiated and
* special languages have special codes that are substituted in queries by
- * static::queryLanguageSubstitutions().
+ * PluginBase::queryLanguageSubstitutions().
*/
protected function listLanguages($flags = LanguageInterface::STATE_ALL) {
$manager = \Drupal::languageManager();
$list = array();
+ // The entity languages should come first, if requested.
+ if ($flags & PluginBase::INCLUDE_ENTITY) {
+ $list['***LANGUAGE_entity_translation***'] = $this->t('Content language of view row');
+ $list['***LANGUAGE_entity_default***'] = $this->t('Original language of content in view row');
+ }
+
// The Language Manager class takes care of the STATE_SITE_DEFAULT case.
// It comes in with ID set to LanguageInterface::LANGCODE_SITE_DEFAULT.
// Since this is not a real language, surround it by '***LANGUAGE_...***',
@@ -521,7 +537,7 @@ protected function listLanguages($flags = LanguageInterface::STATE_ALL) {
// IDs by '***LANGUAGE_...***', to avoid query collisions.
if (isset($type['name'])) {
$id = '***LANGUAGE_' . $id . '***';
- $list[$id] = $this->t('Language selected for !type', array('!type' => $type['name']));
+ $list[$id] = $this->t('!type language selected for page', array('!type' => $type['name']));
}
}
}
@@ -533,7 +549,7 @@ protected function listLanguages($flags = LanguageInterface::STATE_ALL) {
* Returns substitutions for Views queries for languages.
*
* This is needed so that the language options returned by
- * $this->listLanguages() are able to be used in queries. It is called
+ * PluginBase::listLanguages() are able to be used in queries. It is called
* by the Views module implementation of hook_views_query_substitutions()
* to get the language-related substitutions.
*
diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
index ac4d9baac205..759597716233 100644
--- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
@@ -195,15 +195,6 @@ public function initDisplay(ViewExecutable $view, array &$display, array &$optio
$this->unpackOptions($this->options, $options);
}
- // Convert the field_langcode and field_language_add_to_query settings.
- $field_langcode = $this->getOption('field_langcode');
- $field_language_add_to_query = $this->getOption('field_language_add_to_query');
- if (isset($field_langcode)) {
- $this->setOption('field_langcode', $field_langcode);
- $this->setOption('field_langcode_add_to_query', $field_language_add_to_query);
- $changed = TRUE;
- }
-
// Mark the view as changed so the user has a chance to save it.
if ($changed) {
$this->view->changed = TRUE;
@@ -539,14 +530,8 @@ protected function defineOptions() {
'group_by' => array(
'default' => FALSE,
),
- 'field_langcode' => array(
- 'default' => '***LANGUAGE_language_content***',
- ),
- 'field_langcode_add_to_query' => array(
- 'default' => TRUE,
- ),
'rendering_language' => array(
- 'default' => 'translation_language_renderer',
+ 'default' => '***LANGUAGE_entity_translation***',
),
// These types are all plugins that can have individual settings
@@ -1175,15 +1160,9 @@ public function optionsSummary(&$categories, &$options) {
$rendering_language_options = $this->buildRenderingLanguageOptions();
$options['rendering_language'] = array(
'category' => 'language',
- 'title' => $this->t('Entity Language'),
+ 'title' => $this->t('Rendering Language'),
'value' => $rendering_language_options[$this->getOption('rendering_language')],
- );
- $language_options = $this->listLanguages(LanguageInterface::STATE_ALL | LanguageInterface::STATE_SITE_DEFAULT | PluginBase::INCLUDE_NEGOTIATED);
- $options['field_langcode'] = array(
- 'category' => 'language',
- 'title' => $this->t('Field Language'),
- 'value' => $language_options[$this->getOption('field_langcode')],
- 'desc' => $this->t('All fields that support translations will be displayed in the selected language.'),
+ 'desc' => $this->t('All content that supports translations will be displayed in the selected language.'),
);
}
@@ -1533,36 +1512,15 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
$this->view->query->buildOptionsForm($form['query']['options'], $form_state);
}
break;
- case 'field_langcode':
- $form['#title'] .= $this->t('Field Language');
- if ($this->isBaseTableTranslatable()) {
- $languages = $this->listLanguages(LanguageInterface::STATE_ALL | LanguageInterface::STATE_SITE_DEFAULT | PluginBase::INCLUDE_NEGOTIATED);
-
- $form['field_langcode'] = array(
- '#type' => 'select',
- '#title' => $this->t('Field Language'),
- '#description' => $this->t('All fields which support translations will be displayed in the selected language.'),
- '#options' => $languages,
- '#default_value' => $this->getOption('field_langcode'),
- );
- $form['field_langcode_add_to_query'] = array(
- '#type' => 'checkbox',
- '#title' => $this->t('When needed, add the field language condition to the query'),
- '#default_value' => $this->getOption('field_langcode_add_to_query'),
- );
- }
- else {
- $form['field_language']['#markup'] = $this->t("You don't have translatable entity types.");
- }
- break;
case 'rendering_language':
- $form['#title'] .= $this->t('Entity Language');
+ $form['#title'] .= $this->t('Rendering language');
if ($this->isBaseTableTranslatable()) {
$options = $this->buildRenderingLanguageOptions();
$form['rendering_language'] = array(
'#type' => 'select',
'#options' => $options,
- '#title' => $this->t('Entity language'),
+ '#title' => $this->t('Rendering language'),
+ '#description' => $this->t('All content that supports translations will be displayed in the selected language.'),
'#default_value' => $this->getOption('rendering_language'),
);
}
@@ -1882,10 +1840,6 @@ public function submitOptionsForm(&$form, FormStateInterface $form_state) {
case 'group_by':
$this->setOption($section, $form_state->getValue($section));
break;
- case 'field_langcode':
- $this->setOption('field_langcode', $form_state->getValue('field_langcode'));
- $this->setOption('field_langcode_add_to_query', $form_state->getValue('field_langcode_add_to_query'));
- break;
case 'rendering_language':
$this->setOption('rendering_language', $form_state->getValue('rendering_language'));
break;
@@ -2515,11 +2469,7 @@ public function getExtenders() {
*/
protected function buildRenderingLanguageOptions() {
// @todo Consider making these plugins. See https://drupal.org/node/2173811.
- return array(
- 'current_language_renderer' => $this->t('Current language'),
- 'default_language_renderer' => $this->t('Default language'),
- 'translation_language_renderer' => $this->t('Translation language'),
- );
+ return $this->listLanguages(LanguageInterface::STATE_CONFIGURABLE | LanguageInterface::STATE_SITE_DEFAULT | PluginBase::INCLUDE_NEGOTIATED | PluginBase::INCLUDE_ENTITY);
}
/**
diff --git a/core/modules/views/src/Plugin/views/field/Field.php b/core/modules/views/src/Plugin/views/field/Field.php
index 86d4fc8b2ed7..5a146f88a290 100644
--- a/core/modules/views/src/Plugin/views/field/Field.php
+++ b/core/modules/views/src/Plugin/views/field/Field.php
@@ -11,9 +11,6 @@
use Drupal\Component\Utility\Xss as CoreXss;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\Core\Field\FieldConfigInterface;
use Drupal\Core\Field\FieldStorageDefinitionInterface;
use Drupal\Core\Field\FieldTypePluginManagerInterface;
use Drupal\Core\Field\FormatterPluginManager;
@@ -24,15 +21,12 @@
use Drupal\Core\Render\Element;
use Drupal\Core\Render\RendererInterface;
use Drupal\Core\Session\AccountInterface;
-use Drupal\field\FieldStorageConfigInterface;
use Drupal\field\Views\FieldAPIHandlerTrait;
+use Drupal\views\Entity\Render\EntityTranslationRenderTrait;
use Drupal\views\Plugin\CacheablePluginInterface;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\views\Plugin\views\field\FieldPluginBase;
-use Drupal\views\Plugin\views\field\MultiItemsFieldHandlerInterface;
use Drupal\views\ResultRow;
use Drupal\views\ViewExecutable;
-use Drupal\views\Views;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -45,6 +39,7 @@
* @ViewsField("field")
*/
class Field extends FieldPluginBase implements CacheablePluginInterface, MultiItemsFieldHandlerInterface {
+ use EntityTranslationRenderTrait;
use FieldAPIHandlerTrait;
@@ -203,6 +198,33 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o
}
}
+ /**
+ * {@inheritdoc}
+ */
+ public function getEntityTypeId() {
+ return $this->getEntityType();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getEntityManager() {
+ return $this->entityManager;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getLanguageManager() {
+ return $this->languageManager;
+ }
+ /**
+ * {@inheritdoc}
+ */
+ protected function getView() {
+ return $this->view;
+ }
+
/**
* {@inheritdoc}
*/
@@ -247,24 +269,10 @@ public function query($use_groupby = FALSE) {
if ($this->add_field_table($use_groupby)) {
$this->ensureMyTable();
$this->addAdditionalFields($fields);
-
- // If we are grouping by something on this field, we want to group by
- // the displayed value, which is translated. So, we need to figure out
- // which language should be used to translate the value. See also
- // $this->field_langcode().
- $field = $field_definition;
- if ($field->isTranslatable() && !empty($this->view->display_handler->options['field_langcode_add_to_query'])) {
- $column = $this->tableAlias . '.langcode';
- $langcode = $this->view->display_handler->options['field_langcode'];
- $substitutions = static::queryLanguageSubstitutions();
- if (isset($substitutions[$langcode])) {
- $langcode = $substitutions[$langcode];
- }
- $placeholder = $this->placeholder();
- $langcode_fallback_candidates = $this->languageManager->getFallbackCandidates(array('langcode' => $langcode, 'operation' => 'views_query', 'data' => $this));
- $this->query->addWhereExpression(0, "$column IN($placeholder) OR $column IS NULL", array($placeholder => $langcode_fallback_candidates));
- }
}
+
+ // Let the configured entity translation renderer alter the query if needed.
+ $this->getEntityTranslationRenderer()->query($this->query);
}
/**
@@ -758,7 +766,7 @@ public function getItems(ResultRow $values) {
function process_entity(ResultRow $values, EntityInterface $entity) {
$processed_entity = clone $entity;
- $langcode = $this->field_langcode($processed_entity);
+ $langcode = $this->getFieldLangcode($processed_entity, $values);
$processed_entity = $processed_entity->getTranslation($langcode);
// If we are grouping, copy our group fields into the cloned entity.
@@ -886,16 +894,23 @@ protected function addSelfTokens(&$tokens, $item) {
}
/**
- * Return the language code of the language the field should be displayed in,
- * according to the settings.
+ * Return the code of the language the field should be displayed in.
+ *
+ * @param \Drupal\Core\Entity\EntityInterface $entity
+ * The entity object the field value being processed is attached to.
+ * @param \Drupal\views\ResultRow $row
+ * The result row the field value being processed belongs to.
+ *
+ * @return string
+ * The field language code.
*/
- function field_langcode(EntityInterface $entity) {
+ protected function getFieldLangcode(EntityInterface $entity, ResultRow $row) {
if ($this->getFieldDefinition()->isTranslatable()) {
- $langcode = $this->view->display_handler->options['field_langcode'];
- $substitutions = static::queryLanguageSubstitutions();
- if (isset($substitutions[$langcode])) {
- $langcode = $substitutions[$langcode];
- }
+ // Even if the current field is not attached to the main entity, we use it
+ // to determine the field language, as we assume the same language should
+ // be used for all values belonging to a single row, when possible. Below
+ // we apply language fallback to ensure a valid value is always picked.
+ $langcode = $this->getEntityTranslationRenderer()->getLangcode($row);
// Give the Entity Field API a chance to fallback to a different language
// (or LanguageInterface::LANGCODE_NOT_SPECIFIED), in case the field has
diff --git a/core/modules/views/src/Plugin/views/row/EntityRow.php b/core/modules/views/src/Plugin/views/row/EntityRow.php
index 159a1d42cc50..071314f2d88c 100644
--- a/core/modules/views/src/Plugin/views/row/EntityRow.php
+++ b/core/modules/views/src/Plugin/views/row/EntityRow.php
@@ -8,10 +8,10 @@
namespace Drupal\views\Plugin\views\row;
use Drupal\Component\Utility\String;
-use Drupal\Core\DependencyInjection\Container;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Language\LanguageManagerInterface;
+use Drupal\views\Entity\Render\EntityTranslationRenderTrait;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\ViewExecutable;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -25,6 +25,7 @@
* )
*/
class EntityRow extends RowPluginBase {
+ use EntityTranslationRenderTrait;
/**
* The table the entity is using for storage.
@@ -54,13 +55,6 @@ class EntityRow extends RowPluginBase {
*/
protected $entityType;
- /**
- * The renderer to be used to render the entity row.
- *
- * @var \Drupal\views\Entity\Rendering\RendererBase
- */
- protected $renderer;
-
/**
* The entity manager.
*
@@ -109,6 +103,34 @@ public static function create(ContainerInterface $container, array $configuratio
return new static($configuration, $plugin_id, $plugin_definition, $container->get('entity.manager'), $container->get('language_manager'));
}
+ /**
+ * {@inheritdoc}
+ */
+ public function getEntityTypeId() {
+ return $this->entityType->id();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getEntityManager() {
+ return $this->entityManager;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getLanguageManager() {
+ return $this->languageManager;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getView() {
+ return $this->view;
+ }
+
/**
* Overrides Drupal\views\Plugin\views\row\RowPluginBase::defineOptions().
*/
@@ -145,26 +167,12 @@ public function summaryTitle() {
}
}
- /**
- * Returns the current renderer.
- *
- * @return \Drupal\views\Entity\Render\RendererBase
- * The configured renderer.
- */
- protected function getRenderer() {
- if (!isset($this->renderer)) {
- $class = '\Drupal\views\Entity\Render\\' . Container::camelize($this->displayHandler->getOption('rendering_language'));
- $this->renderer = new $class($this->view, $this->languageManager, $this->entityType);
- }
- return $this->renderer;
- }
-
/**
* {@inheritdoc}
*/
public function query() {
parent::query();
- $this->getRenderer()->query($this->view->getQuery());
+ $this->getEntityTranslationRenderer()->query($this->view->getQuery());
}
/**
@@ -173,7 +181,7 @@ public function query() {
public function preRender($result) {
parent::preRender($result);
if ($result) {
- $this->getRenderer()->preRender($result);
+ $this->getEntityTranslationRenderer()->preRender($result);
}
}
@@ -181,7 +189,7 @@ public function preRender($result) {
* Overrides Drupal\views\Plugin\views\row\RowPluginBase::render().
*/
public function render($row) {
- return $this->getRenderer()->render($row);
+ return $this->getEntityTranslationRenderer()->render($row);
}
/**
diff --git a/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php b/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php
index 0c2adcae30cf..1d837763c59e 100644
--- a/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php
+++ b/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php
@@ -25,7 +25,7 @@ class RowEntityRenderersTest extends ViewUnitTestBase {
*
* @var array
*/
- public static $modules = array('field', 'filter', 'text', 'node', 'user', 'language', 'entity_reference');
+ public static $modules = array('field', 'filter', 'text', 'node', 'user', 'language', 'entity_reference', 'views_test_language');
/**
* Views used by this test.
@@ -41,6 +41,13 @@ class RowEntityRenderersTest extends ViewUnitTestBase {
*/
protected $langcodes;
+ /**
+ * An array of titles for each node per language.
+ *
+ * @var array
+ */
+ protected $expected;
+
/**
* {@inheritdoc}
*/
@@ -66,13 +73,8 @@ protected function setUp() {
$node_type = NodeType::create(array('type' => 'test'));
$node_type->setDisplaySubmitted(FALSE);
$node_type->save();
- }
- /**
- * Tests the entity row renderers.
- */
- public function testRenderers() {
- $values = array();
+ $this->values = array();
$controller = \Drupal::entityManager()->getStorage('node');
$langcode_index = 0;
@@ -85,19 +87,45 @@ public function testRenderers() {
foreach ($langcodes as $langcode) {
// Ensure we have a predictable result order.
- $values[$i][$langcode] = $i . '-' . $langcode . '-' . $this->randomMachineName();
+ $this->values[$i][$langcode] = $i . '-' . $langcode . '-' . $this->randomMachineName();
if ($langcode != $default_langcode) {
- $node->addTranslation($langcode, array('title' => $values[$i][$langcode]));
+ $node->addTranslation($langcode, array('title' => $this->values[$i][$langcode]));
}
else {
- $node->setTitle($values[$i][$langcode]);
+ $node->setTitle($this->values[$i][$langcode]);
}
$node->save();
}
}
+ }
+ /**
+ * Tests the entity row renderers.
+ */
+ public function testEntityRenderers() {
+ $this->checkLanguageRenderers('page_1', $this->values);
+ }
+
+ /**
+ * Tests the field row renderers.
+ */
+ public function testFieldRenderers() {
+ $this->checkLanguageRenderers('page_2', $this->values);
+ }
+
+ /**
+ * Checks that the language renderer configurations work as expected.
+ *
+ * @param string $display
+ * Name of display to test with.
+ * @param array $values
+ * An array of node information which are each an array of node titles
+ * associated with language keys appropriate for the translation of that
+ * node.
+ */
+ protected function checkLanguageRenderers($display, $values) {
$expected = array(
$values[0]['en'],
$values[0]['en'],
@@ -109,7 +137,7 @@ public function testRenderers() {
$values[2]['en'],
$values[2]['en'],
);
- $this->assertTranslations('current_language_renderer', $expected, 'The current language renderer behaves as expected.');
+ $this->assertTranslations($display, '***LANGUAGE_language_content***', $expected, 'The current language renderer behaves as expected.');
$expected = array(
$values[0]['en'],
@@ -122,7 +150,7 @@ public function testRenderers() {
$values[2]['l1'],
$values[2]['l1'],
);
- $this->assertTranslations('default_language_renderer', $expected, 'The default language renderer behaves as expected.');
+ $this->assertTranslations($display, '***LANGUAGE_entity_default***', $expected, 'The default language renderer behaves as expected.');
$expected = array(
$values[0]['en'],
@@ -135,12 +163,40 @@ public function testRenderers() {
$values[2]['l0'],
$values[2]['l1'],
);
- $this->assertTranslations('translation_language_renderer', $expected, 'The translation language renderer behaves as expected.');
+ $this->assertTranslations($display, '***LANGUAGE_entity_translation***', $expected, 'The translation language renderer behaves as expected.');
+
+ $expected = array(
+ $values[0][$this->langcodes[0]],
+ $values[0][$this->langcodes[0]],
+ $values[0][$this->langcodes[0]],
+ $values[1][$this->langcodes[0]],
+ $values[1][$this->langcodes[0]],
+ $values[1][$this->langcodes[0]],
+ $values[2][$this->langcodes[0]],
+ $values[2][$this->langcodes[0]],
+ $values[2][$this->langcodes[0]],
+ );
+ $this->assertTranslations($display, '***LANGUAGE_site_default***', $expected, 'The site default language renderer behaves as expected.');
+
+ $expected = array(
+ $values[0]['l0'],
+ $values[0]['l0'],
+ $values[0]['l0'],
+ $values[1]['l0'],
+ $values[1]['l0'],
+ $values[1]['l0'],
+ $values[2]['l0'],
+ $values[2]['l0'],
+ $values[2]['l0'],
+ );
+ $this->assertTranslations($display, 'l0', $expected, 'The language specific renderer behaves as expected.');
}
/**
* Checks that the view results match the expected values.
*
+ * @param string $display
+ * Name of display to test with.
* @param string $renderer_id
* The id of the renderer to be tested.
* @param array $expected
@@ -153,17 +209,24 @@ public function testRenderers() {
* @return bool
* TRUE if the assertion succeeded, FALSE otherwise.
*/
- protected function assertTranslations($renderer_id, array $expected, $message = '', $group = 'Other') {
+ protected function assertTranslations($display, $renderer_id, array $expected, $message = '', $group = 'Other') {
$view = Views::getView('test_entity_row_renderers');
+ $view->setDisplay($display);
$view->getDisplay()->setOption('rendering_language', $renderer_id);
$view->preview();
- $result = TRUE;
- foreach ($view->result as $index => $row) {
- $build = $view->rowPlugin->render($row);
- $output = drupal_render($build);
- $result = strpos($output, $expected[$index]) !== FALSE;
- if (!$result) {
+ $result = FALSE;
+ foreach ($expected as $index => $expected_output) {
+ if (!empty($view->result[$index])) {
+ $build = $view->rowPlugin->render($view->result[$index]);
+ $output = drupal_render($build);
+ $result = strpos($output, $expected_output) !== FALSE;
+ if (!$result) {
+ break;
+ }
+ }
+ else {
+ $result = FALSE;
break;
}
}
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_access_none.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_access_none.yml
index 5f8cca3831d2..0c4972963200 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_access_none.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_access_none.yml
@@ -24,8 +24,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_aggregate_count.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_aggregate_count.yml
index b156d2d609a3..28af7113d0d6 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_aggregate_count.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_aggregate_count.yml
@@ -59,8 +59,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_ajax_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_ajax_view.yml
index 1a67001e7ef0..5701f3499281 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_ajax_view.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_ajax_view.yml
@@ -49,8 +49,6 @@ display:
table: views_test_data
plugin_id: numeric
use_ajax: true
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -58,8 +56,6 @@ display:
page_1:
display_options:
path: test_ajax_view
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_alias.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_alias.yml
index a6dbf3516749..dcf6e1d820da 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_alias.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_alias.yml
@@ -91,8 +91,6 @@ display:
type: views_query
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml
index f8ee30a0235c..215e04215acd 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml
@@ -42,8 +42,6 @@ display:
table: views
plugin_id: title
title: test_title_empty
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -60,8 +58,6 @@ display:
table: views
plugin_id: title
title: test_title_header
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: 'Page 1'
id: page_1
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_view.yml
index 68302cb96225..081e4b038790 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_view.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_view.yml
@@ -43,8 +43,6 @@ display:
view_to_insert: 'test_simple_argument:default'
inherit_arguments: true
plugin_id: view
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml
index aa218bf9fbe7..707454ba75fc 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml
@@ -41,8 +41,6 @@ display:
relationship: none
table: views_test_data
plugin_id: numeric
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -57,8 +55,6 @@ display:
id: date_day
table: views_test_data
plugin_id: date_day
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: embed
id: embed_1
display_title: ''
@@ -73,8 +69,6 @@ display:
id: date_month
table: views_test_data
plugin_id: date_month
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: embed
id: embed_2
display_title: ''
@@ -89,8 +83,6 @@ display:
id: date_week
table: views_test_data
plugin_id: date_week
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: embed
id: embed_3
display_title: ''
@@ -105,8 +97,6 @@ display:
id: date_year
table: views_test_data
plugin_id: date_year
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: embed
id: embed_4
display_title: ''
@@ -121,8 +111,6 @@ display:
id: date_year_month
table: views_test_data
plugin_id: date_year_month
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: embed
id: embed_5
display_title: ''
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_current_user.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_current_user.yml
index a82ee33c42cb..8b7b5fb1dc1f 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_current_user.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_current_user.yml
@@ -58,8 +58,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_fixed.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_fixed.yml
index 4b8e8c846636..60f617d1a239 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_fixed.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_fixed.yml
@@ -58,8 +58,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_dependency.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_dependency.yml
index fce7f88762de..f792ea165b2f 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_dependency.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_dependency.yml
@@ -216,5 +216,3 @@ display:
entity_field: uid
plugin_id: numeric
display_extenders: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attachment_ui.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attachment_ui.yml
index a7db54014de9..d3667393f675 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attachment_ui.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attachment_ui.yml
@@ -34,8 +34,6 @@ display:
table: views_test_data
field: id
plugin_id: numeric
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -45,9 +43,6 @@ display:
display_title: Attachment
id: attachment_1
position: 1
- display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
feed_1:
display_plugin: feed
id: feed_1
@@ -70,14 +65,10 @@ display:
guid_field: id
guid_field_is_permalink: false
path: test_attachment_ui_feed
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_plugin: page
display_title: Page
display_options:
path: test_attachment_ui
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
id: page_1
position: 2
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_cache.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_cache.yml
index 746c99d6006e..82908d8ca483 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_cache.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_cache.yml
@@ -42,5 +42,3 @@ display:
table: views_test_data
field: id
relationship: none
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_click_sort.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_click_sort.yml
index 8cfdba2ef84c..680e51e49d5e 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_click_sort.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_click_sort.yml
@@ -46,8 +46,6 @@ display:
default_sort_order: desc
created:
sortable: false
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -55,8 +53,6 @@ display:
page_1:
display_options:
path: test_click_sort
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_destroy.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_destroy.yml
index 7e5e4eb01ab2..5661a18efa27 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_destroy.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_destroy.yml
@@ -163,8 +163,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -176,8 +174,6 @@ display:
page_1: page_1
pager:
type: some
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: attachment
display_title: Attachment
id: attachment_1
@@ -189,8 +185,6 @@ display:
page_1: page_1
pager:
type: some
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: attachment
display_title: Attachment
id: attachment_2
@@ -198,8 +192,6 @@ display:
page_1:
display_options:
path: test_destroy
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_disabled_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_disabled_display.yml
index 31db06e73417..032e20b08f79 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_disabled_display.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_disabled_display.yml
@@ -143,8 +143,6 @@ display:
relationships: { }
arguments: { }
display_extenders: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
attachment_1:
display_plugin: attachment
id: attachment_1
@@ -152,8 +150,6 @@ display:
position: 1
display_options:
display_extenders: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
displays:
page_2: page_2
display_description: ''
@@ -165,8 +161,6 @@ display:
position: 1
display_options:
display_extenders: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_description: ''
enabled: false
embed_1:
@@ -176,8 +170,6 @@ display:
position: 1
display_options:
display_extenders: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_description: ''
enabled: false
feed_1:
@@ -187,8 +179,6 @@ display:
position: 1
display_options:
display_extenders: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_description: ''
enabled: false
path: test-disabled-display.xml
@@ -199,8 +189,6 @@ display:
position: 1
display_options:
display_extenders: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
path: test-disabled-display
page_2:
display_plugin: page
@@ -209,8 +197,6 @@ display:
position: 2
display_options:
display_extenders: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
path: test-disabled-display-2
display_description: ''
enabled: false
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml
index 23ea953cba4b..4358c397c6d7 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml
@@ -59,8 +59,6 @@ display:
entity_type: node
entity_field: created
title: 'Test Display'
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -79,8 +77,6 @@ display:
type: some
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: block
display_title: Block
id: block_1
@@ -88,8 +84,6 @@ display:
page_1:
display_options:
path: test-display
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_attachment.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_attachment.yml
index bafbdc917f7c..7822bc3dedd0 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_attachment.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_attachment.yml
@@ -50,8 +50,6 @@ display:
hide_empty: false
empty_zero: false
title: test_display_attachment
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
attachment_1:
display_plugin: attachment
id: attachment_1
@@ -60,8 +58,6 @@ display:
display_options:
displays:
page_1: page_1
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
@@ -69,5 +65,3 @@ display:
position: 1
display_options:
path: test-display-attachment
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_defaults.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_defaults.yml
index af8b88845374..224019c742d4 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_defaults.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_defaults.yml
@@ -49,5 +49,3 @@ display:
field: created
order: DESC
plugin_id: date
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_empty.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_empty.yml
index 237b401e5474..25eaf1ae9095 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_empty.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_empty.yml
@@ -39,8 +39,6 @@ display:
id: area
table: views
plugin_id: text
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_feed.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_feed.yml
index 4ab684fcb905..a88f65552bdb 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_feed.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_feed.yml
@@ -76,8 +76,6 @@ display:
style:
type: default
title: test_display_feed
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -93,8 +91,6 @@ display:
style:
type: rss
sitename_title: true
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: feed
display_title: Feed
id: feed_1
@@ -102,8 +98,6 @@ display:
page:
display_options:
path: test-feed-display
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_invalid.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_invalid.yml
index 01ba2cc2ca63..3d108134be4d 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_invalid.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_invalid.yml
@@ -24,8 +24,6 @@ display:
plugin_id: numeric
entity_type: node
entity_field: nid
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -35,14 +33,9 @@ display:
id: block_1
display_title: Block
position: 1
- display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_options:
path: test_display_invalid
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_more.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_more.yml
index 857c0c09b653..674daca51748 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_more.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_more.yml
@@ -39,8 +39,6 @@ display:
use_more_always: true
use_more_text: 'custom more text'
link_display: page_1
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -52,5 +50,3 @@ display:
position: 1
display_options:
path: test_display_more
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml
index 343901706c1f..8da09ebbb634 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml
@@ -233,8 +233,6 @@ display:
entity_type: node
entity_field: created
title: test_dropbutton
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
@@ -242,5 +240,3 @@ display:
position: null
display_options:
path: test-dropbutton
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_area.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_area.yml
index d3e98c1d9cc1..74e7c5914192 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_area.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_area.yml
@@ -58,8 +58,6 @@ display:
options:
offset: 0
type: none
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_operations.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_operations.yml
index 205e8ce64fbb..73e6b1239da1 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_operations.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_operations.yml
@@ -180,8 +180,6 @@ display:
entity_type: node
entity_field: created
title: test_entity_operations
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
@@ -189,5 +187,3 @@ display:
position: null
display_options:
path: test-entity-operations
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row.yml
index a0b397cb1335..d0e1e7fcf8cd 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row.yml
@@ -25,8 +25,6 @@ display:
options:
relationship: none
view_mode: full
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row_renderers.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row_renderers.yml
index 9c7307dc786d..edf5b71aad13 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row_renderers.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row_renderers.yml
@@ -1,6 +1,8 @@
langcode: und
status: true
dependencies:
+ config:
+ - core.entity_view_mode.node.teaser
module:
- node
id: test_entity_row_renderers
@@ -39,6 +41,32 @@ display:
plugin_id: standard
entity_type: node
entity_field: title
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
- rendering_language: translation_language_renderer
+ rendering_language: '***LANGUAGE_entity_translation***'
+ fields:
+ title:
+ id: title
+ table: node_field_data
+ field: title
+ entity_type: node
+ entity_field: title
+ plugin_id: field
+ page_1:
+ display_plugin: page
+ id: page_1
+ display_title: Page
+ position: 1
+ display_options:
+ rendering_language: '***LANGUAGE_entity_translation***'
+ path: test_entity_row_renderers/entities
+ page_2:
+ display_plugin: page
+ id: page_2
+ display_title: 'Page 2'
+ position: 2
+ display_options:
+ rendering_language: '***LANGUAGE_entity_translation***'
+ path: test_entity_row_renderers/fields
+ defaults:
+ row: false
+ row:
+ type: fields
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml
index 98e061ca7844..726bbc0a7075 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml
@@ -92,5 +92,3 @@ display:
plugin_id: bundle
entity_type: node
entity_field: type
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area.yml
index d472bc0193a3..a8b6f8d09d8e 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area.yml
@@ -33,8 +33,6 @@ display:
id: test_example
table: views
plugin_id: test_example
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_executable_displays.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_executable_displays.yml
index c3cd40186638..8f2ef55a5777 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_executable_displays.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_executable_displays.yml
@@ -15,17 +15,11 @@ display:
display_title: Master
id: default
position: 0
- display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_plugin: page
display_title: Page
id: page_1
position: 1
- display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_2:
display_plugin: page
display_title: 'Page 2'
@@ -36,5 +30,3 @@ display:
style: false
style:
type: grid
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml
index ee30393ba2b2..280c93084429 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml
@@ -90,8 +90,6 @@ display:
type: default
row:
type: 'entity:node'
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -99,8 +97,6 @@ display:
page_1:
display_options:
path: test_exposed_admin_ui
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_block.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_block.yml
index 53983ff8b8fe..281080c1aa46 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_block.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_block.yml
@@ -46,8 +46,6 @@ display:
type: default
row:
type: 'entity:node'
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -56,8 +54,6 @@ display:
display_options:
path: test_exposed_block
exposed_block: true
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_buttons.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_buttons.yml
index cc37f7461b1a..dc966a3fc5f7 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_buttons.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_buttons.yml
@@ -47,8 +47,6 @@ display:
type: default
row:
type: 'entity:node'
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -56,8 +54,6 @@ display:
page_1:
display_options:
path: test_exposed_form_buttons
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_classes.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_classes.yml
index e45746f9cd43..d834164c66a0 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_classes.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_classes.yml
@@ -23,8 +23,6 @@ display:
plugin_id: numeric
style:
type: html_list
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -32,8 +30,6 @@ display:
page_1:
display_options:
path: test_field_classes
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_get_entity.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_get_entity.yml
index 27fa4e1f4e3d..55bf2a236e82 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_get_entity.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_get_entity.yml
@@ -75,8 +75,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_output.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_output.yml
index 722823bb0669..6eabc025f64b 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_output.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_output.yml
@@ -24,8 +24,6 @@ display:
plugin_id: string
style:
type: html_list
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_tokens.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_tokens.yml
index b3a4c06ecf38..b08aa62f9ea5 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_tokens.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_tokens.yml
@@ -47,8 +47,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Defaults
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter.yml
index 552f95f9a3ec..61da33a3f3f9 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter.yml
@@ -43,8 +43,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_date_between.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_date_between.yml
index 57cc2f5c1c82..b7ab7ccad603 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_date_between.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_date_between.yml
@@ -46,8 +46,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_group_override.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_group_override.yml
index 82037bcc65d6..13e9e8fbd726 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_group_override.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_group_override.yml
@@ -53,8 +53,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -62,8 +60,6 @@ display:
page_1:
display_options:
path: test
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_groups.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_groups.yml
index c374195bedbc..936b849f4048 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_groups.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_groups.yml
@@ -89,8 +89,6 @@ display:
type: default
row:
type: 'entity:node'
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -137,8 +135,6 @@ display:
entity_type: node
entity_field: status
path: test-filter-groups
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml
index 274669949925..0e97477e59d4 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml
@@ -39,8 +39,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_get_attach_displays.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_get_attach_displays.yml
index c7205ecf443a..b07ee55e1497 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_get_attach_displays.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_get_attach_displays.yml
@@ -80,8 +80,6 @@ display:
entity_type: node
entity_field: created
title: test_get_attach_displays
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
feed_1:
display_plugin: feed
id: feed_1
@@ -98,8 +96,6 @@ display:
displays:
default: default
page_1: page_1
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
feed_2:
display_plugin: feed
id: feed_2
@@ -109,8 +105,6 @@ display:
displays:
default: default
page_1: page_1
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
@@ -118,5 +112,3 @@ display:
position: null
display_options:
path: test-get-attach-displays
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_glossary.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_glossary.yml
index 9effcbcbeaf5..716dbfb22fd2 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_glossary.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_glossary.yml
@@ -54,8 +54,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_grid.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_grid.yml
index d8400f7fc70d..d48597fdb7f7 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_grid.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_grid.yml
@@ -60,8 +60,6 @@ display:
row_class_custom: 'age-{{ age }}'
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -69,8 +67,6 @@ display:
page_1:
display_options:
path: test-grid
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: 'Page display'
id: page_1
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count.yml
index ac85982ec110..ff5a1d85defb 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count.yml
@@ -61,8 +61,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_in_filters.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_in_filters.yml
index bd57f7cb3077..4aa2248b1e04 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_in_filters.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_in_filters.yml
@@ -55,8 +55,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_rows.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_rows.yml
index 588bc714facf..9b9988028dd3 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_rows.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_rows.yml
@@ -99,6 +99,4 @@ display:
separator: ', '
field_api_classes: false
plugin_id: field
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_extenders: { }
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_groupwise_term_ui.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_groupwise_term_ui.yml
index 872ab9ef1049..43f5464429ca 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_groupwise_term_ui.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_groupwise_term_ui.yml
@@ -73,8 +73,6 @@ display:
style:
type: default
title: test_groupwise
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_relationships.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_relationships.yml
index 1fd3c3f8fb9b..62e3069e73b5 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_relationships.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_relationships.yml
@@ -34,8 +34,6 @@ display:
field: node
relationship: comment_cid
plugin_id: standard
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_test_access.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_test_access.yml
index 13d1ce80365a..9afaf2af9a48 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_test_access.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_test_access.yml
@@ -56,8 +56,6 @@ display:
table: views_test_data
field: access_callback_arguments
plugin_id: standard
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_history.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_history.yml
index 79f5361afcf5..29a8dfcf2980 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_history.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_history.yml
@@ -127,8 +127,6 @@ display:
order: DESC
entity_type: node
entity_field: created
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
@@ -137,8 +135,6 @@ display:
display_options:
display_description: ''
path: test-without-history
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_2:
display_plugin: page
id: page_2
@@ -230,5 +226,3 @@ display:
operator: AND
groups:
1: AND
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_http_status_code.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_http_status_code.yml
index 4ab699f052fa..3d31fb734a79 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_http_status_code.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_http_status_code.yml
@@ -85,8 +85,6 @@ display:
empty: true
status_code: 200
plugin_id: http_status_code
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
@@ -94,5 +92,3 @@ display:
position: null
display_options:
path: test-http-status-code
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml
index af8e374d243c..47431866fe0c 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml
@@ -86,8 +86,6 @@ display:
filter_groups:
operator: AND
groups: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
@@ -95,8 +93,6 @@ display:
position: null
display_options:
path: test_mini_pager
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_2:
display_plugin: page
id: page_2
@@ -110,8 +106,6 @@ display:
type: mini
options:
items_per_page: 1
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_3:
display_plugin: page
id: page_3
@@ -125,5 +119,3 @@ display:
type: mini
options:
items_per_page: 0
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml
index b80d96a0d8fe..af65cc4c1a88 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml
@@ -24,8 +24,6 @@ display:
relationship: none
table: views_test_data
plugin_id: numeric
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -33,8 +31,6 @@ display:
page_1:
display_options:
path: test_page_display_403
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
@@ -42,8 +38,6 @@ display:
page_2:
display_options:
path: test_page_display_404
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_2
@@ -51,8 +45,6 @@ display:
page_3:
display_options:
path: test_page_display_200
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_3
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_arguments.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_arguments.yml
index 2b3ff4041f9f..081b74623eef 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_arguments.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_arguments.yml
@@ -22,8 +22,6 @@ display:
field: id
table: views_test_data
plugin_id: numeric
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -31,8 +29,6 @@ display:
page_1:
display_options:
path: test_route_without_arguments
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
@@ -49,8 +45,6 @@ display:
table: views_test_data
plugin_id: numeric
path: test_route_with_argument
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_2
@@ -67,8 +61,6 @@ display:
table: views_test_data
plugin_id: numeric
path: test_route_with_suffix/%/suffix
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_3
@@ -91,8 +83,6 @@ display:
table: views_test_data
plugin_id: numeric
path: test_route_with_suffix_and_argument/%/suffix
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_4
@@ -109,8 +99,6 @@ display:
table: views_test_data
plugin_id: numeric
path: test_route_with_long_argument/%
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_5
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml
index 6d524b90769a..b6722037cb3f 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml
@@ -22,8 +22,6 @@ display:
table: views_test_data
field: id
plugin_id: numeric
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -47,8 +45,6 @@ display:
weight: 0
defaults:
title: false
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
@@ -66,8 +62,6 @@ display:
context: '0'
defaults:
title: false
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_2
@@ -85,8 +79,6 @@ display:
context: '0'
defaults:
title: false
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_3
@@ -105,8 +97,6 @@ display:
context: '0'
defaults:
title: false
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_4
@@ -125,8 +115,6 @@ display:
context: '0'
defaults:
title: false
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_5
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_route.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_route.yml
index 7b412f9b2707..bd034bbfd7af 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_route.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_route.yml
@@ -26,8 +26,6 @@ display:
table: views_test_data
field: id
plugin_id: numeric
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -35,8 +33,6 @@ display:
page_1:
display_options:
path: test_route_without_arguments
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
@@ -53,8 +49,6 @@ display:
table: views_test_data
plugin_id: numeric
path: test_route_with_argument
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_2
@@ -71,8 +65,6 @@ display:
table: views_test_data
plugin_id: numeric
path: test_route_with_argument/%/suffix
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_3
@@ -95,8 +87,6 @@ display:
table: views_test_data
plugin_id: numeric
path: test_route_with_argument/%/suffix
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_4
@@ -119,8 +109,6 @@ display:
table: views_test_data
plugin_id: numeric
path: test_route_with_argument
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_5
@@ -143,8 +131,6 @@ display:
table: views_test_data
plugin_id: numeric
path: test_route_with_argument/%/%
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_6
@@ -156,8 +142,6 @@ display:
access:
type: test_static
path: test_route_arguments_access
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_7
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_view.yml
index 3909cf78fc52..0d2be99b7519 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_view.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_view.yml
@@ -23,8 +23,6 @@ display:
relationship: none
table: views_test_data
plugin_id: numeric
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -33,7 +31,4 @@ display:
display_plugin: page
display_title: 'Test page view'
id: page_1
- display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
position: null
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_full.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_full.yml
index b6e8798e90d3..a347a766aa61 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_full.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_full.yml
@@ -30,8 +30,6 @@ display:
type: default
row:
type: 'entity:node'
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_none.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_none.yml
index 283b72b3cfa3..d72584dd5461 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_none.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_none.yml
@@ -26,8 +26,6 @@ display:
type: default
row:
type: 'entity:node'
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_some.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_some.yml
index c6cc162cc67b..2d432a7c5f53 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_some.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_some.yml
@@ -29,8 +29,6 @@ display:
type: default
row:
type: 'entity:node'
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_plugin_dependencies.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_plugin_dependencies.yml
index acd118f8a5cc..c7818d26d834 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_plugin_dependencies.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_plugin_dependencies.yml
@@ -47,8 +47,6 @@ display:
type: test_style
row:
type: test_row
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_preview.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_preview.yml
index d032aab21eb1..a1629b43c73f 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_preview.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_preview.yml
@@ -126,5 +126,3 @@ display:
content: 'Test empty text'
tokenize: false
plugin_id: text_custom
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_redirect_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_redirect_view.yml
index d93ac85bd279..b3272bbd2121 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_redirect_view.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_redirect_view.yml
@@ -80,8 +80,6 @@ display:
entity_type: node
entity_field: created
title: test_redirect_view
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
@@ -89,5 +87,3 @@ display:
position: null
display_options:
path: test-redirect-view
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_relationship_dependency.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_relationship_dependency.yml
index b6b43c3f2e64..6b05cf103f11 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_relationship_dependency.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_relationship_dependency.yml
@@ -50,8 +50,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_search.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_search.yml
index a7729b107f8d..f7993e861f58 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_search.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_search.yml
@@ -126,8 +126,6 @@ display:
empty: { }
relationships: { }
arguments: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
@@ -193,8 +191,6 @@ display:
1: AND
path: test-filter
title: 'Filter Page'
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_2:
display_plugin: page
id: page_2
@@ -261,5 +257,3 @@ display:
validate_options: { }
plugin_id: search
title: 'Arg Page'
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml
index 651ef5b9b522..2689298cee34 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml
@@ -59,8 +59,6 @@ display:
field: age
relationship: none
plugin_id: numeric
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_store_pager_settings.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_store_pager_settings.yml
index 358af74a70cd..0be4da4cf778 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_store_pager_settings.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_store_pager_settings.yml
@@ -26,8 +26,6 @@ display:
type: default
row:
type: 'entity:node'
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_html_list.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_html_list.yml
index c78101f9a683..35a0496751e6 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_html_list.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_html_list.yml
@@ -48,5 +48,3 @@ display:
id: name
table: views_test_data
field: name
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml
index 81a8c88d7164..12aac8d8153a 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml
@@ -59,8 +59,6 @@ display:
title_field: name
toggle_numeric_field: true
toggle_title_field: true
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_opml.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_opml.yml
index 55f399d757be..06f24dee8a17 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_opml.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_opml.yml
@@ -252,8 +252,6 @@ display:
empty: { }
relationships: { }
arguments: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
feed_1:
display_plugin: feed
id: feed_1
@@ -279,8 +277,6 @@ display:
url_field: ''
path: test-feed-opml-style
displays: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page:
display_plugin: page
id: page_1
@@ -288,5 +284,3 @@ display:
position: 1
display_options:
path: test-opml-style
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_table.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_table.yml
index b3714a3afe65..7460f10d37f9 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_table.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_table.yml
@@ -129,8 +129,6 @@ display:
content: 'custom text'
tokenize: false
plugin_id: text_custom
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -138,8 +136,6 @@ display:
page_1:
display_options:
path: test-table
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: 'Page display'
id: page_1
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tag_cache.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tag_cache.yml
index 802f06f95126..79ab0843b0ed 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tag_cache.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tag_cache.yml
@@ -64,8 +64,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml
index cc7732d3ccf9..44e4c4866ddc 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml
@@ -40,8 +40,6 @@ display:
type: full
options:
items_per_page: 10
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -59,5 +57,3 @@ display:
type: views_query
options: { }
path: test_tokens
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml
index 8a3205859219..2861c7a9d6b3 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml
@@ -49,8 +49,6 @@ display:
relationship: none
table: views_test_data
plugin_id: numeric
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml
index 313b7631dd06..015262f131a9 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml
@@ -34,8 +34,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_broken.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_broken.yml
index f247a1eda820..a7fe7c979e8c 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_broken.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_broken.yml
@@ -77,8 +77,6 @@ display:
options:
offset: 0
type: none
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_delete.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_delete.yml
index 62017c809310..b1ad67d76ef1 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_delete.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_delete.yml
@@ -26,8 +26,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Defaults
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_display_template.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_display_template.yml
index 2c2abd50c11e..ac29cb68b838 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_display_template.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_display_template.yml
@@ -44,5 +44,3 @@ display:
empty: { }
relationships: { }
arguments: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_embed.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_embed.yml
index 8ca9e5ca59a0..9b0b319a3bdc 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_embed.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_embed.yml
@@ -49,8 +49,6 @@ display:
relationship: none
table: views_test_data
plugin_id: numeric
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_empty.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_empty.yml
index 95b533bba97f..51ddaa1340c5 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_empty.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_empty.yml
@@ -27,8 +27,6 @@ display:
options:
offset: 0
type: none
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test.yml
index ff1821225a9b..03c0a785876c 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test.yml
@@ -59,8 +59,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test_additional_base_field.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test_additional_base_field.yml
index 952795509cde..c05cd7df51ca 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test_additional_base_field.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test_additional_base_field.yml
@@ -59,8 +59,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test_data.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test_data.yml
index a711cf4d9d22..2245c4225fbc 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test_data.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test_data.yml
@@ -59,8 +59,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test_revision.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test_revision.yml
index e80028b790b4..a65b09007fec 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test_revision.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test_revision.yml
@@ -59,8 +59,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml
index 9b5c3d477022..f656bdd56f26 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml
@@ -65,8 +65,6 @@ display:
id: numeric
table: views_test_data
plugin_id: numeric
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml
index a9cdc0f03df4..ead31fd85b64 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml
@@ -49,8 +49,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml
index 1dec7f00c4ce..3e1aa093aa16 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml
@@ -49,8 +49,6 @@ display:
plugin_id: standard
style:
type: table
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_status.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_status.yml
index 177e0b1f4809..312c2c4ffe10 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_status.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_status.yml
@@ -15,6 +15,3 @@ display:
id: default
display_title: Master
position: null
- display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml
index 5a8ad5fb14e4..8d39cd300c16 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml
@@ -31,8 +31,6 @@ display:
relationship: none
table: views_test_data
plugin_id: standard
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -46,8 +44,6 @@ display:
query:
type: views_query
options: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
page_1:
id: page_1
display_title: Page
@@ -58,5 +54,3 @@ display:
type: views_query
options: { }
path: test_view_storage
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_views_groupby_save.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_views_groupby_save.yml
index f2d15cf4f070..10c979ade4c2 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_views_groupby_save.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_views_groupby_save.yml
@@ -30,8 +30,6 @@ display:
table: views_test_data
id: id
plugin_id: numeric
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
diff --git a/core/modules/views/tests/modules/views_test_data/test_views/views.view.test_access_static.yml b/core/modules/views/tests/modules/views_test_data/test_views/views.view.test_access_static.yml
index 7835dc96b616..270fd81e9ee9 100644
--- a/core/modules/views/tests/modules/views_test_data/test_views/views.view.test_access_static.yml
+++ b/core/modules/views/tests/modules/views_test_data/test_views/views.view.test_access_static.yml
@@ -28,8 +28,6 @@ display:
type: default
row:
type: fields
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
@@ -37,8 +35,6 @@ display:
page_1:
display_options:
path: test_access_static
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
diff --git a/core/modules/views/tests/modules/views_test_language/views_test_language.info.yml b/core/modules/views/tests/modules/views_test_language/views_test_language.info.yml
new file mode 100644
index 000000000000..0163ecb1e0c3
--- /dev/null
+++ b/core/modules/views/tests/modules/views_test_language/views_test_language.info.yml
@@ -0,0 +1,9 @@
+name: 'Views Test Language'
+type: module
+description: 'Test module for Views.'
+package: Testing
+version: VERSION
+core: 8.x
+dependencies:
+ - views
+ - language
diff --git a/core/modules/views/tests/modules/views_test_language/views_test_language.views.inc b/core/modules/views/tests/modules/views_test_language/views_test_language.views.inc
new file mode 100644
index 000000000000..b75d1f5ada67
--- /dev/null
+++ b/core/modules/views/tests/modules/views_test_language/views_test_language.views.inc
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @file
+ * Provides views data and hooks for views_test_language module.
+ */
+
+/**
+ * Implements hook_views_data_alter().
+ */
+function views_test_language_views_data_alter(array &$data) {
+ // Make node titles use configurable field rendering for this test.
+ // @todo No need for this once https://www.drupal.org/node/2342045 lands.
+ $data['node_field_data']['title']['field']['id'] = 'field';
+}
diff --git a/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php b/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php
index 90ac97c71d1b..08f5c42c6df8 100644
--- a/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php
@@ -55,6 +55,13 @@ class FieldTest extends UnitTestCase {
*/
protected $renderer;
+ /**
+ * The container.
+ *
+ * @var \Drupal\Core\DependencyInjection\Container
+ */
+ protected $container;
+
/**
* {@inheritdoc}
*/
@@ -83,9 +90,9 @@ protected function setUp() {
->disableOriginalConstructor()
->getMock();
- $container = new ContainerBuilder();
- $container->set('plugin.manager.field.field_type', $this->fieldTypePluginManager);
- \Drupal::setContainer($container);
+ $this->container = new ContainerBuilder();
+ $this->container->set('plugin.manager.field.field_type', $this->fieldTypePluginManager);
+ \Drupal::setContainer($this->container);
}
/**
@@ -406,6 +413,8 @@ public function testQueryWithGroupByForBaseField() {
$handler = new Field([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
$handler->view = $this->executable;
+ $this->setupLanguageRenderer($handler, $definition);
+
$field_storage = $this->getBaseFieldStorage();
$this->entityManager->expects($this->any())
->method('getFieldStorageDefinitions')
@@ -465,6 +474,8 @@ public function testQueryWithGroupByForConfigField() {
$handler = new Field([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
$handler->view = $this->executable;
+ $this->setupLanguageRenderer($handler, $definition);
+
$field_storage = $this->getConfigFieldStorage();
$this->entityManager->expects($this->any())
->method('getFieldStorageDefinitions')
@@ -565,4 +576,41 @@ public function providerSortOrders() {
];
}
+ /**
+ * Setup the mock data needed to make language renderers work.
+ *
+ * @param \Drupal\views\Plugin\views\field\Field $handler
+ * The field handler.
+ * @param $definition
+ * An array with entity type definition data.
+ */
+ protected function setupLanguageRenderer(Field $handler, $definition) {
+ $display_handler = $this->getMockBuilder('\Drupal\views\Plugin\views\display\DisplayPluginBase')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $display_handler->expects($this->any())
+ ->method('getOption')
+ ->with($this->equalTo('rendering_language'))
+ ->willReturn('en');
+ $handler->view->display_handler = $display_handler;
+
+ $data['table']['entity type'] = $definition['entity_type'];
+ $views_data = $this->getMockBuilder('\Drupal\views\ViewsData')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $views_data->expects($this->any())
+ ->method('get')
+ ->willReturn($data);
+ $this->container->set('views.views_data', $views_data);
+
+ $entity_type = $this->getMock('\Drupal\Core\Entity\EntityTypeInterface');
+ $entity_type->expects($this->any())
+ ->method('id')
+ ->willReturn($definition['entity_type']);
+
+ $this->entityManager->expects($this->any())
+ ->method('getDefinition')
+ ->willReturn($entity_type);
+ }
+
}
diff --git a/core/modules/views_ui/src/Tests/ViewEditTest.php b/core/modules/views_ui/src/Tests/ViewEditTest.php
index b46dd6babfce..90489726a171 100644
--- a/core/modules/views_ui/src/Tests/ViewEditTest.php
+++ b/core/modules/views_ui/src/Tests/ViewEditTest.php
@@ -100,9 +100,10 @@ public function testEditFormLanguageOptions() {
foreach ($test_views as $view_name => $display) {
$this->drupalGet('admin/structure/views/view/' . $view_name);
$this->assertResponse(200);
- $langcode_url = 'admin/structure/views/nojs/display/' . $view_name . '/' . $display . '/field_langcode';
+ $langcode_url = 'admin/structure/views/nojs/display/' . $view_name . '/' . $display . '/rendering_language';
$this->assertNoLinkByHref($langcode_url);
- $this->assertNoLink(t('Language selected for !type', array('!type' => t('Content'))));
+ $this->assertNoLink(t('!type language selected for page', array('!type' => t('Content'))));
+ $this->assertNoLink(t('Content language of view row'));
}
// Make the site multilingual and test the options again.
@@ -111,18 +112,20 @@ public function testEditFormLanguageOptions() {
$this->resetAll();
$this->rebuildContainer();
- // Language options should now exist with content language defaults.
+ // Language options should now exist with entity language the default.
foreach ($test_views as $view_name => $display) {
$this->drupalGet('admin/structure/views/view/' . $view_name);
$this->assertResponse(200);
- $langcode_url = 'admin/structure/views/nojs/display/' . $view_name . '/' . $display . '/field_langcode';
+ $langcode_url = 'admin/structure/views/nojs/display/' . $view_name . '/' . $display . '/rendering_language';
if ($view_name == 'test_view') {
$this->assertNoLinkByHref($langcode_url);
- $this->assertNoLink(t('Language selected for !type', array('!type' => t('Content'))));
+ $this->assertNoLink(t('!type language selected for page', array('!type' => t('Content'))));
+ $this->assertNoLink(t('Content language of view row'));
}
else {
$this->assertLinkByHref($langcode_url);
- $this->assertLink(t('Language selected for !type', array('!type' => t('Content'))));
+ $this->assertNoLink(t('!type language selected for page', array('!type' => t('Content'))));
+ $this->assertLink(t('Content language of view row'));
}
$this->drupalGet($langcode_url);
@@ -131,8 +134,7 @@ public function testEditFormLanguageOptions() {
$this->assertText(t("You don't have translatable entity types."));
}
else {
- $this->assertFieldByName('field_langcode', '***LANGUAGE_language_content***');
- $this->assertFieldByName('field_langcode_add_to_query', TRUE);
+ $this->assertFieldByName('rendering_language', '***LANGUAGE_entity_translation***');
}
}
}
diff --git a/core/modules/views_ui/tests/modules/views_ui_test/config/install/views.view.sa_contrib_2013_035.yml b/core/modules/views_ui/tests/modules/views_ui_test/config/install/views.view.sa_contrib_2013_035.yml
index 342917bcb06f..7eb66534f876 100644
--- a/core/modules/views_ui/tests/modules/views_ui_test/config/install/views.view.sa_contrib_2013_035.yml
+++ b/core/modules/views_ui/tests/modules/views_ui_test/config/install/views.view.sa_contrib_2013_035.yml
@@ -179,8 +179,6 @@ display:
empty: { }
relationships: { }
arguments: { }
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
title: '<marquee>VIEWS TITLE</marquee>'
page_1:
display_plugin: page
@@ -188,6 +186,4 @@ display:
display_title: Page
position: 2
display_options:
- field_langcode: '***LANGUAGE_language_content***'
- field_langcode_add_to_query: null
path: foobar
--
GitLab