Commit 13822906 authored by alexpott's avatar alexpott

Issue #2702683 by Manuel Garcia, xjm, prics, pguillard, Jo Fitzgerald, vg3095,...

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
parent e4b7dc0e
......@@ -14,6 +14,13 @@
* @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",
......
......@@ -16,6 +16,13 @@
* @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",
......
......@@ -17,6 +17,13 @@
* @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",
......
......@@ -15,6 +15,13 @@
* @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",
......
......@@ -11,6 +11,13 @@
* @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" = {
......
......@@ -12,6 +12,13 @@
* @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",
......
......@@ -13,6 +13,13 @@
* @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",
......
......@@ -92,7 +92,7 @@ public function testNewWorkflow() {
$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());
}
......
......@@ -11,6 +11,13 @@
* @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",
* },
......
......@@ -15,6 +15,13 @@
* @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"
......
......@@ -18,6 +18,13 @@
* @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"
......
......@@ -18,6 +18,13 @@
* @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",
......
......@@ -16,6 +16,13 @@
* @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",
......
......@@ -25,6 +25,13 @@
* @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",
......
......@@ -16,6 +16,13 @@
* @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",
......
......@@ -14,6 +14,13 @@
* @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 = {
......
......@@ -19,6 +19,13 @@
* @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",
......
......@@ -244,7 +244,7 @@ public function testUserSource() {
];
$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 @@ public function testFileSource() {
];
$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 @@ public function testTermSource() {
];
$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);
......
......@@ -121,7 +121,7 @@ public function testMigrateUpgradeExecute() {
$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');
......
......@@ -209,11 +209,11 @@ protected function assertReviewPage(WebAssert $session, array $all_available, ar
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');
......
......@@ -12,6 +12,13 @@
* @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" = {
......
......@@ -12,6 +12,13 @@
* @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" = {
......
......@@ -13,6 +13,13 @@
* @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",
......
......@@ -16,6 +16,13 @@
* @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",
......
......@@ -18,6 +18,13 @@
* @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",
......
......@@ -12,6 +12,13 @@
* @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",
......
......@@ -15,6 +15,13 @@
* @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",
......
......@@ -11,6 +11,13 @@
* @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"
* },
......
......@@ -78,15 +78,15 @@ public function testUninstall() {
$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.
......
......@@ -15,6 +15,13 @@
* @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",
......
......@@ -12,6 +12,13 @@
* @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",
......
......@@ -12,6 +12,13 @@
* @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",
......
......@@ -22,6 +22,13 @@
* @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",
......
......@@ -19,6 +19,14 @@
* @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",
......
......@@ -16,6 +16,12 @@
* 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",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment