diff --git a/typo3/sysext/beuser/Resources/Private/Language/locallang.xlf b/typo3/sysext/beuser/Resources/Private/Language/locallang.xlf index a0ce73df0d0325416cb133eb7a869c49761a7ec4..e0198851035316f6885466dd1c532ddf791913d0 100644 --- a/typo3/sysext/beuser/Resources/Private/Language/locallang.xlf +++ b/typo3/sysext/beuser/Resources/Private/Language/locallang.xlf @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2"> - <file source-language="en" datatype="plaintext" original="EXT:beuser/Resources/Private/Language/locallang.xlf" date="2012-07-16T10:11:32Z" product-name="beuser"> + <file source-language="en" datatype="plaintext" original="EXT:beuser/Resources/Private/Language/locallang.xlf" date="2023-02-15T18:03:32Z" product-name="beuser"> <header/> <body> <trans-unit id="activeSessions" resname="activeSessions"> @@ -36,6 +36,9 @@ <trans-unit id="users" resname="users"> <source>Users</source> </trans-unit> + <trans-unit id="user" resname="user"> + <source>User</source> + </trans-unit> <trans-unit id="yes" resname="yes"> <source>Yes</source> </trans-unit> @@ -213,6 +216,9 @@ <trans-unit id="groups" resname="groups"> <source>Groups</source> </trans-unit> + <trans-unit id="group" resname="group"> + <source>Group</source> + </trans-unit> <trans-unit id="information.groups.direct" resname="information.groups.direct"> <source>Directly assigned</source> </trans-unit> @@ -339,10 +345,10 @@ <source>Storage</source> </trans-unit> <trans-unit id="filemount.amount.multiple" resname="filemount.amount.multiple"> - <source>%s filemounts</source> + <source>%s Filemounts</source> </trans-unit> <trans-unit id="filemount.amount.singular" resname="filemount.amount.singular"> - <source>1 filemount</source> + <source>1 Filemount</source> </trans-unit> </body> </file> diff --git a/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/PaginatedList.html b/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/PaginatedList.html index f8299330d5d2b41fe1032933dc3ac361c5c8acd2..02a848bc2721595ec7afe2d0e3c18398cf7faa9d 100644 --- a/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/PaginatedList.html +++ b/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/PaginatedList.html @@ -143,7 +143,10 @@ <tfoot> <tr> <td colspan="5"> - {totalAmountOfBackendUsers} <f:translate key="users" /> + <f:if condition="{totalAmountOfBackendUsers} > 1"> + <f:then>{totalAmountOfBackendUsers} <f:translate key="users" /></f:then> + <f:else>{totalAmountOfBackendUsers} <f:translate key="user" /></f:else> + </f:if> </td> </tr> </tfoot> @@ -151,5 +154,3 @@ </div> <f:render partial="SimplePagination" arguments="{paginator:paginator, pagination:pagination}" /> - -</html> diff --git a/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/PaginatedList.html b/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/PaginatedList.html index 5488eac6290ec34529836d3b0726eb5eaa060882..d537a6355f574d1c5d9e13f61be2077b306b5f99 100644 --- a/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/PaginatedList.html +++ b/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/PaginatedList.html @@ -110,7 +110,10 @@ <tfoot> <tr> <td colspan="4"> - {totalAmountOfBackendUserGroups} <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:be_groups" /> + <f:if condition="{totalAmountOfBackendUserGroups} > 1"> + <f:then>{totalAmountOfBackendUserGroups} <f:translate key="groups" /></f:then> + <f:else>{totalAmountOfBackendUserGroups} <f:translate key="group" /></f:else> + </f:if> </td> </tr> </tfoot> diff --git a/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Online.html b/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Online.html index a20902a270b09f192e042a09bfff57a491381af1..96c8637cfe4eeca7d43e110da228ce9ed0ad764b 100644 --- a/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Online.html +++ b/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Online.html @@ -78,6 +78,17 @@ </f:for> </f:for> </tbody> + <tfoot> + <tr> + <td colspan="5"> + <f:variable name="onlineUsersAndSessionsCount">{onlineUsersAndSessions -> f:count()}</f:variable> + <f:if condition="{onlineUsersAndSessionsCount} > 1"> + <f:then>{onlineUsersAndSessionsCount} <f:translate key="users" /></f:then> + <f:else>{onlineUsersAndSessionsCount} <f:translate key="user" /></f:else> + </f:if> + </td> + </tr> + </tfoot> </table> </div> diff --git a/typo3/sysext/core/Tests/Acceptance/Application/BackendUser/ListUserCest.php b/typo3/sysext/core/Tests/Acceptance/Application/BackendUser/ListUserCest.php index f31dc0fa783850821f6d0cd7ee6dc2654e30fe14..910bf40fd0cc138b31ddc9626d66dd21898b3cd4 100644 --- a/typo3/sysext/core/Tests/Acceptance/Application/BackendUser/ListUserCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/BackendUser/ListUserCest.php @@ -190,7 +190,7 @@ final class ListUserCest $I->canSeeNumberOfElements('#typo3-backend-user-list tbody tr', $countOfUsers); $I->wantToTest('If a number of users is shown in the footer row'); $I->canSeeNumberOfElements('#typo3-backend-user-list tfoot tr', 1); - $I->see($countOfUsers . ' Users', '#typo3-backend-user-list tfoot tr'); + $I->see($countOfUsers . ' User', '#typo3-backend-user-list tfoot tr'); } private function openAndCloseTheEditForm(ApplicationTester $I, string $username): void