From ef4f88376b110ed6968ec32b019561958c66f774 Mon Sep 17 00:00:00 2001 From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org> Date: Wed, 22 Feb 2017 12:37:49 +0000 Subject: [PATCH] =?UTF-8?q?Issue=20#2561115=20by=20michaellenahan,=20alexp?= =?UTF-8?q?ott,=20Lendude,=20cilefen,=20lomasr,=20amit.drupal,=20G=C3=A1bo?= =?UTF-8?q?r=20Hojtsy,=20ifrik,=20dawehner:=20Rollback:=20Use=20'Filter'?= =?UTF-8?q?=20for=20exposed=20filter=20button=20text=20in=20new=20views=20?= =?UTF-8?q?and=20new=20installations=20(instead=20of=20'Apply')?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../optional/views.view.aggregator_rss_feed.yml | 2 +- .../optional/views.view.aggregator_sources.yml | 2 +- .../config/optional/views.view.block_content.yml | 2 +- .../views.view.test_block_content_view.yml | 2 +- .../test_views/views.view.test_field_filters.yml | 2 +- .../test_views/views.view.test_book_view.yml | 2 +- .../views.view.test_comment_field_name.yml | 2 +- .../views.view.test_comment_operations.yml | 2 +- .../test_views/views.view.test_comment_rest.yml | 2 +- .../test_views/views.view.test_comment_row.yml | 2 +- .../test_views/views.view.test_field_filters.yml | 2 +- .../test_views/views.view.test_contact_link.yml | 2 +- .../config/install/views.view.latest.yml | 2 +- ...w.test_content_moderation_base_table_test.yml | 2 +- ...w.test_content_moderation_latest_revision.yml | 2 +- ...iew.test_content_moderation_revision_test.yml | 2 +- ...ews.view.entity_reference_plugins_2429191.yml | 2 +- .../views.view.no_entity_translation_view.yml | 2 +- .../test_views/views.view.test_link_tokens.yml | 2 +- .../node/config/optional/views.view.archive.yml | 2 +- .../optional/views.view.content_recent.yml | 2 +- .../config/optional/views.view.frontpage.yml | 2 +- .../node/config/optional/views.view.glossary.yml | 2 +- .../test_views/views.view.test_field_filters.yml | 2 +- .../views.view.test_filter_node_access.yml | 2 +- .../test_views/views.view.test_language.yml | 2 +- .../test_views/views.view.test_nid_argument.yml | 2 +- .../views.view.test_node_path_plugin.yml | 2 +- .../views.view.test_node_revision_links.yml | 2 +- .../test_views/views.view.test_node_tokens.yml | 2 +- .../test_views/views.view.test_node_view.yml | 2 +- ...s.view.test_options_list_argument_numeric.yml | 2 +- ...ws.view.test_options_list_argument_string.yml | 2 +- .../views.view.test_options_list_filter.yml | 2 +- ...ws.view.test_excluded_field_token_display.yml | 2 +- .../drupal-8.views-entity-views-data-2455125.yml | 2 +- ...est_entity_reference_entity_test_mul_view.yml | 2 +- ...ew.test_entity_reference_entity_test_view.yml | 2 +- ...st_entity_reference_entity_test_view_long.yml | 2 +- ...ty_reference_reverse_entity_test_mul_view.yml | 2 +- ...entity_reference_reverse_entity_test_view.yml | 2 +- .../config/optional/views.view.taxonomy_term.yml | 2 +- .../views.view.taxonomy_all_terms_test.yml | 2 +- ...views.view.taxonomy_default_argument_test.yml | 2 +- ...ew.test_argument_taxonomy_index_tid_depth.yml | 2 +- ...ws.view.test_argument_taxonomy_vocabulary.yml | 2 +- .../test_views/views.view.test_field_filters.yml | 2 +- ...views.view.test_filter_taxonomy_index_tid.yml | 2 +- ...xonomy_index_tid__non_existing_dependency.yml | 2 +- ...view.test_filter_taxonomy_index_tid_depth.yml | 2 +- .../views.view.test_taxonomy_parent.yml | 2 +- .../views.view.test_taxonomy_term_name.yml | 2 +- ...iews.view.test_taxonomy_term_relationship.yml | 2 +- .../views.view.test_taxonomy_tid_field.yml | 2 +- .../config/optional/views.view.who_s_new.yml | 2 +- .../config/optional/views.view.who_s_online.yml | 2 +- ...s.view.test_user_bulk_form_combine_filter.yml | 2 +- .../views.view.test_user_roles_rid.yml | 2 +- core/modules/views/src/Form/ViewsExposedForm.php | 2 +- .../views/exposed_form/ExposedFormPluginBase.php | 2 +- .../views/src/Tests/Plugin/ExposedFormTest.php | 16 ++++++++-------- .../test_views/views.view.base_and_revision.yml | 2 +- .../test_views/views.view.node_id_argument.yml | 2 +- .../test_views/views.view.numeric_test.yml | 2 +- ...views.view.rest_export_with_authorization.yml | 2 +- .../views.view.test_argument_default_node.yml | 2 +- .../views.view.test_argument_dependency.yml | 2 +- .../views.view.test_argument_validator_term.yml | 2 +- .../views.view.test_attached_disabled.yml | 2 +- .../views.view.test_disabled_display.yml | 2 +- .../views.view.test_duplicate_field_handlers.yml | 2 +- .../views.view.test_entity_test_link.yml | 2 +- ...ws.view.test_entity_test_protected_access.yml | 2 +- ...s.view.test_exposed_relationship_admin_ui.yml | 2 +- .../test_views/views.view.test_feed_icon.yml | 2 +- .../test_views/views.view.test_field_body.yml | 2 +- ...iews.view.test_field_entity_test_rendered.yml | 2 +- ...ews.view.test_field_field_attachment_test.yml | 2 +- .../test_views/views.view.test_glossary.yml | 2 +- .../views.view.test_row_render_cache.yml | 2 +- .../views.view.test_row_render_cache_none.yml | 2 +- .../test_views/views.view.test_search.yml | 2 +- .../views.view.test_taxonomy_glossary.yml | 2 +- .../test_views/views.view.test_token_view.yml | 2 +- .../install/views.view.sa_contrib_2013_035.yml | 2 +- 85 files changed, 92 insertions(+), 92 deletions(-) diff --git a/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml b/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml index 8e25d90d7ee7..1a1654994494 100644 --- a/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml +++ b/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml @@ -36,7 +36,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml b/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml index 125454ff47d7..7ddea89ed032 100644 --- a/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml +++ b/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml @@ -40,7 +40,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/block_content/config/optional/views.view.block_content.yml b/core/modules/block_content/config/optional/views.view.block_content.yml index fbf02e49451b..20fe0bf4f83f 100644 --- a/core/modules/block_content/config/optional/views.view.block_content.yml +++ b/core/modules/block_content/config/optional/views.view.block_content.yml @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_view.yml b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_view.yml index ac4c9c500a9b..bd7a6e40a7a8 100644 --- a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_view.yml +++ b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_view.yml @@ -35,7 +35,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_field_filters.yml b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_field_filters.yml index 073cee86de6c..45eb3af060ad 100644 --- a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_field_filters.yml +++ b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_field_filters.yml @@ -35,7 +35,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/book/tests/modules/book_test_views/test_views/views.view.test_book_view.yml b/core/modules/book/tests/modules/book_test_views/test_views/views.view.test_book_view.yml index 7490892b5fa6..3aeb3a6cb7e6 100644 --- a/core/modules/book/tests/modules/book_test_views/test_views/views.view.test_book_view.yml +++ b/core/modules/book/tests/modules/book_test_views/test_views/views.view.test_book_view.yml @@ -39,7 +39,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_field_name.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_field_name.yml index d18a41c95fb6..db8aedd99337 100644 --- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_field_name.yml +++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_field_name.yml @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_operations.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_operations.yml index bda4dfb5b622..2537700cd400 100644 --- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_operations.yml +++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_operations.yml @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' 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 fcc2526ed880..fabd46c9e254 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 @@ -42,7 +42,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' 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 03ee3829d487..0b36ef8084ed 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 @@ -38,7 +38,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' 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 5cb79eecc76a..76c67c6b9595 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 @@ -38,7 +38,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' 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 d96ac75002d9..efc2109206c2 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 @@ -35,7 +35,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.latest.yml b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.latest.yml index 491e2231ee05..62e972e7dd3e 100644 --- a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.latest.yml +++ b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.latest.yml @@ -39,7 +39,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_base_table_test.yml b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_base_table_test.yml index 016b5b84aa71..343806f90f5a 100644 --- a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_base_table_test.yml +++ b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_base_table_test.yml @@ -38,7 +38,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_latest_revision.yml b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_latest_revision.yml index 69dad0c33a47..4727efa28d87 100644 --- a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_latest_revision.yml +++ b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_latest_revision.yml @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_revision_test.yml b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_revision_test.yml index 99c9218e1e10..78fca3827317 100644 --- a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_revision_test.yml +++ b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_revision_test.yml @@ -36,7 +36,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/field/tests/fixtures/update/views.view.entity_reference_plugins_2429191.yml b/core/modules/field/tests/fixtures/update/views.view.entity_reference_plugins_2429191.yml index 53268517f757..9c49011ff908 100644 --- a/core/modules/field/tests/fixtures/update/views.view.entity_reference_plugins_2429191.yml +++ b/core/modules/field/tests/fixtures/update/views.view.entity_reference_plugins_2429191.yml @@ -39,7 +39,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/language/tests/language_test/config/optional/views.view.no_entity_translation_view.yml b/core/modules/language/tests/language_test/config/optional/views.view.no_entity_translation_view.yml index 4b4af8be89f1..8e7ef450289b 100644 --- a/core/modules/language/tests/language_test/config/optional/views.view.no_entity_translation_view.yml +++ b/core/modules/language/tests/language_test/config/optional/views.view.no_entity_translation_view.yml @@ -35,7 +35,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/link/tests/modules/link_test_views/test_views/views.view.test_link_tokens.yml b/core/modules/link/tests/modules/link_test_views/test_views/views.view.test_link_tokens.yml index e3abd5f7fd88..8f3ee26ea051 100644 --- a/core/modules/link/tests/modules/link_test_views/test_views/views.view.test_link_tokens.yml +++ b/core/modules/link/tests/modules/link_test_views/test_views/views.view.test_link_tokens.yml @@ -40,7 +40,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/node/config/optional/views.view.archive.yml b/core/modules/node/config/optional/views.view.archive.yml index 40b6e56c79f9..73e047753255 100644 --- a/core/modules/node/config/optional/views.view.archive.yml +++ b/core/modules/node/config/optional/views.view.archive.yml @@ -40,7 +40,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/node/config/optional/views.view.content_recent.yml b/core/modules/node/config/optional/views.view.content_recent.yml index 0767b0a69c14..39f4ecbad615 100644 --- a/core/modules/node/config/optional/views.view.content_recent.yml +++ b/core/modules/node/config/optional/views.view.content_recent.yml @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/node/config/optional/views.view.frontpage.yml b/core/modules/node/config/optional/views.view.frontpage.yml index 81a5ffd48d30..d05e291987bc 100644 --- a/core/modules/node/config/optional/views.view.frontpage.yml +++ b/core/modules/node/config/optional/views.view.frontpage.yml @@ -63,7 +63,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/node/config/optional/views.view.glossary.yml b/core/modules/node/config/optional/views.view.glossary.yml index ca17caa9a379..2b4e33010047 100644 --- a/core/modules/node/config/optional/views.view.glossary.yml +++ b/core/modules/node/config/optional/views.view.glossary.yml @@ -38,7 +38,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' 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 b4b013c4fd22..fcfc4f096ccb 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 @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_access.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_access.yml index 546d04115cc6..6663fa8261c1 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_access.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_access.yml @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' 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 ae1f43e600cd..d95efc0615e1 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 @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_nid_argument.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_nid_argument.yml index 785415924206..f52109371693 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_nid_argument.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_nid_argument.yml @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_path_plugin.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_path_plugin.yml index 509f7b68e34d..747de35781c9 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_path_plugin.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_path_plugin.yml @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_links.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_links.yml index 6d4b3b845060..1313f0140e9f 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_links.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_links.yml @@ -35,7 +35,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_tokens.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_tokens.yml index c45d78ac4db6..26517fc21888 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_tokens.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_tokens.yml @@ -40,7 +40,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' 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 32949cda1f25..2fa971787244 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 @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' 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 668ff9ff2e30..bff9b597c511 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 @@ -39,7 +39,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' 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 11f5bf0f41cd..1576619e8141 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 @@ -39,7 +39,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' 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 a487ca451c61..7dd2602289fd 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 @@ -39,7 +39,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_excluded_field_token_display.yml b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_excluded_field_token_display.yml index bbed0876b42e..e95f9533709d 100644 --- a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_excluded_field_token_display.yml +++ b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_excluded_field_token_display.yml @@ -40,7 +40,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/system/tests/fixtures/update/drupal-8.views-entity-views-data-2455125.yml b/core/modules/system/tests/fixtures/update/drupal-8.views-entity-views-data-2455125.yml index eff6645f3e4c..e3c1b630fe16 100644 --- a/core/modules/system/tests/fixtures/update/drupal-8.views-entity-views-data-2455125.yml +++ b/core/modules/system/tests/fixtures/update/drupal-8.views-entity-views-data-2455125.yml @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_mul_view.yml b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_mul_view.yml index beff8c30a199..0d06377baab2 100644 --- a/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_mul_view.yml +++ b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_mul_view.yml @@ -35,7 +35,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_view.yml b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_view.yml index 6e93637b7dd2..5c9bc5f9489d 100644 --- a/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_view.yml +++ b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_view.yml @@ -35,7 +35,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_view_long.yml b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_view_long.yml index ab00ac16a461..9978205749d6 100644 --- a/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_view_long.yml +++ b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_view_long.yml @@ -35,7 +35,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_reverse_entity_test_mul_view.yml b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_reverse_entity_test_mul_view.yml index 106b793e8524..a1153b66dc15 100644 --- a/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_reverse_entity_test_mul_view.yml +++ b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_reverse_entity_test_mul_view.yml @@ -35,7 +35,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_reverse_entity_test_view.yml b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_reverse_entity_test_view.yml index ce657c6c96a2..1412b71421a6 100644 --- a/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_reverse_entity_test_view.yml +++ b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_reverse_entity_test_view.yml @@ -35,7 +35,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/taxonomy/config/optional/views.view.taxonomy_term.yml b/core/modules/taxonomy/config/optional/views.view.taxonomy_term.yml index 3fdae2a8f3aa..95b54a8a5524 100644 --- a/core/modules/taxonomy/config/optional/views.view.taxonomy_term.yml +++ b/core/modules/taxonomy/config/optional/views.view.taxonomy_term.yml @@ -40,7 +40,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_all_terms_test.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_all_terms_test.yml index 4338c7e999c7..4f1467b9ed05 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_all_terms_test.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_all_terms_test.yml @@ -38,7 +38,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' 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 69d0c2be8e7c..d19e3955a776 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 @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_argument_taxonomy_index_tid_depth.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_argument_taxonomy_index_tid_depth.yml index 73a874f4c068..e6fd1a5d1926 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_argument_taxonomy_index_tid_depth.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_argument_taxonomy_index_tid_depth.yml @@ -38,7 +38,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_argument_taxonomy_vocabulary.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_argument_taxonomy_vocabulary.yml index b206af5346f3..a90e618f411a 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_argument_taxonomy_vocabulary.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_argument_taxonomy_vocabulary.yml @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' 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 b6faae00d705..b2a7c9ed8102 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 @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' 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 7657c56ead3d..ab5e1d896820 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 @@ -38,7 +38,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid__non_existing_dependency.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid__non_existing_dependency.yml index 640ab9a7e7e5..a5c5828c2b31 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid__non_existing_dependency.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid__non_existing_dependency.yml @@ -38,7 +38,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid_depth.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid_depth.yml index 6731895af65e..856543adc85a 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid_depth.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid_depth.yml @@ -38,7 +38,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' 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 02d3b6f86d57..256f6189913c 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 @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_term_name.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_term_name.yml index 3d684e154d2a..fbb91428fb66 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_term_name.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_term_name.yml @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_term_relationship.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_term_relationship.yml index 2264dabebc86..80295b6ea249 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_term_relationship.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_term_relationship.yml @@ -38,7 +38,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' 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 edbbdc2bdc93..d54e4b4432c1 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 @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/user/config/optional/views.view.who_s_new.yml b/core/modules/user/config/optional/views.view.who_s_new.yml index 02a5a448c5ae..7d4ed34a8e88 100644 --- a/core/modules/user/config/optional/views.view.who_s_new.yml +++ b/core/modules/user/config/optional/views.view.who_s_new.yml @@ -36,7 +36,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/user/config/optional/views.view.who_s_online.yml b/core/modules/user/config/optional/views.view.who_s_online.yml index 6ccc9cf58ba7..31160361a6cc 100644 --- a/core/modules/user/config/optional/views.view.who_s_online.yml +++ b/core/modules/user/config/optional/views.view.who_s_online.yml @@ -36,7 +36,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form_combine_filter.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form_combine_filter.yml index 5b280ea732d3..075b4f6d9926 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form_combine_filter.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form_combine_filter.yml @@ -35,7 +35,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_roles_rid.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_roles_rid.yml index 86cfbe2dbe59..ac67048a5dbb 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_roles_rid.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_roles_rid.yml @@ -35,7 +35,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/views/src/Form/ViewsExposedForm.php b/core/modules/views/src/Form/ViewsExposedForm.php index 372d963bf958..bacd554954ee 100644 --- a/core/modules/views/src/Form/ViewsExposedForm.php +++ b/core/modules/views/src/Form/ViewsExposedForm.php @@ -107,7 +107,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { // Prevent from showing up in \Drupal::request()->query. '#name' => '', '#type' => 'submit', - '#value' => $this->t('Filter'), + '#value' => $this->t('Apply'), '#id' => Html::getUniqueId('edit-submit-' . $view->storage->id()), ); diff --git a/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php b/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php index 16e2cd18d7e8..4a2bc81d036c 100644 --- a/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php +++ b/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php @@ -26,7 +26,7 @@ abstract class ExposedFormPluginBase extends PluginBase implements CacheableDepe */ protected function defineOptions() { $options = parent::defineOptions(); - $options['submit_button'] = array('default' => $this->t('Filter')); + $options['submit_button'] = array('default' => $this->t('Apply')); $options['reset_button'] = array('default' => FALSE); $options['reset_button_label'] = array('default' => $this->t('Reset')); $options['exposed_sorts_label'] = array('default' => $this->t('Sort by')); diff --git a/core/modules/views/src/Tests/Plugin/ExposedFormTest.php b/core/modules/views/src/Tests/Plugin/ExposedFormTest.php index 93553739855e..b51129cf4c87 100644 --- a/core/modules/views/src/Tests/Plugin/ExposedFormTest.php +++ b/core/modules/views/src/Tests/Plugin/ExposedFormTest.php @@ -50,10 +50,10 @@ protected function setUp() { * Tests the submit button. */ public function testSubmitButton() { - // Test the submit button value defaults to 'Filter'. + // Test the submit button value defaults to 'Apply'. $this->drupalGet('test_exposed_form_buttons'); $this->assertResponse(200); - $this->helperButtonHasLabel('edit-submit-test-exposed-form-buttons', t('Filter')); + $this->helperButtonHasLabel('edit-submit-test-exposed-form-buttons', t('Apply')); // Rename the label of the submit button. $view = Views::getView('test_exposed_form_buttons'); @@ -68,7 +68,7 @@ public function testSubmitButton() { $this->drupalGet('test_exposed_form_buttons'); $this->helperButtonHasLabel('edit-submit-test-exposed-form-buttons', $expected_label); - // Make sure an empty label uses the default 'Filter' button value too. + // Make sure an empty label uses the default 'Apply' button value too. $view = Views::getView('test_exposed_form_buttons'); $view->setDisplay(); @@ -77,9 +77,9 @@ public function testSubmitButton() { $view->display_handler->setOption('exposed_form', $exposed_form); $view->save(); - // Make sure the submit button label shows 'Filter'. + // Make sure the submit button label shows 'Apply'. $this->drupalGet('test_exposed_form_buttons'); - $this->helperButtonHasLabel('edit-submit-test-exposed-form-buttons', t('Filter')); + $this->helperButtonHasLabel('edit-submit-test-exposed-form-buttons', t('Apply')); } /** @@ -296,7 +296,7 @@ public function testInputRequired() { $this->drupalGet('test_exposed_form_buttons'); $this->assertResponse(200); - $this->helperButtonHasLabel('edit-submit-test-exposed-form-buttons', t('Filter')); + $this->helperButtonHasLabel('edit-submit-test-exposed-form-buttons', t('Apply')); // Ensure that no results are displayed. $rows = $this->xpath("//div[contains(@class, 'views-row')]"); @@ -408,14 +408,14 @@ public function testFormErrorWithExposedForm() { $this->assertResponse(200); $form = $this->cssSelect('form.views-exposed-form'); $this->assertTrue($form, 'The exposed form element was found.'); - $this->assertRaw(t('Filter'), 'Ensure the exposed form is rendered before submitting the normal form.'); + $this->assertRaw(t('Apply'), 'Ensure the exposed form is rendered before submitting the normal form.'); $this->assertRaw('<div class="views-row">', 'Views result shown.'); $this->drupalPostForm(NULL, array(), t('Submit')); $this->assertResponse(200); $form = $this->cssSelect('form.views-exposed-form'); $this->assertTrue($form, 'The exposed form element was found.'); - $this->assertRaw(t('Filter'), 'Ensure the exposed form is rendered after submitting the normal form.'); + $this->assertRaw(t('Apply'), 'Ensure the exposed form is rendered after submitting the normal form.'); $this->assertRaw('<div class="views-row">', 'Views result shown.'); } diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.base_and_revision.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.base_and_revision.yml index 6b2db8eb2d72..d7d616297f56 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.base_and_revision.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.base_and_revision.yml @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.node_id_argument.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.node_id_argument.yml index d163e519fd98..5d2f5edab698 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.node_id_argument.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.node_id_argument.yml @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.numeric_test.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.numeric_test.yml index d5230eb63ecf..1246f1c708a0 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.numeric_test.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.numeric_test.yml @@ -38,7 +38,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.rest_export_with_authorization.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.rest_export_with_authorization.yml index b15d5e6152ad..bef857f0a55d 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.rest_export_with_authorization.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.rest_export_with_authorization.yml @@ -42,7 +42,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_node.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_node.yml index 3544bd94e758..396e79877371 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_node.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_node.yml @@ -39,7 +39,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' 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 43197f7719d2..2c8541b9f8f1 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 @@ -45,7 +45,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_validator_term.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_validator_term.yml index 2227a6c9bd31..91e239b09809 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_validator_term.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_validator_term.yml @@ -38,7 +38,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attached_disabled.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attached_disabled.yml index e4bb2b86f03c..c36cd48000b5 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attached_disabled.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attached_disabled.yml @@ -39,7 +39,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_disabled_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_disabled_display.yml index c325db42963c..79abcdb932d0 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_disabled_display.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_disabled_display.yml @@ -39,7 +39,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_duplicate_field_handlers.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_duplicate_field_handlers.yml index d9f8cbab1c5e..41a9dfa0c475 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_duplicate_field_handlers.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_duplicate_field_handlers.yml @@ -39,7 +39,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_test_link.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_test_link.yml index f8ba53cc400e..ca151de45bc3 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_test_link.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_test_link.yml @@ -35,7 +35,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_test_protected_access.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_test_protected_access.yml index 512c87d41fad..024b12f82632 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_test_protected_access.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_test_protected_access.yml @@ -38,7 +38,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_relationship_admin_ui.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_relationship_admin_ui.yml index b46bc3c31d22..7d5fb3f857a3 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_relationship_admin_ui.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_relationship_admin_ui.yml @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_feed_icon.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_feed_icon.yml index 56765277787e..acb6acb0a26f 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_feed_icon.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_feed_icon.yml @@ -40,7 +40,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_body.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_body.yml index a8ac1d6a6661..60d3cede2216 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_body.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_body.yml @@ -40,7 +40,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_entity_test_rendered.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_entity_test_rendered.yml index b8e1936bdaf9..541ee969306f 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_entity_test_rendered.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_entity_test_rendered.yml @@ -36,7 +36,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_attachment_test.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_attachment_test.yml index 24e76e8ee945..e09726426b40 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_attachment_test.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_attachment_test.yml @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' 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 b687bb9aecd2..e2e143eafc2b 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 @@ -38,7 +38,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_row_render_cache.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_row_render_cache.yml index 26ec9ed594ce..34a3cc56b8aa 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_row_render_cache.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_row_render_cache.yml @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_row_render_cache_none.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_row_render_cache_none.yml index 5abfa111a683..3a6bf953be25 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_row_render_cache_none.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_row_render_cache_none.yml @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' 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 5b5f60e51400..67873caf0866 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 @@ -38,7 +38,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_taxonomy_glossary.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_taxonomy_glossary.yml index 3b396cc0c36b..8e4182dc16e5 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_taxonomy_glossary.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_taxonomy_glossary.yml @@ -35,7 +35,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_token_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_token_view.yml index 8c85d59c3ae6..b2e3c7d58b68 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_token_view.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_token_view.yml @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' 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 014f865ab1c3..d45d509c5c78 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 @@ -37,7 +37,7 @@ display: exposed_form: type: basic options: - submit_button: Filter + submit_button: Apply reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' -- GitLab