[TASK] Unify backend labels for file mounts

linawolf · lolli42 · commit af94dd289639 · 2025-02-09T21:58:20.000+01:00
This change standardizes backend labels related to file mounts, ensuring a more professional and internationally consistent terminology across affected modules. The term "filemount" is less common in english than in german, so it has been adjusted to "file mount" for better readability and alignment with english conventions. Additionally, all relevant comments in PHP code have been updated to maintain consistency in how the term is written. Resolves: #106123 Releases: main, 13.4 Change-Id: I771e50a58e3346a8629de1aacb6eaeed99317fd8 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/88098 Tested-by: core-ci <typo3@b13.com> Tested-by: Christian Kuhn <lolli@schwarzbu.ch> Reviewed-by: Stefan Bürk <stefan@buerk.tech> Tested-by: Garvin Hicking <gh@faktor-e.de> Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch> Tested-by: Stefan Bürk <stefan@buerk.tech>
diff --git a/typo3/sysext/backend/Classes/Tree/FileStorageTreeProvider.php b/typo3/sysext/backend/Classes/Tree/FileStorageTreeProvider.php
@@ -230,7 +230,7 @@ public function getSubfoldersRecursively(Folder $folderObject, int $currentDepth
     }
 
     /**
-     * Fetches all "root level folders" of a storage. If a user has filemounts in this storage, they are properly resolved.
+     * Fetches all "root level folders" of a storage. If a user has file mounts in this storage, they are properly resolved.
      *
      * @return array|array[]
      */
diff --git a/typo3/sysext/backend/Classes/View/FolderUtilityRenderer.php b/typo3/sysext/backend/Classes/View/FolderUtilityRenderer.php
@@ -47,7 +47,7 @@ public function __construct(LinkParameterProviderInterface $parameterProvider)
     }
 
     /**
-     * For TBE: Makes a form for creating new folders in the filemount the user is browsing.
+     * For TBE: Makes a form for creating new folders in the file mount the user is browsing.
      * The folder creation request is sent to the tce_file.php script in the core which will handle the creation.
      *
      * @param Folder $folderObject Absolute filepath on server in which to create the new folder.
@@ -91,7 +91,7 @@ public function createFolder(ServerRequestInterface $request, Folder $folderObje
     }
 
     /**
-     * Makes an upload form for uploading files to the filemount the user is browsing.
+     * Makes an upload form for uploading files to the file mount the user is browsing.
      * The files are uploaded to the tce_file.php script in the core which will handle the upload.
      *
      * @return string HTML for an upload form.
diff --git a/typo3/sysext/beuser/Classes/Domain/Model/FileMount.php b/typo3/sysext/beuser/Classes/Domain/Model/FileMount.php
@@ -41,12 +41,12 @@ class FileMount extends AbstractEntity
     protected string $description = '';
 
     /**
-     * Identifier of the filemount
+     * Identifier of the file mount
      */
     protected string $identifier = '';
 
     /**
-     * Status of the filemount
+     * Status of the file mount
      */
     protected bool $hidden = false;
 
@@ -124,7 +124,7 @@ public function setHidden(bool $hidden): void
     }
 
     /**
-     * returns the path segment of the filemount (without the storage id)
+     * returns the path segment of the file mount (without the storage id)
      */
     public function getPath(): string
     {
diff --git a/typo3/sysext/beuser/README.rst b/typo3/sysext/beuser/README.rst
@@ -10,7 +10,7 @@ compare the settings of backend users and verify their permissions. This module
 also displays any backend users who are currently logged in.
 
 Additionally it is possible to display a list / add / delete / modify
-filemounts in a separate submodule.
+file mounts in a separate submodule.
 
 :Repository:  https://github.com/typo3/typo3
 :Issues:      https://forge.typo3.org/
diff --git a/typo3/sysext/beuser/Resources/Private/Language/locallang.xlf b/typo3/sysext/beuser/Resources/Private/Language/locallang.xlf
@@ -356,33 +356,33 @@
 				<source>Compare backend user groups</source>
 			</trans-unit>
 
-			<!-- Filemounts -->
+			<!-- File mounts -->
 			<trans-unit id="filemounts">
-				<source>Filemounts</source>
+				<source>File mounts</source>
 			</trans-unit>
 			<trans-unit id="filemount.list.title">
-				<source>Filemounts</source>
+				<source>File Mounts</source>
 			</trans-unit>
 			<trans-unit id="filemount.confirm.deletion">
-				<source>Are you sure, that you want to delete the filemount "%s"?</source>
+				<source>Are you sure, that you want to delete the file mount "%s"?</source>
 			</trans-unit>
 			<trans-unit id="filemount.create">
-				<source>Create new filemount</source>
+				<source>Create new file mount</source>
 			</trans-unit>
 			<trans-unit id="filemount.infobox.noFilemountFound.title">
-				<source>No filemount found</source>
+				<source>No file mount found</source>
 			</trans-unit>
 			<trans-unit id="filemount.infobox.noFilemountFound.message">
-				<source>Please create a filemount and select its entry point.</source>
+				<source>Please create a file mount and select its entry point.</source>
 			</trans-unit>
 			<trans-unit id="filemount.link.openInFilelist">
 				<source>Open in file list</source>
 			</trans-unit>
 			<trans-unit id="filemount.amount.multiple">
-				<source>Filemounts</source>
+				<source>File mounts</source>
 			</trans-unit>
 			<trans-unit id="filemount.amount.singular">
-				<source>Filemount</source>
+				<source>File mount</source>
 			</trans-unit>
 
 			<!-- Password reset -->
diff --git a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
@@ -1175,7 +1175,7 @@ protected function initializeFileStorages()
                 $this->fileStorages[$storageObject->getUid()] = $storageObject;
             }
         } else {
-            // Regular users only have storages that are defined in their filemounts
+            // Regular users only have storages that are defined in their file mounts
             // Permissions and file mounts for the storage are added in StoragePermissionAspect
             foreach ($this->getFileMountRecords() as $row) {
                 if (!str_contains($row['identifier'] ?? '', ':')) {
@@ -1326,7 +1326,7 @@ public function getFileMountRecords()
             }
         }
 
-        // Personal or Group filemounts are not accessible if file mount list is set in workspace record
+        // Personal or Group file mounts are not accessible if file mount list is set in workspace record
         if ($this->workspace <= 0 || empty($this->workspaceRec['file_mountpoints'])) {
             // If userHomePath is set, we attempt to mount it
             if ($GLOBALS['TYPO3_CONF_VARS']['BE']['userHomePath'] ?? false) {
@@ -1385,9 +1385,9 @@ public function getFileMountRecords()
     }
 
     /**
-     * Returns an array with the filemounts for the user.
-     * Each filemount is represented with an array of a "name", "path" and "type".
-     * If no filemounts an empty array is returned.
+     * Returns an array with the file mounts for the user.
+     * Each file mount is represented with an array of a "name", "path" and "type".
+     * If no file mounts an empty array is returned.
      *
      * @return \TYPO3\CMS\Core\Resource\ResourceStorage[]
      */
diff --git a/typo3/sysext/core/Classes/Resource/Driver/DriverInterface.php b/typo3/sysext/core/Classes/Resource/Driver/DriverInterface.php
@@ -338,7 +338,7 @@ public function dumpFileContents(string $identifier): void;
      *
      * Hint: this also needs to return TRUE if the given identifier
      * matches the container identifier to allow access to the root
-     * folder of a filemount.
+     * folder of a file mount.
      *
      * @param non-empty-string $folderIdentifier
      * @param non-empty-string $identifier identifier to be checked against $folderIdentifier
diff --git a/typo3/sysext/core/Classes/Resource/Folder.php b/typo3/sysext/core/Classes/Resource/Folder.php
@@ -110,7 +110,7 @@ public function getName(): string
     public function getReadablePath($rootId = null)
     {
         if ($rootId === null) {
-            // Find first matching filemount and use that as root
+            // Find first matching file mount and use that as root
             foreach ($this->storage->getFileMounts() as $fileMount) {
                 if ($this->storage->isWithinFolder($fileMount['folder'], $this)) {
                     $rootId = $fileMount['folder']->getIdentifier();
diff --git a/typo3/sysext/core/Classes/Resource/ResourceStorage.php b/typo3/sysext/core/Classes/Resource/ResourceStorage.php
@@ -120,7 +120,7 @@
  * As all requests have to run through the storage, the storage knows about the
  * permissions of a BE/FE user, the file permissions / limitations of the driver
  * and has some configurable capabilities.
- * Additionally, a BE user can use "filemounts" (known from previous installations)
+ * Additionally, a BE user can use "file mounts" (known from previous installations)
  * to limit his/her work-zone to only a subset (identifier and its subfolders/subfolders)
  * of the user itself.
  *
@@ -154,7 +154,7 @@ class ResourceStorage implements ResourceStorageInterface
     protected bool $evaluatePermissions = false;
 
     /**
-     * User filemounts, added as an array, and used as filters
+     * User file mounts, added as an array, and used as filters
      */
     protected array $fileMounts = [];
 
@@ -536,7 +536,7 @@ public function markAsTemporaryOffline()
      * User Permissions / File Mounts
      ********************************/
     /**
-     * Adds a filemount as a "filter" for users to only work on a subset of a
+     * Adds a file mount as a "filter" for users to only work on a subset of a
      * storage object
      *
      * @param string $folderIdentifier
@@ -546,10 +546,10 @@ public function markAsTemporaryOffline()
      */
     public function addFileMount($folderIdentifier, $additionalData = [])
     {
-        // check for the folder before we add it as a filemount
+        // check for the folder before we add it as a file mount
         if ($this->driver->folderExists($folderIdentifier) === false) {
             // if there is an error, this is important and should be handled
-            // as otherwise the user would see the whole storage without any restrictions for the filemounts
+            // as otherwise the user would see the whole storage without any restrictions for the file mounts
             throw new FolderDoesNotExistException('Folder for file mount ' . $folderIdentifier . ' does not exist.', 1334427099);
         }
         $data = $this->driver->getFolderInfoByIdentifier($folderIdentifier);
@@ -2607,7 +2607,7 @@ public function isWithinFolder(Folder $folder, ResourceInterface $resource)
      * or the first mount point of this storage for this user
      * if $respectFileMounts is set.
      *
-     * @todo: this is a bad method design, because the calling code can never fetch all filemounts nor traverse them.
+     * @todo: this is a bad method design, because the calling code can never fetch all file mounts nor traverse them.
      */
     public function getRootLevelFolder(bool $respectFileMounts = true): Folder
     {
diff --git a/typo3/sysext/core/Classes/Type/Bitmask/BackendGroupMountOption.php b/typo3/sysext/core/Classes/Type/Bitmask/BackendGroupMountOption.php
@@ -21,7 +21,7 @@
 
 /**
  * A class providing constants for bitwise operations on whether backend users
- * should add / inherit the DB mounts / File Mounts from
+ * should add / inherit the DB mounts / file mounts from
  */
 final class BackendGroupMountOption extends BitSet
 {
diff --git a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
@@ -67,7 +67,7 @@
  * This class contains functions primarily used by tce_file.php (TYPO3 Core Engine for file manipulation)
  * Functions include copying, moving, deleting, uploading and so on...
  *
- * All fileoperations must be within the filemount paths of the user.
+ * All fileoperations must be within the file mount paths of the user.
  *
  * @internal Since TYPO3 v10, this class should not be used anymore outside of TYPO3 Core, and is considered internal,
  * as the FAL API should be used instead.
diff --git a/typo3/sysext/core/Documentation/Changelog/11.3/Feature-94374-CreateNewFilemountViaFoldersContextMenu.rst b/typo3/sysext/core/Documentation/Changelog/11.3/Feature-94374-CreateNewFilemountViaFoldersContextMenu.rst
@@ -2,9 +2,9 @@
 
 .. _feature-94374:
 
-====================================================================
-Feature: #94374 - Create new filemount via the folder's context menu
-====================================================================
+=====================================================================
+Feature: #94374 - Create new file mount via the folder's context menu
+=====================================================================
 
 See :issue:`94374`
 
@@ -29,7 +29,7 @@ correct storage and folder prefilled.
 Impact
 ======
 
-It is now possible to create new filemounts directly in the Filelist
+It is now possible to create new file mounts directly in the Filelist
 module, using the new "New Filemount" option in the folder's context
 menu. This option also prefills the new record with the correct storage
 and folder values.
diff --git a/typo3/sysext/core/Documentation/Changelog/12.1/Feature-99038-SubmoduleForFilemountsInBeUsermodule.rst b/typo3/sysext/core/Documentation/Changelog/12.1/Feature-99038-SubmoduleForFilemountsInBeUsermodule.rst
@@ -3,7 +3,7 @@
 .. _feature-99038-1668093242:
 
 =========================================
-Feature: #99038 - Overview for filemounts
+Feature: #99038 - Overview for file mounts
 =========================================
 
 See :issue:`99038`
@@ -12,14 +12,14 @@ Description
 ===========
 
 A new submodule was added to the :guilabel:`Backend Users` module. It provides an
-overview over all available filemounts with detailed data. Additionally an info
-window displays also the references to the filemount.
+overview over all available file mounts with detailed data. Additionally an info
+window displays also the references to the file mount.
 
 
 Impact
 ======
 
-It is now possible to get an overview about available filemounts
+It is now possible to get an overview about available file mounts
 without switching to the :guilabel:`List` module on pid=0.
 
 .. index:: Database, TCA, Backend
diff --git a/typo3/sysext/core/Documentation/Changelog/7.4/Feature-59570-AddDescriptionFieldForFilemounts.rst b/typo3/sysext/core/Documentation/Changelog/7.4/Feature-59570-AddDescriptionFieldForFilemounts.rst
@@ -3,9 +3,9 @@
 
 .. _feature-59570:
 
-======================================================
-Feature: #59570 - Add description-field for filemounts
-======================================================
+=======================================================
+Feature: #59570 - Add description-field for file mounts
+=======================================================
 
 See :issue:`59570`
 
@@ -14,7 +14,7 @@ Description
 
 A new field "description" has been added to the table sys_filemounts.
 With the new field it is possible to give a short description what a
-certain filemount should be used for or which documents it contains, etc.
+certain file mount should be used for or which documents it contains, etc.
 
 
 Impact
diff --git a/typo3/sysext/core/Documentation/Changelog/9.0/Important-82328-EXTform-UseOwnFolderForFormDefinitions.rst b/typo3/sysext/core/Documentation/Changelog/9.0/Important-82328-EXTform-UseOwnFolderForFormDefinitions.rst
@@ -11,7 +11,7 @@ See :issue:`82328`
 Description
 ===========
 
-Change default filemount for form definitions to :file:`fileadmin/form_definitions`,
+Change default file mount for form definitions to :file:`fileadmin/form_definitions`,
 the directory is automatically created if necessary.
 
 Existing forms in :file:`fileadmin/user_upload` can be listed, duplicated and removed
diff --git a/typo3/sysext/core/Resources/Private/Language/locallang_core.xlf b/typo3/sysext/core/Resources/Private/Language/locallang_core.xlf
@@ -1150,7 +1150,7 @@ Do you want to refresh it now?</source>
 				<source>New subpage</source>
 			</trans-unit>
 			<trans-unit id="cm.newFilemount">
-				<source>New Filemount</source>
+				<source>New file mount</source>
 			</trans-unit>
 			<trans-unit id="cm.pasteinto">
 				<source>Paste into</source>
diff --git a/typo3/sysext/core/Resources/Private/Language/locallang_tca.xlf b/typo3/sysext/core/Resources/Private/Language/locallang_tca.xlf
@@ -7,13 +7,13 @@
 				<source>File Mounts</source>
 			</trans-unit>
 			<trans-unit id="file_mountpoints_edit_title">
-				<source>Edit filemount</source>
+				<source>Edit file mount</source>
 			</trans-unit>
 			<trans-unit id="file_mountpoints_add_title">
-				<source>Create new filemount</source>
+				<source>Create new file mount</source>
 			</trans-unit>
 			<trans-unit id="file_mountpoints_list_title">
-				<source>List filemounts</source>
+				<source>List file mounts</source>
 			</trans-unit>
 			<trans-unit id="db_mountpoints">
 				<source>DB Mounts</source>
@@ -394,7 +394,7 @@
 				<source>Backend usergroup</source>
 			</trans-unit>
 			<trans-unit id="sys_filemounts">
-				<source>Filemount</source>
+				<source>File mount</source>
 			</trans-unit>
 			<trans-unit id="sys_file_storage">
 				<source>File Storage</source>
diff --git a/typo3/sysext/core/Tests/Functional/Resource/SynchronizeFolderRelationsTest.php b/typo3/sysext/core/Tests/Functional/Resource/SynchronizeFolderRelationsTest.php
@@ -65,7 +65,7 @@ public function synchronizeFilemountsAfterRenameTest(): void
 
         // Check flash message content
         $flashMessage = array_shift($flashMessages);
-        self::assertStringContainsString('6 Filemount records', $flashMessage->getMessage());
+        self::assertStringContainsString('6 File mount records', $flashMessage->getMessage());
     }
 
     #[Test]
diff --git a/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FileProvider.php b/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FileProvider.php
@@ -262,7 +262,7 @@ protected function canCreateNew(): bool
     }
 
     /**
-     * New filemounts can only be created for readable folders by admins
+     * New file mounts can only be created for readable folders by admins
      */
     protected function canCreateNewFilemount(): bool
     {
@@ -333,8 +333,8 @@ protected function isOnlineMedia(): bool
     }
 
     /**
-     * Checks if folder and record are in the same filemount
-     * Cannot copy folders between filemounts
+     * Checks if folder and record are in the same file mount
+     * Cannot copy folders between file mounts
      *
      * @param File|Folder|null $fileOrFolderInClipBoard
      */
diff --git a/typo3/sysext/form/Documentation/I/Concepts/FormFileStorages/Index.rst b/typo3/sysext/form/Documentation/I/Concepts/FormFileStorages/Index.rst
diff --git a/typo3/sysext/form/Documentation/I/Concepts/FormManager/Index.rst b/typo3/sysext/form/Documentation/I/Concepts/FormManager/Index.rst
diff --git a/typo3/sysext/form/Documentation/I/Config/persistenceManager/Index.rst b/typo3/sysext/form/Documentation/I/Config/persistenceManager/Index.rst
diff --git a/typo3/sysext/impexp/Classes/Import.php b/typo3/sysext/impexp/Classes/Import.php

Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ public function getSubfoldersRecursively(Folder $folderObject, int $currentDepth`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`/**`
`233`		`- * Fetches all "root level folders" of a storage. If a user has filemounts in this storage, they are properly resolved.`
	`233`	`+ * Fetches all "root level folders" of a storage. If a user has file mounts in this storage, they are properly resolved.`
`234`	`234`	`*`
`235`	`235`	`* @return array\|array[]`
`236`	`236`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function __construct(LinkParameterProviderInterface $parameterProvider)`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/**`
`50`		`- * For TBE: Makes a form for creating new folders in the filemount the user is browsing.`
	`50`	`+ * For TBE: Makes a form for creating new folders in the file mount the user is browsing.`
`51`	`51`	`* The folder creation request is sent to the tce_file.php script in the core which will handle the creation.`
`52`	`52`	`*`
`53`	`53`	`* @param Folder $folderObject Absolute filepath on server in which to create the new folder.`
`@@ -91,7 +91,7 @@ public function createFolder(ServerRequestInterface $request, Folder $folderObje`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`/**`
`94`		`- * Makes an upload form for uploading files to the filemount the user is browsing.`
	`94`	`+ * Makes an upload form for uploading files to the file mount the user is browsing.`
`95`	`95`	`* The files are uploaded to the tce_file.php script in the core which will handle the upload.`
`96`	`96`	`*`
`97`	`97`	`* @return string HTML for an upload form.`
Original file line number	Diff line number	Diff line change
`@@ -1175,7 +1175,7 @@ protected function initializeFileStorages()`
`1175`	`1175`	`$this->fileStorages[$storageObject->getUid()] = $storageObject;`
`1176`	`1176`	`}`
`1177`	`1177`	`} else {`
`1178`		`- // Regular users only have storages that are defined in their filemounts`
	`1178`	`+ // Regular users only have storages that are defined in their file mounts`
`1179`	`1179`	`// Permissions and file mounts for the storage are added in StoragePermissionAspect`
`1180`	`1180`	`foreach ($this->getFileMountRecords() as $row) {`
`1181`	`1181`	`if (!str_contains($row['identifier'] ?? '', ':')) {`
`@@ -1326,7 +1326,7 @@ public function getFileMountRecords()`
`1326`	`1326`	`}`
`1327`	`1327`	`}`
`1328`	`1328`
`1329`		`- // Personal or Group filemounts are not accessible if file mount list is set in workspace record`
	`1329`	`+ // Personal or Group file mounts are not accessible if file mount list is set in workspace record`
`1330`	`1330`	`if ($this->workspace <= 0 \|\| empty($this->workspaceRec['file_mountpoints'])) {`
`1331`	`1331`	`// If userHomePath is set, we attempt to mount it`
`1332`	`1332`	`if ($GLOBALS['TYPO3_CONF_VARS']['BE']['userHomePath'] ?? false) {`
`@@ -1385,9 +1385,9 @@ public function getFileMountRecords()`
`1385`	`1385`	`}`
`1386`	`1386`
`1387`	`1387`	`/**`
`1388`		`- * Returns an array with the filemounts for the user.`
`1389`		`- * Each filemount is represented with an array of a "name", "path" and "type".`
`1390`		`- * If no filemounts an empty array is returned.`
	`1388`	`+ * Returns an array with the file mounts for the user.`
	`1389`	`+ * Each file mount is represented with an array of a "name", "path" and "type".`
	`1390`	`+ * If no file mounts an empty array is returned.`
`1391`	`1391`	`*`
`1392`	`1392`	`* @return \TYPO3\CMS\Core\Resource\ResourceStorage[]`
`1393`	`1393`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ public function dumpFileContents(string $identifier): void;`
`338`	`338`	`*`
`339`	`339`	`* Hint: this also needs to return TRUE if the given identifier`
`340`	`340`	`* matches the container identifier to allow access to the root`
`341`		`- * folder of a filemount.`
	`341`	`+ * folder of a file mount.`
`342`	`342`	`*`
`343`	`343`	`* @param non-empty-string $folderIdentifier`
`344`	`344`	`* @param non-empty-string $identifier identifier to be checked against $folderIdentifier`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public function getName(): string`
`110`	`110`	`public function getReadablePath($rootId = null)`
`111`	`111`	`{`
`112`	`112`	`if ($rootId === null) {`
`113`		`- // Find first matching filemount and use that as root`
	`113`	`+ // Find first matching file mount and use that as root`
`114`	`114`	`foreach ($this->storage->getFileMounts() as $fileMount) {`
`115`	`115`	`if ($this->storage->isWithinFolder($fileMount['folder'], $this)) {`
`116`	`116`	`$rootId = $fileMount['folder']->getIdentifier();`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`/**`
`23`	`23`	`* A class providing constants for bitwise operations on whether backend users`
`24`		`- * should add / inherit the DB mounts / File Mounts from`
	`24`	`+ * should add / inherit the DB mounts / file mounts from`
`25`	`25`	`*/`
`26`	`26`	`final class BackendGroupMountOption extends BitSet`
`27`	`27`	`{`