Pull merge.

[yaffs-website] / web / core / modules / file / src / Entity / File.php

diff --git a/web/core/modules/file/src/Entity/File.php b/web/core/modules/file/src/Entity/File.php
index a9ade9e7d6ee33cbfcc156756c426b797f9e1bc3..33f6d744cc2b36e980a6ea4588aad9d74c403aaa 100644 (file)
--- a/web/core/modules/file/src/Entity/File.php
+++ b/web/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",
@@ -243,7 +250,7 @@ class File extends ContentEntityBase implements FileInterface {
       ->setLabel(t('Filename'))
       ->setDescription(t('Name of the file with no path components.'));
 
-    $fields['uri'] = BaseFieldDefinition::create('uri')
+    $fields['uri'] = BaseFieldDefinition::create('file_uri')
       ->setLabel(t('URI'))
       ->setDescription(t('The URI to access the file (either local or remote).'))
       ->setSetting('max_length', 255)