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 c2ae025..a135a6f 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 @@ -154,7 +154,6 @@ display: entity_field: created title: form field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null page_1: display_plugin: page id: page_1 @@ -163,7 +162,6 @@ display: 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 @@ -185,4 +183,3 @@ display: 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 6aeb947..eac4a24 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 @@ -137,7 +137,6 @@ display: relationships: { } arguments: { } field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null feed_items: display_plugin: feed id: feed_items @@ -149,4 +148,3 @@ display: 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 8612cff..bf33141 100644 --- a/core/modules/aggregator/config/install/views.view.aggregator_sources.yml +++ b/core/modules/aggregator/config/install/views.view.aggregator_sources.yml @@ -142,7 +142,6 @@ display: relationships: { } arguments: { } field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null feed_1: display_plugin: feed id: feed_1 @@ -150,7 +149,6 @@ display: position: 2 display_options: field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null style: type: opml options: @@ -390,7 +388,6 @@ display: 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 5c094ae..03acb13 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 @@ -169,7 +169,6 @@ display: filters: { } sorts: { } field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null feed_1: display_plugin: feed id: feed_1 @@ -182,4 +181,3 @@ display: 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 f5f9312..17ec034 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 @@ -39,7 +39,6 @@ display: 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 @@ -47,4 +46,3 @@ display: 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 bf2de47..ff04e33 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 @@ -41,7 +41,6 @@ display: 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 @@ -49,7 +48,6 @@ display: position: null display_options: field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null block_2: display_plugin: block id: block_2 @@ -57,7 +55,6 @@ display: position: null display_options: field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null block_3: display_plugin: block id: block_3 @@ -65,4 +62,3 @@ display: position: null display_options: field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null 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 41ee8e6..68dcf0b 100644 --- a/core/modules/comment/config/install/views.view.comments_recent.yml +++ b/core/modules/comment/config/install/views.view.comments_recent.yml @@ -235,7 +235,6 @@ display: 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 @@ -245,6 +244,5 @@ display: 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 bd04a83..e7b9898 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 @@ -353,7 +353,6 @@ display: 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 @@ -362,7 +361,6 @@ display: 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 b92f2d6..3dacae4 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 @@ -148,7 +148,6 @@ display: empty: { } arguments: { } field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null page_1: display_plugin: page id: page_1 @@ -157,4 +156,3 @@ display: 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 78fccb6..4c2be17 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 @@ -64,7 +64,6 @@ display: filters: { } sorts: { } field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null feed_1: display_plugin: feed id: feed_1 @@ -73,4 +72,3 @@ display: 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 8e852ce..0f93ddc 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 @@ -56,7 +56,6 @@ display: 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 5b4a6bf..e3aac61 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 @@ -148,8 +148,7 @@ display: 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 @@ -157,7 +156,6 @@ display: position: 1 display_options: field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null path: test-body-filter display_description: '' filters: @@ -215,7 +213,6 @@ display: position: 1 display_options: field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null path: test-body-paris display_description: '' filters: @@ -273,7 +270,6 @@ display: position: 1 display_options: field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null path: test-title-filter display_description: '' page_tp: @@ -283,7 +279,6 @@ display: 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 23ad0d7..077c3c5 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 @@ -131,7 +131,6 @@ display: relationships: { } arguments: { } field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null page_1: display_plugin: page id: page_1 @@ -140,4 +139,3 @@ display: 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 8b41eb5..3d6de99 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 @@ -105,7 +105,6 @@ display: 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 @@ -114,4 +113,3 @@ display: 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 a53325d..cd3799b 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 @@ -57,7 +57,6 @@ display: order: ASC plugin_id: standard field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null page_1: display_plugin: page id: page_1 @@ -66,4 +65,3 @@ display: 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 3597b6f..218ec87 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 @@ -110,7 +110,6 @@ display: 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 @@ -128,4 +127,3 @@ display: 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 8b92cb6..f0c218d 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 @@ -56,7 +56,6 @@ display: relationship: none plugin_id: standard field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: default display_title: Master id: default @@ -73,7 +72,6 @@ display: 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 ed68d09..1f45b28 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 @@ -59,7 +59,6 @@ display: 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 550a9cc..84de206 100644 --- a/core/modules/file/config/install/views.view.files.yml +++ b/core/modules/file/config/install/views.view.files.yml @@ -681,7 +681,6 @@ display: 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 @@ -710,7 +709,6 @@ display: 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 @@ -1061,4 +1059,3 @@ display: 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 c5149b0..6038723 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 @@ -48,7 +48,6 @@ display: 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 e421d24..b16b37d 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 @@ -149,4 +149,3 @@ display: 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 047d062..da72246 100644 --- a/core/modules/node/config/install/views.view.archive.yml +++ b/core/modules/node/config/install/views.view.archive.yml @@ -166,7 +166,6 @@ display: relationships: { } fields: { } field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null block_1: id: block_1 display_title: Block @@ -197,7 +196,6 @@ display: 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 @@ -209,4 +207,3 @@ display: 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 2a44101..ac7eef4 100644 --- a/core/modules/node/config/install/views.view.content.yml +++ b/core/modules/node/config/install/views.view.content.yml @@ -480,7 +480,6 @@ display: groups: 1: AND field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: default display_title: Master id: default @@ -502,7 +501,6 @@ display: 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 9456436..b400ee6 100644 --- a/core/modules/node/config/install/views.view.content_recent.yml +++ b/core/modules/node/config/install/views.view.content_recent.yml @@ -444,7 +444,6 @@ display: use_more_text: More link_display: custom_url field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null block_1: display_plugin: block id: block_1 @@ -454,4 +453,3 @@ display: link_url: admin/content block_category: 'Lists (Views)' 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 b5d02e9..ec6d53b 100644 --- a/core/modules/node/config/install/views.view.frontpage.yml +++ b/core/modules/node/config/install/views.view.frontpage.yml @@ -234,7 +234,6 @@ display: fields: { } arguments: { } field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: default display_title: Master id: default @@ -267,12 +266,10 @@ display: 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 1625bdd..b4f2d3d 100644 --- a/core/modules/node/config/install/views.view.glossary.yml +++ b/core/modules/node/config/install/views.view.glossary.yml @@ -307,7 +307,6 @@ display: empty: { } sorts: { } field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null filters: langcode: id: langcode @@ -407,7 +406,6 @@ display: 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 @@ -425,4 +423,3 @@ display: 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 60d5c33..2e89d42 100644 --- a/core/modules/node/src/Tests/NodeTranslationUITest.php +++ b/core/modules/node/src/Tests/NodeTranslationUITest.php @@ -236,7 +236,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 ad1e38f..843460b 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 @@ -69,7 +69,6 @@ display: fields: { } arguments: { } field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: default display_title: Master id: default @@ -96,7 +95,6 @@ display: 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 d23420b..77a0683 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 @@ -163,8 +163,7 @@ display: 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 @@ -172,7 +171,6 @@ display: 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' @@ -241,7 +239,6 @@ display: 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' @@ -310,7 +307,6 @@ display: 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' @@ -379,7 +375,6 @@ display: 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 b2f9b3f..fbdc0c5 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 @@ -23,7 +23,6 @@ display: 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 8ce5ac0..9d61e37 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 @@ -66,7 +66,6 @@ display: 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 462d371..e98a328 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 @@ -283,7 +283,6 @@ display: 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 @@ -291,5 +290,4 @@ display: 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 f01d13d..feafb14 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 @@ -46,7 +46,6 @@ display: 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 @@ -55,4 +54,3 @@ display: 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 d9faafd..66dc54d 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 @@ -53,7 +53,6 @@ display: 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 72e8182..9c6cbdf 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 @@ -53,7 +53,6 @@ display: 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 0139a99..2f52d53 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 @@ -48,7 +48,6 @@ display: 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 @@ -57,7 +56,6 @@ display: 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 2302614..0b019d5 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 @@ -198,7 +198,6 @@ display: 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 @@ -207,4 +206,3 @@ display: 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 59b4408..ef19b04 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 @@ -138,12 +138,10 @@ display: 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 69398b3..44095e8 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 @@ -193,7 +193,6 @@ display: 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 @@ -202,4 +201,3 @@ display: 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 ef09354..4eea3a6 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 @@ -192,7 +192,6 @@ display: 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 @@ -201,4 +200,3 @@ display: 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 4da80ea..8f105dc 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 @@ -197,7 +197,6 @@ display: arguments: { } display_extenders: { } field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null block_1: display_plugin: block id: block_1 @@ -206,4 +205,3 @@ display: 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 03d3aa6..3b55ed1 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 @@ -45,7 +45,6 @@ display: 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 @@ -56,4 +55,3 @@ display: 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 84fc0e6..3d0851a 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 @@ -68,7 +68,6 @@ display: 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 @@ -87,7 +86,6 @@ display: 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 @@ -108,4 +106,3 @@ display: 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 feac2e8..251e6a3 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 @@ -113,7 +113,6 @@ display: 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 @@ -132,4 +131,3 @@ display: 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 a82936f..693564c 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 @@ -245,7 +245,6 @@ display: 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 @@ -254,4 +253,3 @@ display: 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 15f80ec..0e954c2 100644 --- a/core/modules/taxonomy/config/install/views.view.taxonomy_term.yml +++ b/core/modules/taxonomy/config/install/views.view.taxonomy_term.yml @@ -236,7 +236,6 @@ display: relationships: { } fields: { } field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null feed_1: id: feed_1 display_title: Feed @@ -283,7 +282,6 @@ display: relationship: none view_mode: default field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null page_1: id: page_1 display_title: Page @@ -295,4 +293,3 @@ display: 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 c65d9c9..1b6af9b 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 @@ -162,5 +162,4 @@ display: 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 66b30fb..3fc2ab5 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 @@ -136,7 +136,6 @@ display: relationships: { } arguments: { } field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null page_dc: display_plugin: page id: page_dc @@ -144,7 +143,6 @@ display: position: 3 display_options: field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_description: '' path: test-desc-filter filters: @@ -202,7 +200,6 @@ display: position: 3 display_options: field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_description: '' path: test-desc-paris filters: @@ -260,7 +257,6 @@ display: position: 3 display_options: field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_description: '' path: test-field-filter filters: @@ -318,7 +314,6 @@ display: position: 3 display_options: field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_description: '' path: test-field-paris filters: @@ -376,7 +371,6 @@ display: position: 1 display_options: field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null path: test-name-filter display_description: '' page_np: @@ -386,7 +380,6 @@ display: 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 c8b3192..bcf59f9 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 @@ -178,4 +178,3 @@ display: 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 30ed9f5..47a57a2 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 @@ -74,7 +74,6 @@ display: 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 c96c7da..13c674b 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 @@ -84,7 +84,6 @@ display: 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 efaaa62..bd31b1a 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 @@ -132,4 +132,3 @@ display: 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 10ef4ef..3c19059 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 @@ -155,4 +155,3 @@ display: 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 223ac1b..82c8852 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 @@ -182,4 +182,3 @@ display: 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 ff62509..9e04c5f 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 @@ -874,7 +874,6 @@ display: groups: 1: AND field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null page_1: display_plugin: page id: page_1 @@ -899,4 +898,3 @@ display: defaults: show_admin_links: false field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null 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 51ef2c5..cd0239d 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 @@ -167,7 +167,6 @@ display: relationships: { } arguments: { } field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null block_1: display_plugin: block id: block_1 @@ -178,4 +177,3 @@ display: 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 9c0faef..e23cf31 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 @@ -197,7 +197,6 @@ display: 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 @@ -207,4 +206,3 @@ display: 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 caeeca3..e8a050d 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 @@ -29,7 +29,6 @@ display: 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 6f2f936..7a0dcef 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 @@ -33,7 +33,6 @@ display: row: type: fields field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: default display_title: Master id: default @@ -42,7 +41,6 @@ display: 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 6ae987e..34dd1f0 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 @@ -139,4 +139,3 @@ display: 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 48a4761..8e3468f 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 @@ -141,4 +141,3 @@ display: 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 427c7cb..004afa8 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 @@ -87,7 +87,6 @@ display: 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 10beeb4..a8ca3b3 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 @@ -59,7 +59,6 @@ display: 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 3dd3a31..60fe30d 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 @@ -56,7 +56,6 @@ display: 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 @@ -65,4 +64,3 @@ display: 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 f5baa99..52e2924 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 @@ -44,7 +44,6 @@ display: entity_field: changed filters: { } field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: default display_title: Master id: default @@ -53,7 +52,6 @@ display: 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 5bd259e..fba6830 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 @@ -131,4 +131,3 @@ display: 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 ccd87b7..d71b0db 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 @@ -50,7 +50,6 @@ display: 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 @@ -59,7 +58,6 @@ display: 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 6a3907d..ddce049 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 @@ -112,7 +112,6 @@ display: 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 9458729..f461e9b 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 @@ -33,7 +33,6 @@ display: 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 99c541a..c6b2074 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 @@ -35,7 +35,6 @@ display: 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 af599f8..e786240 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 @@ -35,7 +35,6 @@ display: 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 40f21bc..fb1c3ff 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 @@ -158,7 +158,6 @@ display: sorts: { } title: test_user_role field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null page_1: display_plugin: page id: page_1 @@ -167,4 +166,3 @@ display: 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 9a9bac5..3ad4fda 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,7 +53,6 @@ display: 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 7cf0cad..cb05abd 100644 --- a/core/modules/views/config/schema/views.data_types.schema.yml +++ b/core/modules/views/config/schema/views.data_types.schema.yml @@ -247,9 +247,6 @@ views_display: 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 0000000..d529025 --- /dev/null +++ b/core/modules/views/src/Entity/Render/ConfigurableLanguageRenderer.php @@ -0,0 +1,51 @@ +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 fb91787..0000000 --- a/core/modules/views/src/Entity/Render/CurrentLanguageRenderer.php +++ /dev/null @@ -1,26 +0,0 @@ -_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 0000000..1be7364 --- /dev/null +++ b/core/modules/views/src/Entity/Render/EntityTranslationRenderTrait.php @@ -0,0 +1,92 @@ +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 c74964d..be8aea6 100644 --- a/core/modules/views/src/Entity/Render/RendererBase.php +++ b/core/modules/views/src/Entity/Render/RendererBase.php @@ -23,7 +23,7 @@ * * @var \Drupal\views\ViewExecutable */ - public $view = NULL; + public $view; /** * The language manager. @@ -63,6 +63,17 @@ public function __construct(ViewExecutable $view, LanguageManagerInterface $lang } /** + * 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. * * @param \Drupal\views\Plugin\views\query\QueryPluginBase $query diff --git a/core/modules/views/src/Entity/Render/TranslationLanguageRenderer.php b/core/modules/views/src/Entity/Render/TranslationLanguageRenderer.php index 9b0e0da..58c8ff0 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 e09545f..d26a5ea 100644 --- a/core/modules/views/src/Plugin/views/PluginBase.php +++ b/core/modules/views/src/Plugin/views/PluginBase.php @@ -52,6 +52,13 @@ 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. * * @see \Drupal\Core\Language\LanguageInterface::LANGCODE_DEFAULT @@ -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 61c9e84..d1bf24b 100644 --- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php +++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php @@ -213,15 +213,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; @@ -590,14 +581,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 @@ -1273,15 +1258,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.'), ); } @@ -1631,36 +1610,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'), ); } @@ -1982,10 +1940,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; @@ -2709,11 +2663,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 1be60ce..2285c20 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; 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; @@ -206,6 +201,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} + */ public function access(AccountInterface $account) { $access_control_handler = $this->entityManager->getAccessControlHandler($this->getEntityType()); return $access_control_handler->fieldAccess('view', $this->getFieldDefinition(), $account); @@ -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) { + public 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 159a1d4..071314f 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. @@ -55,13 +56,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. * * @var \Drupal\Core\Entity\EntityManagerInterface @@ -110,6 +104,34 @@ public static function create(ContainerInterface $container, array $configuratio } /** + * {@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(). */ protected function defineOptions() { @@ -146,25 +168,11 @@ 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 0c2adca..b2a6f5c 100644 --- a/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php +++ b/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php @@ -109,7 +109,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('***LANGUAGE_language_content***', $expected, 'The current language renderer behaves as expected.'); $expected = array( $values[0]['en'], @@ -122,7 +122,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('***LANGUAGE_entity_default***', $expected, 'The default language renderer behaves as expected.'); $expected = array( $values[0]['en'], @@ -135,7 +135,33 @@ public function testRenderers() { $values[2]['l0'], $values[2]['l1'], ); - $this->assertTranslations('translation_language_renderer', $expected, 'The translation language renderer behaves as expected.'); + $this->assertTranslations('***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('***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('l0', $expected, 'The language specific renderer behaves as expected.'); } /** 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 5f8cca3..9c34790 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 @@ -25,7 +25,6 @@ display: 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 b156d2d..ea7a9ac 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 @@ -60,7 +60,6 @@ display: 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 1a67001..8838995 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 @@ -50,7 +50,6 @@ display: 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 @@ -59,7 +58,6 @@ display: 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 a6dbf35..f634c49 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 @@ -92,7 +92,6 @@ display: 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 f8ee30a..2af5a94 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 @@ -43,7 +43,6 @@ display: 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 @@ -61,7 +60,6 @@ display: 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 68302cb..ee5f966 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 @@ -44,7 +44,6 @@ display: 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 aa218bf..ecd393b 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 @@ -42,7 +42,6 @@ display: 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 @@ -58,7 +57,6 @@ display: 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: '' @@ -74,7 +72,6 @@ display: 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: '' @@ -90,7 +87,6 @@ display: 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: '' @@ -106,7 +102,6 @@ display: 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: '' @@ -122,7 +117,6 @@ display: 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 a82ee33..741e9e7 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 @@ -59,7 +59,6 @@ display: 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 4b8e8c8..c23ce7a 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 @@ -59,7 +59,6 @@ display: 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 fce7f88..5f22f10 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 @@ -217,4 +217,3 @@ display: 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 a7db540..a04ba74 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 @@ -35,7 +35,6 @@ display: 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,7 +46,6 @@ display: position: 1 display_options: field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null feed_1: display_plugin: feed id: feed_1 @@ -71,13 +69,11 @@ display: 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 746c99d..902e7ca 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 @@ -43,4 +43,3 @@ display: 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 8cfdba2..98877f7 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 @@ -47,7 +47,6 @@ display: created: sortable: false field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: default display_title: Master id: default @@ -56,7 +55,6 @@ display: 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 7e5e4eb..5a5e970 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 @@ -164,7 +164,6 @@ display: row: type: fields field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: default display_title: Master id: default @@ -177,7 +176,6 @@ display: pager: type: some field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: attachment display_title: Attachment id: attachment_1 @@ -190,7 +188,6 @@ display: pager: type: some field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: attachment display_title: Attachment id: attachment_2 @@ -199,7 +196,6 @@ display: 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_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml index 23ea953..0b499d7 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 @@ -60,7 +60,6 @@ display: 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 @@ -80,7 +79,6 @@ display: row: type: fields field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: block display_title: Block id: block_1 @@ -89,7 +87,6 @@ display: 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 bafbdc9..d5d2c50 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 @@ -51,7 +51,6 @@ display: 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 @@ -61,7 +60,6 @@ display: displays: page_1: page_1 field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null page_1: display_plugin: page id: page_1 @@ -70,4 +68,3 @@ display: 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 af8b888..20a5c9b 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 @@ -50,4 +50,3 @@ display: 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 237b401..6777643 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 @@ -40,7 +40,6 @@ display: 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 4ab684f..1267ece 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 @@ -77,7 +77,6 @@ display: 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 @@ -94,7 +93,6 @@ display: 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 @@ -103,7 +101,6 @@ display: 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 01ba2cc..f2afaf1 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 @@ -25,7 +25,6 @@ display: 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 @@ -37,12 +36,10 @@ display: 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 857c0c0..436e87b 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 @@ -40,7 +40,6 @@ display: 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 @@ -53,4 +52,3 @@ display: 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 3439017..f95cf8f 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 @@ -234,7 +234,6 @@ display: 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 @@ -243,4 +242,3 @@ display: 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 38bbf78..4187119 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 @@ -50,7 +50,6 @@ display: 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_row.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row.yml index a0b397c..6bc5fc0 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 @@ -26,7 +26,6 @@ display: 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 9c7307d..8fb16f9 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 @@ -40,5 +40,4 @@ display: 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***' 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 98e061c..a36e49b 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 @@ -93,4 +93,3 @@ display: 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 d472bc0..94489f6 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 @@ -34,7 +34,6 @@ display: 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 c3cd401..2519eb3 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 @@ -17,7 +17,6 @@ display: position: 0 display_options: field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null page_1: display_plugin: page display_title: Page @@ -25,7 +24,6 @@ display: position: 1 display_options: field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null page_2: display_plugin: page display_title: 'Page 2' @@ -37,4 +35,3 @@ display: 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 ee30393..12dfe92 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 @@ -91,7 +91,6 @@ display: row: type: 'entity:node' field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: default display_title: Master id: default @@ -100,7 +99,6 @@ display: 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 53983ff..49e20ae 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 @@ -47,7 +47,6 @@ display: row: type: 'entity:node' field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: default display_title: Master id: default @@ -57,7 +56,6 @@ display: 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 cc37f74..634734d 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 @@ -48,7 +48,6 @@ display: row: type: 'entity:node' field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: default display_title: Master id: default @@ -57,7 +56,6 @@ display: 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 e45746f..977202d 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 @@ -24,7 +24,6 @@ display: style: type: html_list field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: default display_title: Master id: default @@ -33,7 +32,6 @@ display: 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 27fa4e1..899aca0 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 @@ -76,7 +76,6 @@ display: 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 722823b..abc15f0 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 @@ -25,7 +25,6 @@ display: 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 b3a4c06..da5b0a6 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 @@ -48,7 +48,6 @@ display: 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 552f95f..010b774 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 @@ -44,7 +44,6 @@ display: 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 57cc2f5..707e1a1 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 @@ -47,7 +47,6 @@ display: 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 82037bc..b704e57 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 @@ -54,7 +54,6 @@ display: row: type: fields field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: default display_title: Master id: default @@ -63,7 +62,6 @@ display: 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 c374195..ec146ca 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 @@ -90,7 +90,6 @@ display: row: type: 'entity:node' field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: default display_title: Master id: default @@ -138,7 +137,6 @@ display: 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 2746699..aa6f29a 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 @@ -40,7 +40,6 @@ display: 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 c7205ec..72b579b 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 @@ -81,7 +81,6 @@ display: 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 @@ -99,7 +98,6 @@ display: 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 @@ -110,7 +108,6 @@ display: 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 @@ -119,4 +116,3 @@ display: 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 9effcbc..a29192b 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 @@ -55,7 +55,6 @@ display: 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 d8400f7..e3aae31 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 @@ -61,7 +61,6 @@ display: row: type: fields field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: default display_title: Master id: default @@ -70,7 +69,6 @@ display: 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 ac85982..881b68d 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 @@ -62,7 +62,6 @@ display: 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 bd57f7c..eee0e21 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 @@ -56,7 +56,6 @@ display: 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 588bc71..d3b425a 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 @@ -100,5 +100,4 @@ display: 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 872ab9e..d54d209 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 @@ -74,7 +74,6 @@ display: 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 1fd3c3f..bc40d8c 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 @@ -35,7 +35,6 @@ display: 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 13d1ce8..06d3633 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 @@ -57,7 +57,6 @@ display: 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 79f5361..9bd7299 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 @@ -128,7 +128,6 @@ display: 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 @@ -138,7 +137,6 @@ display: 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 @@ -231,4 +229,3 @@ display: 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 4ab699f..47e4139 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 @@ -86,7 +86,6 @@ display: 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 @@ -95,4 +94,3 @@ display: 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 af8e374..9695d60 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 @@ -87,7 +87,6 @@ display: operator: AND groups: { } field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null page_1: display_plugin: page id: page_1 @@ -96,7 +95,6 @@ display: 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 @@ -111,7 +109,6 @@ display: options: items_per_page: 1 field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null page_3: display_plugin: page id: page_3 @@ -126,4 +123,3 @@ display: 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 b80d96a..781ef39 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 @@ -25,7 +25,6 @@ display: 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 @@ -34,7 +33,6 @@ display: 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 @@ -43,7 +41,6 @@ display: 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 @@ -52,7 +49,6 @@ display: 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 2b3ff40..a1c3174 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 @@ -23,7 +23,6 @@ display: 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 @@ -32,7 +31,6 @@ display: 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 @@ -50,7 +48,6 @@ display: 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 @@ -68,7 +65,6 @@ display: 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 @@ -92,7 +88,6 @@ display: 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 @@ -110,7 +105,6 @@ display: 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 6d524b9..b827e7d 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 @@ -23,7 +23,6 @@ display: field: id plugin_id: numeric field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: default display_title: Master id: default @@ -48,7 +47,6 @@ display: defaults: title: false field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: page display_title: Page id: page_1 @@ -67,7 +65,6 @@ display: defaults: title: false field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: page display_title: Page id: page_2 @@ -86,7 +83,6 @@ display: defaults: title: false field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: page display_title: Page id: page_3 @@ -106,7 +102,6 @@ display: defaults: title: false field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: page display_title: Page id: page_4 @@ -126,7 +121,6 @@ display: 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 7b412f9..69c49d1 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 @@ -27,7 +27,6 @@ display: field: id plugin_id: numeric field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: default display_title: Master id: default @@ -36,7 +35,6 @@ display: 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 @@ -54,7 +52,6 @@ display: 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 @@ -72,7 +69,6 @@ display: 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 @@ -96,7 +92,6 @@ display: 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 @@ -120,7 +115,6 @@ display: 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 @@ -144,7 +138,6 @@ display: 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 @@ -157,7 +150,6 @@ display: 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 3909cf7..42280f0 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 @@ -24,7 +24,6 @@ display: 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 @@ -35,5 +34,4 @@ display: 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 b6e8798..d2ee55b 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 @@ -31,7 +31,6 @@ display: 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 283b72b..d3d4c6f 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 @@ -27,7 +27,6 @@ display: 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 c6cc162..b8542d9 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 @@ -30,7 +30,6 @@ display: 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 acd118f..65815eaa 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 @@ -48,7 +48,6 @@ display: 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 d032aab..47c5c73 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 @@ -127,4 +127,3 @@ display: 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 d93ac85..54ce469 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 @@ -81,7 +81,6 @@ display: 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 @@ -90,4 +89,3 @@ display: 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 b6b43c3..8abef8b 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 @@ -51,7 +51,6 @@ display: 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 a7729b1..cf9bb66 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 @@ -127,7 +127,6 @@ display: relationships: { } arguments: { } field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null page_1: display_plugin: page id: page_1 @@ -194,7 +193,6 @@ display: 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 @@ -262,4 +260,3 @@ display: 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 651ef5b..77f6ed0 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 @@ -60,7 +60,6 @@ display: 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 358af74..8f3e9c5 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 @@ -27,7 +27,6 @@ display: 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 c78101f..6ac5741 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 @@ -49,4 +49,3 @@ display: 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 81a8c88..161023c 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 @@ -60,7 +60,6 @@ display: 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 55f399d..599b2f3 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 @@ -253,7 +253,6 @@ display: relationships: { } arguments: { } field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null feed_1: display_plugin: feed id: feed_1 @@ -280,7 +279,6 @@ display: path: test-feed-opml-style displays: { } field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null page: display_plugin: page id: page_1 @@ -289,4 +287,3 @@ display: 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 b3714a3..b284b63 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 @@ -130,7 +130,6 @@ display: 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 @@ -139,7 +138,6 @@ display: 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 802f06f..7fff8ce 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 @@ -65,7 +65,6 @@ display: 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 cc7732d..4ad31b8 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 @@ -41,7 +41,6 @@ display: options: items_per_page: 10 field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: default display_title: Master id: default @@ -60,4 +59,3 @@ display: 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 8a32058..db3b1ad 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 @@ -50,7 +50,6 @@ display: 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 313b763..76e385d 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 @@ -35,7 +35,6 @@ display: 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 f247a1e..b9ebed8 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 @@ -78,7 +78,6 @@ display: 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 62017c8..08ea303 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 @@ -27,7 +27,6 @@ display: 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 2c2abd5..9ad6199 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 @@ -45,4 +45,3 @@ display: 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 8ca9e5c..ccb35d5 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 @@ -50,7 +50,6 @@ display: 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 95b533b..795f243 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 @@ -28,7 +28,6 @@ display: 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 ff18212..f5c43a1 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 @@ -60,7 +60,6 @@ display: 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 9527955..76b1a26 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 @@ -60,7 +60,6 @@ display: 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 a711cf4..6e79254 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 @@ -60,7 +60,6 @@ display: 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 e80028b..a6f2093 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 @@ -60,7 +60,6 @@ display: 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 9b5c3d4..e7b1553 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 @@ -66,7 +66,6 @@ display: 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 a9cdc0f..bb1ef86 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 @@ -50,7 +50,6 @@ display: 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 1dec7f0..2728497 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 @@ -50,7 +50,6 @@ display: 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 177e0b1..698f84d 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 @@ -17,4 +17,3 @@ display: 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 5a8ad5f..8e29810 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 @@ -32,7 +32,6 @@ display: 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 @@ -47,7 +46,6 @@ display: type: views_query options: { } field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null page_1: id: page_1 display_title: Page @@ -59,4 +57,3 @@ display: 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 f2d15cf..abfec9f 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 @@ -31,7 +31,6 @@ display: 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 7835dc9..9bb1fcf 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 @@ -29,7 +29,6 @@ display: row: type: fields field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_plugin: default display_title: Master id: default @@ -38,7 +37,6 @@ display: 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/src/Unit/Plugin/field/FieldTest.php b/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php index 90ac97c..08f5c42 100644 --- a/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php @@ -56,6 +56,13 @@ class FieldTest extends UnitTestCase { protected $renderer; /** + * The container. + * + * @var \Drupal\Core\DependencyInjection\Container + */ + protected $container; + + /** * {@inheritdoc} */ protected function setUp() { @@ -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 1dd7e0e..c34da2d 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 342917b..06f0d8d 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 @@ -180,7 +180,6 @@ display: relationships: { } arguments: { } field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null title: 'VIEWS TITLE' page_1: display_plugin: page @@ -189,5 +188,4 @@ display: position: 2 display_options: field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null path: foobar