Commit f100d942 authored by alexpott's avatar alexpott

Issue #2394883 by Gábor Hojtsy, plach, jhodgdon: Language setup for entity and...

Issue #2394883 by Gábor Hojtsy, plach, jhodgdon: Language setup for entity and field based rendering in views is independent, confusing UI, lacking test coverage
parent c9cc8357
......@@ -153,8 +153,6 @@ display:
entity_type: node
entity_field: created
title: form
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
......@@ -162,8 +160,6 @@ display:
position: null
display_options:
path: test_bulk_form
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
page_2:
display_plugin: page
id: page_2
......@@ -184,5 +180,3 @@ display:
empty: true
content: 'This view is empty.'
plugin_id: text_custom
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
......@@ -136,8 +136,6 @@ display:
empty: { }
relationships: { }
arguments: { }
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
feed_items:
display_plugin: feed
id: feed_items
......@@ -148,5 +146,3 @@ display:
display_description: ''
defaults:
arguments: true
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
......@@ -141,16 +141,12 @@ display:
empty: { }
relationships: { }
arguments: { }
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
feed_1:
display_plugin: feed
id: feed_1
display_title: Feed
position: 2
display_options:
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
style:
type: opml
options:
......@@ -389,8 +385,6 @@ display:
display_title: Page
position: 1
display_options:
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
path: aggregator/sources
menu:
type: normal
......
......@@ -168,8 +168,6 @@ display:
entity_field: description
filters: { }
sorts: { }
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
feed_1:
display_plugin: feed
id: feed_1
......@@ -181,5 +179,3 @@ display:
type: aggregator_rss
options:
view_mode: default
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
......@@ -38,13 +38,8 @@ display:
table: views_test_data
field: name
title: test_view_block
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
block_1:
display_plugin: block
id: block_1
display_title: Block
position: null
display_options:
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
......@@ -40,29 +40,18 @@ display:
table: views_test_data
field: name
title: test_view_block2
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
block_1:
display_plugin: block
id: block_1
display_title: Block
position: null
display_options:
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
block_2:
display_plugin: block
id: block_2
display_title: Block
position: null
display_options:
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
block_3:
display_plugin: block
id: block_3
display_title: Block
position: null
display_options:
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
......@@ -52,8 +52,6 @@ display:
plugin_id: numeric
entity_type: block_content
entity_field: id
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
......
......@@ -54,8 +54,6 @@ display:
plugin_id: block_content_id
entity_type: block_content
entity_field: id
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
display_extenders: { }
display_plugin: default
display_title: Master
......
......@@ -126,8 +126,6 @@ display:
footer: { }
empty: { }
relationships: { }
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
display_extenders: { }
arguments:
type:
......@@ -178,6 +176,4 @@ display:
position: null
display_options:
path: test-block_content-view
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
display_extenders: { }
......@@ -150,9 +150,7 @@ display:
empty: { }
relationships: { }
arguments: { }
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
rendering_language: translation_language_renderer
rendering_language: '***LANGUAGE_entity_translation***'
display_extenders: { }
page_bf:
display_plugin: page
......@@ -160,8 +158,6 @@ display:
display_title: 'Body filter page'
position: 1
display_options:
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
path: test-body-filter
display_description: ''
title: 'Test body filters'
......@@ -219,8 +215,6 @@ display:
display_title: 'Body filter page Paris'
position: 1
display_options:
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
path: test-body-paris
display_description: ''
title: 'Test body filters'
......@@ -278,8 +272,6 @@ display:
display_title: 'Info filter page'
position: 1
display_options:
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
path: test-info-filter
display_description: ''
title: 'Test info filter'
......@@ -337,8 +329,6 @@ display:
display_title: 'Info filter page Paris'
position: 1
display_options:
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
path: test-info-paris
display_description: ''
title: 'Test info filter'
......
......@@ -22,8 +22,6 @@ display:
plugin_id: block_content_type
entity_type: block_content
entity_field: type
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
......
......@@ -234,8 +234,6 @@ display:
content: 'No comments available.'
tokenize: false
plugin_id: text_custom
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
block_1:
display_plugin: block
id: block_1
......@@ -244,7 +242,5 @@ display:
display_options:
block_description: 'Recent comments'
block_category: 'Lists (Views)'
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
allow:
items_per_page: true
......@@ -352,8 +352,6 @@ display:
break_phrase: false
not: false
plugin_id: numeric
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
display_extenders: { }
rest_export_1:
display_plugin: rest_export
......@@ -361,8 +359,6 @@ display:
display_title: 'REST export'
position: 1
display_options:
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
path: node/%node/comments
pager:
type: some
......
......@@ -147,8 +147,6 @@ display:
footer: { }
empty: { }
arguments: { }
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
......@@ -156,5 +154,3 @@ display:
position: 1
display_options:
path: test-comment-row
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
......@@ -63,8 +63,6 @@ display:
entity_field: subject
filters: { }
sorts: { }
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
feed_1:
display_plugin: feed
id: feed_1
......@@ -72,5 +70,3 @@ display:
position: null
display_options:
path: test-comment-rss
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
......@@ -55,8 +55,6 @@ display:
type: default
row:
type: 'entity:node'
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
......
......@@ -147,17 +147,13 @@ display:
footer: { }
empty: { }
arguments: { }
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
rendering_language: translation_language_renderer
rendering_language: '***LANGUAGE_entity_translation***'
page_bf:
display_plugin: page
id: page_bf
display_title: 'Body Comida'
position: 1
display_options:
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
path: test-body-filter
display_description: ''
filters:
......@@ -214,8 +210,6 @@ display:
display_title: 'Body Paris'
position: 1
display_options:
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
path: test-body-paris
display_description: ''
filters:
......@@ -272,8 +266,6 @@ display:
display_title: 'Title Comida'
position: 1
display_options:
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
path: test-title-filter
display_description: ''
page_tp:
......@@ -282,8 +274,6 @@ display:
display_title: 'Title Paris'
position: 1
display_options:
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
path: test-title-paris
display_description: ''
filters:
......
......@@ -130,8 +130,6 @@ display:
empty: { }
relationships: { }
arguments: { }
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
......@@ -139,5 +137,3 @@ display:
position: 1
display_options:
path: test-contact-link
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
......@@ -104,8 +104,6 @@ display:
value: 'No people available.'
format: plain_text
plugin_id: text
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
......@@ -113,5 +111,3 @@ display:
position: null
display_options:
path: test-entity-translations-link
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
......@@ -56,8 +56,6 @@ display:
field: wid
order: ASC
plugin_id: standard
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
......@@ -65,5 +63,3 @@ display:
position: null
display_options:
path: test-dblog
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
......@@ -109,8 +109,6 @@ display:
plugin_id: date
entity_type: node
entity_field: created
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
entity_reference_1:
display_plugin: entity_reference
id: entity_reference_1
......@@ -127,5 +125,3 @@ display:
type: none
options:
offset: 0
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
......@@ -55,8 +55,6 @@ display:
field: field_test
relationship: none
plugin_id: standard
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
......@@ -72,8 +70,6 @@ display:
field: reverse_field_test
relationship: none
plugin_id: standard
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
display_plugin: embed
display_title: Embed
id: embed_1
......
......@@ -58,8 +58,6 @@ display:
type: default
row:
type: fields
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
......
......@@ -680,8 +680,6 @@ display:
arguments: { }
group_by: true
show_admin_links: true
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
page_1:
display_plugin: page
id: page_1
......@@ -709,8 +707,6 @@ display:
group_type: group
admin_label: 'File usage'
required: false
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
page_2:
display_plugin: page
id: page_2
......@@ -1060,5 +1056,3 @@ display:
group_type: group
admin_label: 'File usage'
required: true
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
......@@ -47,8 +47,6 @@ display:
relationship: none
table: views_test_data
plugin_id: numeric
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
......
......@@ -148,5 +148,3 @@ display:
plugin_id: numeric
filters: { }
sorts: { }
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
......@@ -165,8 +165,6 @@ display:
empty: { }
relationships: { }
fields: { }
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
block_1:
id: block_1
display_title: Block
......@@ -196,8 +194,6 @@ display:
specify_validation: true
plugin_id: date_year_month
entity_type: node
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
page_1:
id: page_1
display_title: Page
......@@ -208,5 +204,3 @@ display:
type: views_query
options: { }
path: archive
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
......@@ -501,8 +501,6 @@ display:
operator: AND
groups:
1: AND
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
......@@ -523,8 +521,6 @@ display:
description: 'Find and manage content'
menu_name: admin
weight: -10
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
......
......@@ -413,8 +413,6 @@ display:
plugin_id: standard
arguments: { }
display_extenders: { }
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
use_more: true
use_more_always: true
use_more_text: More
......@@ -425,7 +423,3 @@ display:
id: block_1
display_title: Block
position: 1
display_options:
display_extenders: { }
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
......@@ -233,8 +233,6 @@ display:
relationships: { }
fields: { }
arguments: { }
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
......@@ -266,13 +264,9 @@ display:
options:
relationship: none
view_mode: rss
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
page_1:
display_options:
path: node
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
......
......@@ -306,8 +306,6 @@ display:
footer: { }
empty: { }
sorts: { }
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
filters:
langcode:
id: langcode
......@@ -406,8 +404,6 @@ display:
default: default
page_1: page_1
inherit_arguments: false
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
page_1:
id: page_1
display_title: Page
......@@ -424,5 +420,3 @@ display:
weight: 0
menu_name: main
parent: ''
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
......@@ -245,7 +245,7 @@ function testTranslationRendering() {
// Enable the translation language renderer.
$view = \Drupal::entityManager()->getStorage('view')->load('frontpage');
$display = &$view->getDisplay('default');
$display['display_options']['rendering_language'] = 'translation_language_renderer';
$display['display_options']['rendering_language'] = '***LANGUAGE_entity_translation***';
$view->save();
// Need to check from the beginning, including the base_path, in the url
......
......@@ -68,8 +68,6 @@ display:
relationships: { }
fields: { }
arguments: { }
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
display_plugin: default
display_title: Master
id: default
......@@ -95,8 +93,6 @@ display:
menu_name: tools
weight: 0
context: '1'
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
display_plugin: page
display_title: Page
id: page_1
......