summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2018-03-20 09:57:05 (GMT)
committerAlex Pott2018-03-20 09:57:05 (GMT)
commit13822906e5d7704a0df00dbd930b09a71f4b1972 (patch)
treefa01904a18281b858df928f3977fa576e4415927
parente4b7dc0e0b2840d711029ccc065d6fb4ba74649b (diff)
Issue #2702683 by Manuel Garcia, xjm, prics, pguillard, Jo Fitzgerald, vg3095, ztl8702, lucian.cazaciuc, bojanz, tstoeckler, hchonov, rszrama, rteijeiro, svjuly, jibran, vdanielpop, vasike, jmikii, jhodgdon, Wim Leers, amateescu, Gabr1el, Drupa1ish, ciprian.stavovei: Add plural labels to entity types
-rw-r--r--core/modules/aggregator/src/Entity/Feed.php7
-rw-r--r--core/modules/aggregator/src/Entity/Item.php7
-rw-r--r--core/modules/block/src/Entity/Block.php7
-rw-r--r--core/modules/block_content/src/Entity/BlockContent.php7
-rw-r--r--core/modules/block_content/src/Entity/BlockContentType.php7
-rw-r--r--core/modules/contact/src/Entity/ContactForm.php7
-rw-r--r--core/modules/contact/src/Entity/Message.php7
-rw-r--r--core/modules/content_moderation/tests/src/Functional/ContentModerationWorkflowTypeTest.php2
-rw-r--r--core/modules/editor/src/Entity/Editor.php7
-rw-r--r--core/modules/field/src/Entity/FieldConfig.php7
-rw-r--r--core/modules/field/src/Entity/FieldStorageConfig.php7
-rw-r--r--core/modules/file/src/Entity/File.php7
-rw-r--r--core/modules/filter/src/Entity/FilterFormat.php7
-rw-r--r--core/modules/image/src/Entity/ImageStyle.php7
-rw-r--r--core/modules/language/src/Entity/ConfigurableLanguage.php7
-rw-r--r--core/modules/language/src/Entity/ContentLanguageSettings.php7
-rw-r--r--core/modules/menu_link_content/src/Entity/MenuLinkContent.php7
-rw-r--r--core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/source/ContentEntityTest.php6
-rw-r--r--core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php2
-rw-r--r--core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php10
-rw-r--r--core/modules/node/src/Entity/NodeType.php7
-rw-r--r--core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php7
-rw-r--r--core/modules/rest/src/Entity/RestResourceConfig.php7
-rw-r--r--core/modules/search/src/Entity/SearchPage.php7
-rw-r--r--core/modules/shortcut/src/Entity/Shortcut.php7
-rw-r--r--core/modules/shortcut/src/Entity/ShortcutSet.php7
-rw-r--r--core/modules/system/src/Entity/Action.php7
-rw-r--r--core/modules/system/src/Entity/Menu.php7
-rw-r--r--core/modules/system/tests/src/Functional/Module/PrepareUninstallTest.php6
-rw-r--r--core/modules/taxonomy/src/Entity/Term.php7
-rw-r--r--core/modules/tour/src/Entity/Tour.php7
-rw-r--r--core/modules/user/src/Entity/Role.php7
-rw-r--r--core/modules/user/src/Entity/User.php7
-rw-r--r--core/modules/views/src/Entity/View.php8
-rw-r--r--core/modules/workflows/src/Entity/Workflow.php6
35 files changed, 223 insertions, 13 deletions
diff --git a/core/modules/aggregator/src/Entity/Feed.php b/core/modules/aggregator/src/Entity/Feed.php
index e27450c..1e33219 100644
--- a/core/modules/aggregator/src/Entity/Feed.php
+++ b/core/modules/aggregator/src/Entity/Feed.php
@@ -14,6 +14,13 @@ use Drupal\aggregator\FeedInterface;
* @ContentEntityType(
* id = "aggregator_feed",
* label = @Translation("Aggregator feed"),
+ * label_collection = @Translation("Aggregator feeds"),
+ * label_singular = @Translation("aggregator feed"),
+ * label_plural = @Translation("aggregator feeds"),
+ * label_count = @PluralTranslation(
+ * singular = "@count aggregator feed",
+ * plural = "@count aggregator feeds",
+ * ),
* handlers = {
* "storage" = "Drupal\aggregator\FeedStorage",
* "storage_schema" = "Drupal\aggregator\FeedStorageSchema",
diff --git a/core/modules/aggregator/src/Entity/Item.php b/core/modules/aggregator/src/Entity/Item.php
index ef0c6d2..b637171 100644
--- a/core/modules/aggregator/src/Entity/Item.php
+++ b/core/modules/aggregator/src/Entity/Item.php
@@ -16,6 +16,13 @@ use Drupal\Core\Url;
* @ContentEntityType(
* id = "aggregator_item",
* label = @Translation("Aggregator feed item"),
+ * label_collection = @Translation("Aggregator feed items"),
+ * label_singular = @Translation("aggregator feed item"),
+ * label_plural = @Translation("aggregator feed items"),
+ * label_count = @PluralTranslation(
+ * singular = "@count aggregator feed item",
+ * plural = "@count aggregator feed items",
+ * ),
* handlers = {
* "storage" = "Drupal\aggregator\ItemStorage",
* "storage_schema" = "Drupal\aggregator\ItemStorageSchema",
diff --git a/core/modules/block/src/Entity/Block.php b/core/modules/block/src/Entity/Block.php
index a0bbd25..ece8de3 100644
--- a/core/modules/block/src/Entity/Block.php
+++ b/core/modules/block/src/Entity/Block.php
@@ -17,6 +17,13 @@ use Drupal\Core\Entity\EntityStorageInterface;
* @ConfigEntityType(
* id = "block",
* label = @Translation("Block"),
+ * label_collection = @Translation("Blocks"),
+ * label_singular = @Translation("block"),
+ * label_plural = @Translation("blocks"),
+ * label_count = @PluralTranslation(
+ * singular = "@count block",
+ * plural = "@count blocks",
+ * ),
* handlers = {
* "access" = "Drupal\block\BlockAccessControlHandler",
* "view_builder" = "Drupal\block\BlockViewBuilder",
diff --git a/core/modules/block_content/src/Entity/BlockContent.php b/core/modules/block_content/src/Entity/BlockContent.php
index 3c8858f..7696da0 100644
--- a/core/modules/block_content/src/Entity/BlockContent.php
+++ b/core/modules/block_content/src/Entity/BlockContent.php
@@ -15,6 +15,13 @@ use Drupal\user\UserInterface;
* @ContentEntityType(
* id = "block_content",
* label = @Translation("Custom block"),
+ * label_collection = @Translation("Custom blocks"),
+ * label_singular = @Translation("custom block"),
+ * label_plural = @Translation("custom blocks"),
+ * label_count = @PluralTranslation(
+ * singular = "@count custom block",
+ * plural = "@count custom blocks",
+ * ),
* bundle_label = @Translation("Custom block type"),
* handlers = {
* "storage" = "Drupal\Core\Entity\Sql\SqlContentEntityStorage",
diff --git a/core/modules/block_content/src/Entity/BlockContentType.php b/core/modules/block_content/src/Entity/BlockContentType.php
index 1b63eda..20f9593 100644
--- a/core/modules/block_content/src/Entity/BlockContentType.php
+++ b/core/modules/block_content/src/Entity/BlockContentType.php
@@ -11,6 +11,13 @@ use Drupal\block_content\BlockContentTypeInterface;
* @ConfigEntityType(
* id = "block_content_type",
* label = @Translation("Custom block type"),
+ * label_collection = @Translation("Custom block types"),
+ * label_singular = @Translation("custom block type"),
+ * label_plural = @Translation("custom block types"),
+ * label_count = @PluralTranslation(
+ * singular = "@count custom block type",
+ * plural = "@count custom block types",
+ * ),
* label_collection = @Translation("Custom block library"),
* handlers = {
* "form" = {
diff --git a/core/modules/contact/src/Entity/ContactForm.php b/core/modules/contact/src/Entity/ContactForm.php
index 00e5416..91364b0 100644
--- a/core/modules/contact/src/Entity/ContactForm.php
+++ b/core/modules/contact/src/Entity/ContactForm.php
@@ -12,6 +12,13 @@ use Drupal\Core\Url;
* @ConfigEntityType(
* id = "contact_form",
* label = @Translation("Contact form"),
+ * label_collection = @Translation("Contact forms"),
+ * label_singular = @Translation("contact form"),
+ * label_plural = @Translation("contact forms"),
+ * label_count = @PluralTranslation(
+ * singular = "@count contact form",
+ * plural = "@count contact forms",
+ * ),
* handlers = {
* "access" = "Drupal\contact\ContactFormAccessControlHandler",
* "list_builder" = "Drupal\contact\ContactFormListBuilder",
diff --git a/core/modules/contact/src/Entity/Message.php b/core/modules/contact/src/Entity/Message.php
index b108660..f41d9f1 100644
--- a/core/modules/contact/src/Entity/Message.php
+++ b/core/modules/contact/src/Entity/Message.php
@@ -13,6 +13,13 @@ use Drupal\Core\Field\BaseFieldDefinition;
* @ContentEntityType(
* id = "contact_message",
* label = @Translation("Contact message"),
+ * label_collection = @Translation("Contact messages"),
+ * label_singular = @Translation("contact message"),
+ * label_plural = @Translation("contact messages"),
+ * label_count = @PluralTranslation(
+ * singular = "@count contact message",
+ * plural = "@count contact messages",
+ * ),
* bundle_label = @Translation("Contact form"),
* handlers = {
* "access" = "Drupal\contact\ContactMessageAccessControlHandler",
diff --git a/core/modules/content_moderation/tests/src/Functional/ContentModerationWorkflowTypeTest.php b/core/modules/content_moderation/tests/src/Functional/ContentModerationWorkflowTypeTest.php
index 195718a..96461ac 100644
--- a/core/modules/content_moderation/tests/src/Functional/ContentModerationWorkflowTypeTest.php
+++ b/core/modules/content_moderation/tests/src/Functional/ContentModerationWorkflowTypeTest.php
@@ -92,7 +92,7 @@ class ContentModerationWorkflowTypeTest extends BrowserTestBase {
$session->fieldDisabled('type_settings[default_revision]');
$this->drupalGet('admin/config/workflow/workflows/manage/test/type/node');
- $session->pageTextContains('Select the content type entities for the Test workflow');
+ $session->pageTextContains('Select the content types for the Test workflow');
foreach ($types as $type) {
$session->pageTextContains($type->label());
}
diff --git a/core/modules/editor/src/Entity/Editor.php b/core/modules/editor/src/Entity/Editor.php
index 1a417d7..07c9d24 100644
--- a/core/modules/editor/src/Entity/Editor.php
+++ b/core/modules/editor/src/Entity/Editor.php
@@ -11,6 +11,13 @@ use Drupal\editor\EditorInterface;
* @ConfigEntityType(
* id = "editor",
* label = @Translation("Text Editor"),
+ * label_collection = @Translation("Text Editors"),
+ * label_singular = @Translation("text editor"),
+ * label_plural = @Translation("text editors"),
+ * label_count = @PluralTranslation(
+ * singular = "@count text editor",
+ * plural = "@count text editors",
+ * ),
* handlers = {
* "access" = "Drupal\editor\EditorAccessControlHandler",
* },
diff --git a/core/modules/field/src/Entity/FieldConfig.php b/core/modules/field/src/Entity/FieldConfig.php
index af17eee..69be43c 100644
--- a/core/modules/field/src/Entity/FieldConfig.php
+++ b/core/modules/field/src/Entity/FieldConfig.php
@@ -15,6 +15,13 @@ use Drupal\field\FieldConfigInterface;
* @ConfigEntityType(
* id = "field_config",
* label = @Translation("Field"),
+ * label_collection = @Translation("Fields"),
+ * label_singular = @Translation("field"),
+ * label_plural = @Translation("fields"),
+ * label_count = @PluralTranslation(
+ * singular = "@count field",
+ * plural = "@count fields",
+ * ),
* handlers = {
* "access" = "Drupal\field\FieldConfigAccessControlHandler",
* "storage" = "Drupal\field\FieldConfigStorage"
diff --git a/core/modules/field/src/Entity/FieldStorageConfig.php b/core/modules/field/src/Entity/FieldStorageConfig.php
index 6ae439e..4e8ad91 100644
--- a/core/modules/field/src/Entity/FieldStorageConfig.php
+++ b/core/modules/field/src/Entity/FieldStorageConfig.php
@@ -18,6 +18,13 @@ use Drupal\field\FieldStorageConfigInterface;
* @ConfigEntityType(
* id = "field_storage_config",
* label = @Translation("Field storage"),
+ * label_collection = @Translation("Field storages"),
+ * label_singular = @Translation("field storage"),
+ * label_plural = @Translation("field storages"),
+ * label_count = @PluralTranslation(
+ * singular = "@count field storage",
+ * plural = "@count field storages",
+ * ),
* handlers = {
* "access" = "Drupal\field\FieldStorageConfigAccessControlHandler",
* "storage" = "Drupal\field\FieldStorageConfigStorage"
diff --git a/core/modules/file/src/Entity/File.php b/core/modules/file/src/Entity/File.php
index 4060b77..33f6d74 100644
--- a/core/modules/file/src/Entity/File.php
+++ b/core/modules/file/src/Entity/File.php
@@ -18,6 +18,13 @@ use Drupal\user\UserInterface;
* @ContentEntityType(
* id = "file",
* label = @Translation("File"),
+ * label_collection = @Translation("Files"),
+ * label_singular = @Translation("file"),
+ * label_plural = @Translation("files"),
+ * label_count = @PluralTranslation(
+ * singular = "@count file",
+ * plural = "@count files",
+ * ),
* handlers = {
* "storage" = "Drupal\file\FileStorage",
* "storage_schema" = "Drupal\file\FileStorageSchema",
diff --git a/core/modules/filter/src/Entity/FilterFormat.php b/core/modules/filter/src/Entity/FilterFormat.php
index c757512..604ce01 100644
--- a/core/modules/filter/src/Entity/FilterFormat.php
+++ b/core/modules/filter/src/Entity/FilterFormat.php
@@ -16,6 +16,13 @@ use Drupal\filter\Plugin\FilterInterface;
* @ConfigEntityType(
* id = "filter_format",
* label = @Translation("Text format"),
+ * label_collection = @Translation("Text formats"),
+ * label_singular = @Translation("text format"),
+ * label_plural = @Translation("text formats"),
+ * label_count = @PluralTranslation(
+ * singular = "@count text format",
+ * plural = "@count text formats",
+ * ),
* handlers = {
* "form" = {
* "add" = "Drupal\filter\FilterFormatAddForm",
diff --git a/core/modules/image/src/Entity/ImageStyle.php b/core/modules/image/src/Entity/ImageStyle.php
index dd26124..da00c7f 100644
--- a/core/modules/image/src/Entity/ImageStyle.php
+++ b/core/modules/image/src/Entity/ImageStyle.php
@@ -25,6 +25,13 @@ use Drupal\Core\Entity\Entity\EntityViewDisplay;
* @ConfigEntityType(
* id = "image_style",
* label = @Translation("Image style"),
+ * label_collection = @Translation("Image styles"),
+ * label_singular = @Translation("image style"),
+ * label_plural = @Translation("image styles"),
+ * label_count = @PluralTranslation(
+ * singular = "@count image style",
+ * plural = "@count image styles",
+ * ),
* handlers = {
* "form" = {
* "add" = "Drupal\image\Form\ImageStyleAddForm",
diff --git a/core/modules/language/src/Entity/ConfigurableLanguage.php b/core/modules/language/src/Entity/ConfigurableLanguage.php
index 4fecde7..25c5880 100644
--- a/core/modules/language/src/Entity/ConfigurableLanguage.php
+++ b/core/modules/language/src/Entity/ConfigurableLanguage.php
@@ -16,6 +16,13 @@ use Drupal\language\ConfigurableLanguageInterface;
* @ConfigEntityType(
* id = "configurable_language",
* label = @Translation("Language"),
+ * label_collection = @Translation("Languages"),
+ * label_singular = @Translation("language"),
+ * label_plural = @Translation("languages"),
+ * label_count = @PluralTranslation(
+ * singular = "@count language",
+ * plural = "@count languages",
+ * ),
* handlers = {
* "list_builder" = "Drupal\language\LanguageListBuilder",
* "access" = "Drupal\language\LanguageAccessControlHandler",
diff --git a/core/modules/language/src/Entity/ContentLanguageSettings.php b/core/modules/language/src/Entity/ContentLanguageSettings.php
index 87ebd21..0012e79 100644
--- a/core/modules/language/src/Entity/ContentLanguageSettings.php
+++ b/core/modules/language/src/Entity/ContentLanguageSettings.php
@@ -14,6 +14,13 @@ use Drupal\language\ContentLanguageSettingsInterface;
* @ConfigEntityType(
* id = "language_content_settings",
* label = @Translation("Content Language Settings"),
+ * label_collection = @Translation("Content Language Settings"),
+ * label_singular = @Translation("content language setting"),
+ * label_plural = @Translation("content languages settings"),
+ * label_count = @PluralTranslation(
+ * singular = "@count content language setting",
+ * plural = "@count content languages settings",
+ * ),
* admin_permission = "administer languages",
* config_prefix = "content_settings",
* entity_keys = {
diff --git a/core/modules/menu_link_content/src/Entity/MenuLinkContent.php b/core/modules/menu_link_content/src/Entity/MenuLinkContent.php
index 460c0df..49235b9 100644
--- a/core/modules/menu_link_content/src/Entity/MenuLinkContent.php
+++ b/core/modules/menu_link_content/src/Entity/MenuLinkContent.php
@@ -19,6 +19,13 @@ use Drupal\menu_link_content\MenuLinkContentInterface;
* @ContentEntityType(
* id = "menu_link_content",
* label = @Translation("Custom menu link"),
+ * label_collection = @Translation("Custom menu links"),
+ * label_singular = @Translation("custom menu link"),
+ * label_plural = @Translation("custom menu links"),
+ * label_count = @PluralTranslation(
+ * singular = "@count custom menu link",
+ * plural = "@count custom menu links",
+ * ),
* handlers = {
* "storage" = "Drupal\Core\Entity\Sql\SqlContentEntityStorage",
* "storage_schema" = "Drupal\menu_link_content\MenuLinkContentStorageSchema",
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/source/ContentEntityTest.php b/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/source/ContentEntityTest.php
index 72372af..095de33 100644
--- a/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/source/ContentEntityTest.php
+++ b/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/source/ContentEntityTest.php
@@ -244,7 +244,7 @@ class ContentEntityTest extends KernelTestBase {
];
$migration = $this->migrationPluginManager->createStubMigration($this->migrationDefinition('content_entity:user'));
$user_source = $this->sourcePluginManager->createInstance('content_entity:user', $configuration, $migration);
- $this->assertSame('user entities', $user_source->__toString());
+ $this->assertSame('users', $user_source->__toString());
$this->assertEquals(1, $user_source->count());
$ids = $user_source->getIds();
$this->assertArrayHasKey('langcode', $ids);
@@ -279,7 +279,7 @@ class ContentEntityTest extends KernelTestBase {
];
$migration = $this->migrationPluginManager->createStubMigration($this->migrationDefinition('content_entity:file'));
$file_source = $this->sourcePluginManager->createInstance('content_entity:file', $configuration, $migration);
- $this->assertSame('file entities', $file_source->__toString());
+ $this->assertSame('files', $file_source->__toString());
$this->assertEquals(1, $file_source->count());
$ids = $file_source->getIds();
$this->assertArrayHasKey('fid', $ids);
@@ -395,7 +395,7 @@ class ContentEntityTest extends KernelTestBase {
];
$migration = $this->migrationPluginManager->createStubMigration($this->migrationDefinition('content_entity:taxonomy_term'));
$term_source = $this->sourcePluginManager->createInstance('content_entity:taxonomy_term', $configuration, $migration);
- $this->assertSame('taxonomy term entities', $term_source->__toString());
+ $this->assertSame('taxonomy terms', $term_source->__toString());
$this->assertEquals(2, $term_source->count());
$ids = $term_source->getIds();
$this->assertArrayHasKey('langcode', $ids);
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php
index 36925d2..6cb10e4 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php
@@ -121,7 +121,7 @@ abstract class MigrateUpgradeExecuteTestBase extends MigrateUpgradeTestBase {
$this->drupalPostForm(NULL, $edits, t('Review upgrade'));
$session->pageTextContains('WARNING: Content may be overwritten on your new site.');
$session->pageTextContains('There is conflicting content of these types:');
- $session->pageTextContains('file entities');
+ $session->pageTextContains('files');
$session->pageTextContains('content item revisions');
$session->pageTextContains('There is translated content of these types:');
$session->pageTextContains('content items');
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
index c09b7ca..73158fe 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
@@ -209,11 +209,11 @@ abstract class MigrateUpgradeTestBase extends BrowserTestBase {
protected function assertIdConflict(WebAssert $session) {
$session->pageTextContains('WARNING: Content may be overwritten on your new site.');
$session->pageTextContains('There is conflicting content of these types:');
- $session->pageTextContains('custom block entities');
- $session->pageTextContains('custom menu link entities');
- $session->pageTextContains('file entities');
- $session->pageTextContains('taxonomy term entities');
- $session->pageTextContains('user entities');
+ $session->pageTextContains('custom blocks');
+ $session->pageTextContains('custom menu links');
+ $session->pageTextContains('files');
+ $session->pageTextContains('taxonomy terms');
+ $session->pageTextContains('users');
$session->pageTextContains('comments');
$session->pageTextContains('content item revisions');
$session->pageTextContains('content items');
diff --git a/core/modules/node/src/Entity/NodeType.php b/core/modules/node/src/Entity/NodeType.php
index e4a4c3b..6daa45d 100644
--- a/core/modules/node/src/Entity/NodeType.php
+++ b/core/modules/node/src/Entity/NodeType.php
@@ -12,6 +12,13 @@ use Drupal\node\NodeTypeInterface;
* @ConfigEntityType(
* id = "node_type",
* label = @Translation("Content type"),
+ * label_collection = @Translation("Content types"),
+ * label_singular = @Translation("content type"),
+ * label_plural = @Translation("content types"),
+ * label_count = @PluralTranslation(
+ * singular = "@count content type",
+ * plural = "@count content types",
+ * ),
* handlers = {
* "access" = "Drupal\node\NodeTypeAccessControlHandler",
* "form" = {
diff --git a/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php b/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php
index 5ad9d95..0b4dfd7 100644
--- a/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php
+++ b/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php
@@ -12,6 +12,13 @@ use Drupal\responsive_image\ResponsiveImageStyleInterface;
* @ConfigEntityType(
* id = "responsive_image_style",
* label = @Translation("Responsive image style"),
+ * label_collection = @Translation("Responsive image styles"),
+ * label_singular = @Translation("responsive image style"),
+ * label_plural = @Translation("responsive image styles"),
+ * label_count = @PluralTranslation(
+ * singular = "@count responsive image style",
+ * plural = "@count responsive image styles",
+ * ),
* handlers = {
* "list_builder" = "Drupal\responsive_image\ResponsiveImageStyleListBuilder",
* "form" = {
diff --git a/core/modules/rest/src/Entity/RestResourceConfig.php b/core/modules/rest/src/Entity/RestResourceConfig.php
index 12bd846..47faa01 100644
--- a/core/modules/rest/src/Entity/RestResourceConfig.php
+++ b/core/modules/rest/src/Entity/RestResourceConfig.php
@@ -13,6 +13,13 @@ use Drupal\rest\RestResourceConfigInterface;
* @ConfigEntityType(
* id = "rest_resource_config",
* label = @Translation("REST resource configuration"),
+ * label_collection = @Translation("REST resource configurations"),
+ * label_singular = @Translation("REST resource configuration"),
+ * label_plural = @Translation("REST resource configurations"),
+ * label_count = @PluralTranslation(
+ * singular = "@count REST resource configuration",
+ * plural = "@count REST resource configurations",
+ * ),
* config_prefix = "resource",
* admin_permission = "administer rest resources",
* label_callback = "getLabelFromPlugin",
diff --git a/core/modules/search/src/Entity/SearchPage.php b/core/modules/search/src/Entity/SearchPage.php
index 85ddc26..94ae70d 100644
--- a/core/modules/search/src/Entity/SearchPage.php
+++ b/core/modules/search/src/Entity/SearchPage.php
@@ -16,6 +16,13 @@ use Drupal\search\SearchPageInterface;
* @ConfigEntityType(
* id = "search_page",
* label = @Translation("Search page"),
+ * label_collection = @Translation("Search pages"),
+ * label_singular = @Translation("search page"),
+ * label_plural = @Translation("search pages"),
+ * label_count = @PluralTranslation(
+ * singular = "@count search page",
+ * plural = "@count search pages",
+ * ),
* handlers = {
* "access" = "Drupal\search\SearchPageAccessControlHandler",
* "list_builder" = "Drupal\search\SearchPageListBuilder",
diff --git a/core/modules/shortcut/src/Entity/Shortcut.php b/core/modules/shortcut/src/Entity/Shortcut.php
index bba393a..92e59fb 100644
--- a/core/modules/shortcut/src/Entity/Shortcut.php
+++ b/core/modules/shortcut/src/Entity/Shortcut.php
@@ -18,6 +18,13 @@ use Drupal\shortcut\ShortcutInterface;
* @ContentEntityType(
* id = "shortcut",
* label = @Translation("Shortcut link"),
+ * label_collection = @Translation("Shortcut links"),
+ * label_singular = @Translation("shortcut link"),
+ * label_plural = @Translation("shortcut links"),
+ * label_count = @PluralTranslation(
+ * singular = "@count shortcut link",
+ * plural = "@count shortcut links",
+ * ),
* bundle_label = @Translation("Shortcut set"),
* handlers = {
* "access" = "Drupal\shortcut\ShortcutAccessControlHandler",
diff --git a/core/modules/shortcut/src/Entity/ShortcutSet.php b/core/modules/shortcut/src/Entity/ShortcutSet.php
index 3d3815d..819f647 100644
--- a/core/modules/shortcut/src/Entity/ShortcutSet.php
+++ b/core/modules/shortcut/src/Entity/ShortcutSet.php
@@ -12,6 +12,13 @@ use Drupal\shortcut\ShortcutSetInterface;
* @ConfigEntityType(
* id = "shortcut_set",
* label = @Translation("Shortcut set"),
+ * label_collection = @Translation("Shortcut sets"),
+ * label_singular = @Translation("shortcut set"),
+ * label_plural = @Translation("shortcut sets"),
+ * label_count = @PluralTranslation(
+ * singular = "@count shortcut set",
+ * plural = "@count shortcut sets",
+ * ),
* handlers = {
* "storage" = "Drupal\shortcut\ShortcutSetStorage",
* "access" = "Drupal\shortcut\ShortcutSetAccessControlHandler",
diff --git a/core/modules/system/src/Entity/Action.php b/core/modules/system/src/Entity/Action.php
index a412838..964a64e 100644
--- a/core/modules/system/src/Entity/Action.php
+++ b/core/modules/system/src/Entity/Action.php
@@ -15,6 +15,13 @@ use Drupal\Component\Plugin\ConfigurablePluginInterface;
* @ConfigEntityType(
* id = "action",
* label = @Translation("Action"),
+ * label_collection = @Translation("Actions"),
+ * label_singular = @Translation("action"),
+ * label_plural = @Translation("actions"),
+ * label_count = @PluralTranslation(
+ * singular = "@count action",
+ * plural = "@count actions",
+ * ),
* admin_permission = "administer actions",
* entity_keys = {
* "id" = "id",
diff --git a/core/modules/system/src/Entity/Menu.php b/core/modules/system/src/Entity/Menu.php
index e7fbb47f..9547d42 100644
--- a/core/modules/system/src/Entity/Menu.php
+++ b/core/modules/system/src/Entity/Menu.php
@@ -11,6 +11,13 @@ use Drupal\system\MenuInterface;
* @ConfigEntityType(
* id = "menu",
* label = @Translation("Menu"),
+ * label_collection = @Translation("Menus"),
+ * label_singular = @Translation("menu"),
+ * label_plural = @Translation("menus"),
+ * label_count = @PluralTranslation(
+ * singular = "@count menu",
+ * plural = "@count menus",
+ * ),
* handlers = {
* "access" = "Drupal\system\MenuAccessControlHandler"
* },
diff --git a/core/modules/system/tests/src/Functional/Module/PrepareUninstallTest.php b/core/modules/system/tests/src/Functional/Module/PrepareUninstallTest.php
index 86d06e3..cf57770 100644
--- a/core/modules/system/tests/src/Functional/Module/PrepareUninstallTest.php
+++ b/core/modules/system/tests/src/Functional/Module/PrepareUninstallTest.php
@@ -78,15 +78,15 @@ class PrepareUninstallTest extends BrowserTestBase {
$this->assertText($this->terms[$term_count - $i]->label());
}
$term_count = $term_count - 10;
- $this->assertText("And $term_count more taxonomy term entities.");
+ $this->assertText("And $term_count more taxonomy terms.");
$this->assertText('This action cannot be undone.');
$this->assertText('Make a backup of your database if you want to be able to restore these items.');
- $this->drupalPostForm(NULL, [], t('Delete all taxonomy term entities'));
+ $this->drupalPostForm(NULL, [], t('Delete all taxonomy terms'));
// Check that we are redirected to the uninstall page and data has been
// removed.
$this->assertUrl('admin/modules/uninstall', []);
- $this->assertText('All taxonomy term entities have been deleted.');
+ $this->assertText('All taxonomy terms have been deleted.');
// Check that there is no more data to be deleted, Taxonomy is ready to be
// uninstalled.
diff --git a/core/modules/taxonomy/src/Entity/Term.php b/core/modules/taxonomy/src/Entity/Term.php
index 66ef3f1..51e295a 100644
--- a/core/modules/taxonomy/src/Entity/Term.php
+++ b/core/modules/taxonomy/src/Entity/Term.php
@@ -15,6 +15,13 @@ use Drupal\taxonomy\TermInterface;
* @ContentEntityType(
* id = "taxonomy_term",
* label = @Translation("Taxonomy term"),
+ * label_collection = @Translation("Taxonomy terms"),
+ * label_singular = @Translation("taxonomy term"),
+ * label_plural = @Translation("taxonomy terms"),
+ * label_count = @PluralTranslation(
+ * singular = "@count taxonomy term",
+ * plural = "@count taxonomy terms",
+ * ),
* bundle_label = @Translation("Vocabulary"),
* handlers = {
* "storage" = "Drupal\taxonomy\TermStorage",
diff --git a/core/modules/tour/src/Entity/Tour.php b/core/modules/tour/src/Entity/Tour.php
index 9a8e166..feca058 100644
--- a/core/modules/tour/src/Entity/Tour.php
+++ b/core/modules/tour/src/Entity/Tour.php
@@ -12,6 +12,13 @@ use Drupal\tour\TourInterface;
* @ConfigEntityType(
* id = "tour",
* label = @Translation("Tour"),
+ * label_collection = @Translation("Tours"),
+ * label_singular = @Translation("tour"),
+ * label_plural = @Translation("tours"),
+ * label_count = @PluralTranslation(
+ * singular = "@count tour",
+ * plural = "@count tours",
+ * ),
* handlers = {
* "view_builder" = "Drupal\tour\TourViewBuilder",
* "access" = "Drupal\tour\TourAccessControlHandler",
diff --git a/core/modules/user/src/Entity/Role.php b/core/modules/user/src/Entity/Role.php
index 0226f94..3512fee 100644
--- a/core/modules/user/src/Entity/Role.php
+++ b/core/modules/user/src/Entity/Role.php
@@ -12,6 +12,13 @@ use Drupal\user\RoleInterface;
* @ConfigEntityType(
* id = "user_role",
* label = @Translation("Role"),
+ * label_collection = @Translation("Roles"),
+ * label_singular = @Translation("role"),
+ * label_plural = @Translation("roles"),
+ * label_count = @PluralTranslation(
+ * singular = "@count role",
+ * plural = "@count roles",
+ * ),
* handlers = {
* "storage" = "Drupal\user\RoleStorage",
* "access" = "Drupal\user\RoleAccessControlHandler",
diff --git a/core/modules/user/src/Entity/User.php b/core/modules/user/src/Entity/User.php
index 54439cf..979819f 100644
--- a/core/modules/user/src/Entity/User.php
+++ b/core/modules/user/src/Entity/User.php
@@ -22,6 +22,13 @@ use Drupal\user\UserInterface;
* @ContentEntityType(
* id = "user",
* label = @Translation("User"),
+ * label_collection = @Translation("Users"),
+ * label_singular = @Translation("user"),
+ * label_plural = @Translation("users"),
+ * label_count = @PluralTranslation(
+ * singular = "@count user",
+ * plural = "@count users",
+ * ),
* handlers = {
* "storage" = "Drupal\user\UserStorage",
* "storage_schema" = "Drupal\user\UserStorageSchema",
diff --git a/core/modules/views/src/Entity/View.php b/core/modules/views/src/Entity/View.php
index 44007eb..3877cc2 100644
--- a/core/modules/views/src/Entity/View.php
+++ b/core/modules/views/src/Entity/View.php
@@ -19,6 +19,14 @@ use Drupal\views\ViewEntityInterface;
* @ConfigEntityType(
* id = "view",
* label = @Translation("View", context = "View entity type"),
+ * label_collection = @Translation("Views", context = "View entity type"),
+ * label_singular = @Translation("view", context = "View entity type"),
+ * label_plural = @Translation("views", context = "View entity type"),
+ * label_count = @PluralTranslation(
+ * singular = "@count view",
+ * plural = "@count views",
+ * context = "View entity type",
+ * ),
* admin_permission = "administer views",
* entity_keys = {
* "id" = "id",
diff --git a/core/modules/workflows/src/Entity/Workflow.php b/core/modules/workflows/src/Entity/Workflow.php
index 2450fb7..3c7b06b 100644
--- a/core/modules/workflows/src/Entity/Workflow.php
+++ b/core/modules/workflows/src/Entity/Workflow.php
@@ -16,6 +16,12 @@ use Drupal\workflows\WorkflowInterface;
* id = "workflow",
* label = @Translation("Workflow"),
* label_collection = @Translation("Workflows"),
+ * label_singular = @Translation("workflow"),
+ * label_plural = @Translation("workflows"),
+ * label_count = @PluralTranslation(
+ * singular = "@count workflow",
+ * plural = "@count workflows",
+ * ),
* handlers = {
* "access" = "Drupal\workflows\WorkflowAccessControlHandler",
* "list_builder" = "Drupal\workflows\WorkflowListBuilder",