From 839ddaa3547bb0042b6225edf2df7bff1831cdd5 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Wed, 21 Sep 2022 17:44:32 +0200 Subject: [PATCH 1/5] feat: rename users to account or person Replace translated text in most locations Signed-off-by: Vincent Petry --- apps/comments/lib/Notification/Notifier.php | 2 +- .../tests/Unit/Notification/NotifierTest.php | 4 +-- apps/contactsinteraction/appinfo/info.xml | 4 +-- apps/dashboard/appinfo/info.xml | 2 +- apps/dav/src/views/Availability.vue | 2 +- apps/encryption/templates/settings-admin.php | 2 +- .../lib/FederatedShareProvider.php | 6 ++--- .../src/components/AdminSettings.vue | 14 +++++----- .../tests/FederatedShareProviderTest.php | 4 +-- apps/federation/appinfo/info.xml | 4 +-- apps/federation/templates/settings-admin.php | 2 +- apps/files/js/mainfileinfodetailview.js | 4 +-- apps/files/lib/Activity/Provider.php | 4 +-- apps/files_external/appinfo/info.xml | 4 +-- apps/files_external/js/settings.js | 2 +- apps/files_external/lib/Command/Notify.php | 2 +- .../UserGlobalStoragesController.php | 2 +- .../lib/Lib/Auth/OpenStack/OpenStackV2.php | 2 +- .../lib/Lib/Auth/OpenStack/OpenStackV3.php | 2 +- .../lib/Lib/Auth/OpenStack/Rackspace.php | 2 +- .../lib/Lib/Auth/Password/Password.php | 4 +-- .../lib/Lib/Auth/Password/UserGlobalAuth.php | 2 +- .../lib/Lib/Auth/Password/UserProvided.php | 4 +-- .../lib/Lib/Auth/PublicKey/RSA.php | 2 +- .../lib/Lib/Auth/PublicKey/RSAPrivateKey.php | 2 +- apps/files_external/lib/Lib/Backend/SMB.php | 2 +- .../files_external/lib/Lib/Backend/SMB_OC.php | 2 +- apps/files_external/lib/Lib/Storage/Swift.php | 2 +- apps/files_external/templates/settings.php | 8 +++--- apps/files_sharing/appinfo/info.xml | 2 +- .../lib/Controller/ShareAPIController.php | 4 +-- .../src/components/PersonalSettings.vue | 2 +- .../src/components/SharingEntryInternal.vue | 4 +-- .../src/views/SharingInherited.vue | 2 +- .../Controller/ShareAPIControllerTest.php | 4 +-- apps/files_trashbin/appinfo/info.xml | 6 ++--- apps/files_versions/appinfo/info.xml | 4 +-- .../lib/Command/ExpireVersions.php | 4 +-- apps/lookup_server_connector/appinfo/info.xml | 4 +-- apps/provisioning_api/appinfo/info.xml | 6 ++--- .../lib/Controller/AppConfigController.php | 2 +- .../lib/Controller/VerificationController.php | 4 +-- .../Exceptions/NotSubAdminException.php | 2 +- .../Controller/ChangePasswordController.php | 6 ++--- .../lib/Controller/MailSettingsController.php | 2 +- .../lib/Controller/UsersController.php | 4 +-- .../settings/lib/Mailer/NewUserMailHelper.php | 2 +- .../lib/Middleware/SubadminMiddleware.php | 2 +- .../lib/SetupChecks/CheckUserCertificates.php | 6 ++--- .../src/components/AdminTwoFactor.vue | 4 +-- apps/settings/src/components/AppDetails.vue | 2 +- .../src/components/AuthTokenSetupDialog.vue | 2 +- .../BasicSettings/BackgroundJob.vue | 6 ++--- .../BasicSettings/ProfileSettings.vue | 2 +- .../settings/src/components/GroupListItem.vue | 2 +- apps/settings/src/components/UserList.vue | 12 ++++----- .../settings/src/components/Users/UserRow.vue | 26 +++++++++---------- .../src/components/Users/UserRowActions.vue | 2 +- .../src/constants/AccountPropertyConstants.js | 4 +-- .../src/constants/ProfileConstants.js | 2 +- apps/settings/src/views/Users.vue | 14 +++++----- apps/settings/templates/help.php | 4 +-- .../settings/admin/additional-mail.php | 2 +- .../Controller/MailSettingsControllerTest.php | 2 +- .../tests/Mailer/NewUserMailHelperTest.php | 8 +++--- apps/sharebymail/lib/ShareByMailProvider.php | 4 +-- .../src/components/AdminSettings.vue | 2 +- apps/systemtags/appinfo/info.xml | 4 +-- .../src/components/UpdateNotification.vue | 4 +-- .../lib/SetupChecks/LdapInvalidUuids.php | 2 +- apps/weather_status/appinfo/info.xml | 2 +- .../src/components/Checks/request.js | 2 +- core/Command/Maintenance/Install.php | 6 ++--- core/Command/User/Add.php | 16 ++++++------ core/Command/User/AuthTokens/Add.php | 8 +++--- core/Command/User/LastSeen.php | 2 +- core/Command/User/Report.php | 2 +- core/Command/User/ResetPassword.php | 2 +- core/Command/User/Setting.php | 2 +- core/Controller/LostController.php | 2 +- core/Controller/OCSController.php | 2 +- core/Controller/ProfileApiController.php | 6 ++--- core/Notification/CoreNotifier.php | 4 +-- core/doc/user/index.html | 2 +- core/src/components/login/LoginForm.vue | 4 +-- .../login/PasswordLessLoginForm.vue | 4 +-- core/strings.php | 2 +- core/templates/installation.php | 4 +-- core/templates/loginflow/authpicker.php | 4 +-- core/templates/loginflowv2/authpicker.php | 4 +-- core/templates/update.use-cli.php | 2 +- .../Security/SecurityMiddleware.php | 6 ++--- .../UserDeletedFilesCleanupListener.php | 2 +- lib/private/Avatar/AvatarManager.php | 2 +- lib/private/Files/Node/Root.php | 2 +- lib/private/Server.php | 2 +- lib/private/Setup.php | 16 ++++++------ lib/private/Setup/AbstractDatabase.php | 4 +-- lib/private/Setup/MySQL.php | 2 +- lib/private/Setup/OCI.php | 6 ++--- lib/private/Setup/PostgreSQL.php | 2 +- lib/private/Share20/Manager.php | 4 +-- lib/private/Support/Subscription/Registry.php | 2 +- lib/private/User/Manager.php | 14 +++++----- lib/private/User/Session.php | 2 +- lib/private/legacy/OC_User.php | 2 +- lib/private/legacy/OC_Util.php | 4 +-- tests/lib/Share20/ManagerTest.php | 4 +-- tests/lib/User/ManagerTest.php | 2 +- 109 files changed, 220 insertions(+), 220 deletions(-) diff --git a/apps/comments/lib/Notification/Notifier.php b/apps/comments/lib/Notification/Notifier.php index 94a46bbce785e..9501c8b954c14 100644 --- a/apps/comments/lib/Notification/Notifier.php +++ b/apps/comments/lib/Notification/Notifier.php @@ -123,7 +123,7 @@ public function prepare(INotification $notification, string $languageCode): INot ]; if ($isDeletedActor) { - $subject = $l->t('You were mentioned on "{file}", in a comment by a user that has since been deleted'); + $subject = $l->t('You were mentioned on "{file}", in a comment by an account that has since been deleted'); } else { $subject = $l->t('{user} mentioned you in a comment on "{file}"'); $subjectParameters['user'] = [ diff --git a/apps/comments/tests/Unit/Notification/NotifierTest.php b/apps/comments/tests/Unit/Notification/NotifierTest.php index 9281bb99fe873..e94f0686f18e2 100644 --- a/apps/comments/tests/Unit/Notification/NotifierTest.php +++ b/apps/comments/tests/Unit/Notification/NotifierTest.php @@ -211,7 +211,7 @@ public function testPrepareSuccess() { public function testPrepareSuccessDeletedUser() { $fileName = 'Gre\'thor.odp'; - $message = 'You were mentioned on "Gre\'thor.odp", in a comment by a user that has since been deleted'; + $message = 'You were mentioned on "Gre\'thor.odp", in a comment by an account that has since been deleted'; /** @var Node|MockObject $node */ $node = $this->createMock(Node::class); @@ -255,7 +255,7 @@ public function testPrepareSuccessDeletedUser() { $this->notification ->expects($this->once()) ->method('setRichSubject') - ->with('You were mentioned on "{file}", in a comment by a user that has since been deleted', $this->anything()) + ->with('You were mentioned on "{file}", in a comment by an account that has since been deleted', $this->anything()) ->willReturnSelf(); $this->notification ->expects($this->once()) diff --git a/apps/contactsinteraction/appinfo/info.xml b/apps/contactsinteraction/appinfo/info.xml index 0760d9b3626f0..4edaf402e08e2 100644 --- a/apps/contactsinteraction/appinfo/info.xml +++ b/apps/contactsinteraction/appinfo/info.xml @@ -3,8 +3,8 @@ xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd"> contactsinteraction Contacts Interaction - Manages interaction between users and contacts - Collect data about user and contacts interactions and provide an address book for the data + Manages interaction between accounts and contacts + Collect data about accounts and contacts interactions and provide an address book for the data 1.10.0 agpl Christoph Wurst diff --git a/apps/dashboard/appinfo/info.xml b/apps/dashboard/appinfo/info.xml index b5b739014ad34..b4f2000123c77 100644 --- a/apps/dashboard/appinfo/info.xml +++ b/apps/dashboard/appinfo/info.xml @@ -6,7 +6,7 @@ Dashboard app +The Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! People can add the widgets they like and change the background to their liking.]]> 7.9.0 agpl diff --git a/apps/dav/src/views/Availability.vue b/apps/dav/src/views/Availability.vue index 627788391426e..b39e5671da1f0 100644 --- a/apps/dav/src/views/Availability.vue +++ b/apps/dav/src/views/Availability.vue @@ -1,7 +1,7 @@