Add plural labels to entity types

I don't think it makes sense to scope these issues on a per-module basis. Please see:
https://www.drupal.org/core/scope#incomplete
(Edit: more applicable fragment link)

Retitling to what I think the correct scope should be. Let's close the other issues as duplicated and add them to this patch.

Guess it applies to both content and config. Does someone want to do a quick count of how many there are that should have plural labels, and add that to the summary?

Here is the combined patch from the RTBC issues that still applied. Search and aggregator did not. (Actually they are in the patch, must have been my mistake.) Thanks to everyone who helped on the other issues -- I'll try to list all the contributors on here shortly.

Also, 8.1.x is in string freeze, so moving to 8.2.x.

NW for a list of which entity types need fixing and have been fixed per #6.

dpopdan, bojanz, rszrama, vasike, vdanielpop, rteijeiro, pguillard, jmikii, svjuly, Drupa1ish, jhodgdon, ciprian.stavovei, Wim Leers, Gabr1el all contributed to the other issues I closed as a duplicate so far. (Edit: updated). amateescu is also mentioned as a mentor and should also be credited.

BTW, if anyone is wondering "Why would we bother to combine all these when they are already done?" see for example:
#2702695-4: Add plural labels to Entity Types in editor module

If we split the change up into lots of tiny patches, then a reviewer cannot ensure it is applied consistently across core.

The purpose of the issues created separately was to introduce the new guys to the workflow, but you're right, having all the changes together makes it clearer for the reviewer. Thanks :)

Adding in the patch from the Editor issue, and quoting the full comment:

Just one remark:

+++ b/core/modules/editor/src/Entity/Editor.php
@@ -16,6 +16,12 @@
  *   label = @Translation("Text Editor"),
+ *   label_singular = @Translation("Text Editor"),
+ *   label_plural = @Translation("Text Editors"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count Text Editor",
+ *     plural = "@count Text Editors"

They're consistently capitalized, but I wonder if they should actually all be lowercase?

Deferring that decision to a committer.

I can actually see the case for either. Capitalization is translation-specific, but with this new API, we will allow each language to specify a (more) grammatical capitalization for that language. (It still runs into trouble if used in a sentence but that's a limitation of the original issue.) In English, I could see cases being made for both ways. We say (e.g.) "the Taxonomy Access Control module" so I think by that reasoning it would be capitalized, but I know core goes to lengths to try to lowercase things in other contexts, so let's get more feedback on that point.

(NR to trigger the test run.)

Thanks @vdanielpop! I can see the benefit in that too. (Also, adding your issue credit from the other issue -- thanks for commenting!)

Adding a note about making capitalization consistent to the summary. Some instances are lowercase and others are uppercase, so we need to make it consistent one way or the other in English.

+1 from me on merging into 1 patch. I'll review tomorrow.

We definitely want the newly introduced labels to be lowercase btw.

+1 !

+1!
Also aren't the labels automatically converted to lowercase later when retrieving their value?

No, they aren't.

Just pinging in from #2702775: Add plural labels to Entity Types in Taxonomy module; my labels are already in the patch. : )

We're missing the parts from #2702797: Add plural labels to Entity Types in User module and #2702709: Add plural labels to Entity Types in Field module.

I merged them, though they are not RTBC at the moment.
I hope I understand @bojanz request !

We want to always have a trailing comma. That's in line with our regular array coding standards.

As @jhodgdon commented here https://www.drupal.org/node/2703103#comment-11083865

merged in the patch for the Tour entity

Added plural labels for System, Views and Node module.

By mistake , uploaded interdiff as a patch file ,the extension should be txt, sorry for that .

(Updating issue credit.)

With regard to the trailing commas in annotations, it's our coding standard for normal PHP arrays. However, originally, the Doctrine annotations did not support the final trailing comma. This was eventually fixed, but there are still a lot of the original style in core for that reason. https://www.drupal.org/node/1354#annotations does not specify one way or the other, so I agree it makes sense to be consistent with the PHP array coding standards in absence of that.

Thanks everyone.

#2703067-5: Add plural labels to Entity Types in Shortcut module, thx @xjm

I am looking at it.

Duplicate of Add plural labels to entity types

This is marked as a duplicate of itself, did you mean #2702799: [meta] Add plural labels to core entity types ?

Sorry about this.

I wanted to update all issues with DCTransylvania tag. Last year @amateescu created an issue for each entity type as a novice task during the camp and most of them were marked duplicated of this one along the way.

Since next weekend we will be holding a new sprint during the camp, i wanted to have a clean list.

Thanks again for noticing,

Let's see if there is still work to be done on this.

So, i needed to re-roll the patch and update for Comment, CommentType and Editor.
The rest are as they were before.
@tim.plunkett do you think there is something else to do for this one ?
Thanks,

1. +++ b/core/modules/editor/src/Entity/Editor.php
   @@ -14,6 +14,12 @@
   + *     singular = "@count Text Editor",
   + *     plural = "@count Text Editors",
   

   this should be lowercase.

2. +++ b/core/modules/language/src/Entity/ContentLanguageSettings.php
   @@ -14,6 +14,12 @@
     *   label = @Translation("Content Language Settings"),
   + *   label_singular = @Translation("content language setting"),
   + *   label_plural = @Translation("content language settings"),
   + *   label_count = @PluralTranslation(
   + *     singular = "@count content language setting",
   + *     plural = "@count content language settings",
   + *   ),
   

   This is tough, because actually each entity is a set of settings already, so I think this needs more thought.

3. +++ b/core/modules/views/src/Entity/View.php
   @@ -16,6 +16,12 @@
     *   label = @Translation("View", context = "View entity type"),
   + *   label_singular = @Translation("view"),
   + *   label_plural = @Translation("views"),
   + *   label_count = @PluralTranslation(
   + *     singular = "@count view",
   + *     plural = "@count views",
   + *   ),
   

   We should add the context to all new labels, as well.

Also this is not covering the new label_collection yet. Not sure if we should do that here or in a followup.

Addressing #41

About #41.2 - for the plural of content language settings i went with 'content languages settings' - does that make sense?

The 'label_collection' issue brought up by @tstoeckler made me realize that we should probably fix/finalize the API for defining all these labels, so we don't end up with different solutions for 8.3.x vs. 8.4x, so I opened #2869039: Group all entity labels under a single 'labels' annotation key and I think we should do this one as a follow-up.

Postponing on #2813895: Combine entity type labels in an array - Though that is far from ready, there's not even a patch there yet...

Looks like #2813895: Combine entity type labels in an array isn't happening.
#2942588: EntityListBuilder::render() should use the entity type plural label in the empty text shows that using better APIs gives us worse UI text because this issue hasn't landed in a year.

So let's proceed. Once [##2813895: Combine entity type labels in an array happens, the labels can be updated, like with any other change.

Let's start with a re-roll then see where we stand...

(I think we can safely unassign @prics after 11 months)

Adjust tests to match new functionality.

Thanks @Jo Fitzgerald!

I searched for all entities extending ContentEntityBase, and we were missing File and MenuLinkContent, so added support for those as well. I believe now all are covered.

Also worked on the failing tests. Let's see if I broke others...

1. +++ b/core/modules/editor/src/Entity/Editor.php
   @@ -14,6 +14,12 @@
   + *   label_singular = @Translation("Text Editor"),
   + *   label_plural = @Translation("Text Editors"),
   
   +++ b/core/modules/file/src/Entity/File.php
   @@ -18,6 +18,11 @@
   + *   label_plural = @Translation("Files"),
   
   +++ b/core/modules/menu_link_content/src/Entity/MenuLinkContent.php
   @@ -19,6 +19,11 @@
   + *   label_plural = @Translation("Custom menu links"),
   

   These should all be lowercase.

2. +++ b/core/modules/file/src/Entity/File.php
   @@ -18,6 +18,11 @@
     *   label = @Translation("File"),
   
   +++ b/core/modules/menu_link_content/src/Entity/MenuLinkContent.php
   @@ -19,6 +19,11 @@
     *   label = @Translation("Custom menu link"),
   

   Missing the singular label.

Thanks @tstoeckler!

Addressing #56 and fixing a failing test.

There are entity types that are not yet covered in the patch - Workflow, RestResourceConfig, Block, FilterFormat, Vocabulary.

Good call @hchonov, thanks. Added labels to Workflow, RestResourceConfig, Block and FilterFormat. Vocabulary already has them.

Looks great to me, thanks!

The only remaining question is whether we want to handle collection labels (i.e. uppercase plural label) here as well. I don't feel strongly either way. On the one hand it shouldn't be that much work, on the other hand I don't want to hold this up any longer.

So I'm fine with this being RTBC directly, but also fine with needs work.

On the one hand it shouldn't be that much work, on the other hand I don't want to hold this up any longer.

If it isn't that much work, then we will not be holding up this that much longer, so let's do it here.

Happy to work on that, what exactly do you mean?

So we should add an entry similar to the following to all entity types:

 *   label_collection = @Translation("Workflows"),

Simple enough, here it is. Also reordered the changes to Editor so its consistent with the rest.

Perfect, thank you!

Looks good, +1 for RTBC.

Tested & looks good, thanks everyone! For my project I really need this in core.

A a little reroll, one change not applying anymore on 8.6.x
I guess I should not set it back to RTBC.

Thank you @pguillard, reroll looks good.
Setting back to RTBC assuming it comes back green :)

Adding commit credit according to #9 and comments on this issue.

Committed 1382290 and pushed to 8.6.x. Thanks!