diff --git a/core/lib/Drupal/Core/Config/Entity/DraggableListBuilder.php b/core/lib/Drupal/Core/Config/Entity/DraggableListBuilder.php index f6bf463b1631e1aa6287acf9087de3624c5e1cf4..d70aee86af39e9fcd4ab87b4e38e0c3db0d985ab 100644 --- a/core/lib/Drupal/Core/Config/Entity/DraggableListBuilder.php +++ b/core/lib/Drupal/Core/Config/Entity/DraggableListBuilder.php @@ -107,7 +107,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { $form[$this->entitiesKey] = [ '#type' => 'table', '#header' => $this->buildHeader(), - '#empty' => t('There is no @label yet.', ['@label' => $this->entityType->getLabel()]), + '#empty' => t('There are no @label yet.', ['@label' => $this->entityType->getPluralLabel()]), '#tabledrag' => [ [ 'action' => 'order', diff --git a/core/lib/Drupal/Core/Entity/EntityListBuilder.php b/core/lib/Drupal/Core/Entity/EntityListBuilder.php index 7191fae8d407dc898018f6fcca2911a3aca37a9b..91f4d2129704b5ce17119ee0127414f76f7e57d3 100644 --- a/core/lib/Drupal/Core/Entity/EntityListBuilder.php +++ b/core/lib/Drupal/Core/Entity/EntityListBuilder.php @@ -223,7 +223,7 @@ public function render() { '#header' => $this->buildHeader(), '#title' => $this->getTitle(), '#rows' => [], - '#empty' => $this->t('There is no @label yet.', ['@label' => $this->entityType->getLabel()]), + '#empty' => $this->t('There are no @label yet.', ['@label' => $this->entityType->getPluralLabel()]), '#cache' => [ 'contexts' => $this->entityType->getListCacheContexts(), 'tags' => $this->entityType->getListCacheTags(), diff --git a/core/modules/action/tests/src/Functional/ActionListTest.php b/core/modules/action/tests/src/Functional/ActionListTest.php index 309160f4be9c0309ad0b068e17830534cef0da67..fc67986e77670929223b4ba0de380cdf5f1539ec 100644 --- a/core/modules/action/tests/src/Functional/ActionListTest.php +++ b/core/modules/action/tests/src/Functional/ActionListTest.php @@ -31,7 +31,7 @@ public function testEmptyActionList() { $actions = $storage->loadMultiple(); $storage->delete($actions); $this->drupalGet('/admin/config/system/actions'); - $this->assertRaw('There is no Action yet.'); + $this->assertRaw('There are no actions yet.'); } } diff --git a/core/modules/block_content/tests/src/Functional/BlockContentListTest.php b/core/modules/block_content/tests/src/Functional/BlockContentListTest.php index aba60c366c629158b87840b6596aea7b1e72efd5..9a26f1c4077616b59aee55e8a21686a4a3f850c4 100644 --- a/core/modules/block_content/tests/src/Functional/BlockContentListTest.php +++ b/core/modules/block_content/tests/src/Functional/BlockContentListTest.php @@ -103,7 +103,7 @@ public function testListing() { $this->assertNoFieldByXpath('//td', $new_label, 'No label found for deleted custom block.'); // Confirm that the empty text is displayed. - $this->assertText(t('There is no Custom block yet.')); + $this->assertText(t('There are no custom blocks yet.')); } } diff --git a/core/modules/config/tests/src/Functional/ConfigEntityListTest.php b/core/modules/config/tests/src/Functional/ConfigEntityListTest.php index ae9be133f6015170d6d03eb1c9333f553b9ab9cf..b92629d1977d97a6d12f7bf092c9aaf034f20e87 100644 --- a/core/modules/config/tests/src/Functional/ConfigEntityListTest.php +++ b/core/modules/config/tests/src/Functional/ConfigEntityListTest.php @@ -243,7 +243,7 @@ public function testListUI() { $this->assertNoFieldByXpath('//td', 'dotted.default', "No machine name found for deleted 'Default' entity."); // Confirm that the empty text is displayed. - $this->assertText('There is no Test configuration yet.'); + $this->assertText('There are no test configuration entities yet.'); } /** diff --git a/core/modules/responsive_image/tests/src/Functional/ResponsiveImageAdminUITest.php b/core/modules/responsive_image/tests/src/Functional/ResponsiveImageAdminUITest.php index eeaf793fa08818be6af9708bf9ff76c561cc649c..ce9050e2736d39719cc499a17683d659a0376447 100644 --- a/core/modules/responsive_image/tests/src/Functional/ResponsiveImageAdminUITest.php +++ b/core/modules/responsive_image/tests/src/Functional/ResponsiveImageAdminUITest.php @@ -35,7 +35,7 @@ protected function setUp() { public function testResponsiveImageAdmin() { // We start without any default styles. $this->drupalGet('admin/config/media/responsive-image-style'); - $this->assertText('There is no Responsive image style yet.'); + $this->assertText('There are no responsive image styles yet.'); // Add a responsive image style. $this->drupalGet('admin/config/media/responsive-image-style/add'); @@ -54,7 +54,7 @@ public function testResponsiveImageAdmin() { // Check if the new group is created. $this->assertResponse(200); $this->drupalGet('admin/config/media/responsive-image-style'); - $this->assertNoText('There is no Responsive image style yet.'); + $this->assertNoText('There are no responsive image styles yet.'); $this->assertText('Style One'); $this->assertText('style_one'); @@ -137,7 +137,7 @@ public function testResponsiveImageAdmin() { $this->drupalGet('admin/config/media/responsive-image-style/style_one/delete'); $this->drupalPostForm(NULL, [], t('Delete')); $this->drupalGet('admin/config/media/responsive-image-style'); - $this->assertText('There is no Responsive image style yet.'); + $this->assertText('There are no responsive image styles yet.'); } } diff --git a/core/modules/workflows/tests/src/Functional/WorkflowUiNoTypeTest.php b/core/modules/workflows/tests/src/Functional/WorkflowUiNoTypeTest.php index 197386ebd0d99e791c667833f577fd627c468469..01c61ac6b00d6cc117f656f8e01a53bc2d81417e 100644 --- a/core/modules/workflows/tests/src/Functional/WorkflowUiNoTypeTest.php +++ b/core/modules/workflows/tests/src/Functional/WorkflowUiNoTypeTest.php @@ -49,7 +49,7 @@ public function testWorkflowUiWithNoType() { $this->drupalGet('admin/config/workflow/workflows'); $this->assertSession()->pageTextNotContains('There are no workflow types available. In order to create workflows you need to install a module that provides a workflow type. For example, the Content Moderation module provides a workflow type that enables workflows for content entities.'); $this->assertSession()->linkExists('Add workflow'); - $this->assertSession()->pageTextContains('There is no Workflow yet.'); + $this->assertSession()->pageTextContains('There are no workflows yet.'); } } diff --git a/core/modules/workflows/tests/src/Functional/WorkflowUiTest.php b/core/modules/workflows/tests/src/Functional/WorkflowUiTest.php index b15b24099c181e031cb82694fb5dd4f35a04d76c..d3492201ddce73251f616aa3ce97627cf6b6c98e 100644 --- a/core/modules/workflows/tests/src/Functional/WorkflowUiTest.php +++ b/core/modules/workflows/tests/src/Functional/WorkflowUiTest.php @@ -109,7 +109,7 @@ public function testWorkflowCreation() { $this->assertSession()->linkByHrefExists('admin/config/workflow/workflows'); $this->clickLink('Workflows'); $this->assertSession()->pageTextContains('Workflows'); - $this->assertSession()->pageTextContains('There is no Workflow yet.'); + $this->assertSession()->pageTextContains('There are no workflows yet.'); $this->clickLink('Add workflow'); $this->submitForm(['label' => 'Test', 'id' => 'test', 'workflow_type' => 'workflow_type_test'], 'Save'); $this->assertSession()->pageTextContains('Created the Test Workflow.'); @@ -253,7 +253,7 @@ public function testWorkflowCreation() { $this->assertSession()->pageTextContains('Are you sure you want to delete Test?'); $this->submitForm([], 'Delete'); $this->assertSession()->pageTextContains('Workflow Test deleted.'); - $this->assertSession()->pageTextContains('There is no Workflow yet.'); + $this->assertSession()->pageTextContains('There are no workflows yet.'); $this->assertNull($workflow_storage->loadUnchanged('test'), 'The test workflow has been deleted'); // Ensure that workflow types with default configuration are initialized