From 839ddaa3547bb0042b6225edf2df7bff1831cdd5 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Wed, 21 Sep 2022 17:44:32 +0200 Subject: feat: rename users to account or person Replace translated text in most locations Signed-off-by: Vincent Petry --- apps/files_sharing/appinfo/info.xml | 2 +- apps/files_sharing/lib/Controller/ShareAPIController.php | 4 ++-- apps/files_sharing/src/components/PersonalSettings.vue | 2 +- apps/files_sharing/src/components/SharingEntryInternal.vue | 4 ++-- apps/files_sharing/src/views/SharingInherited.vue | 2 +- apps/files_sharing/tests/Controller/ShareAPIControllerTest.php | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'apps/files_sharing') diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml index 802b8a7ca92..4892dab0757 100644 --- a/apps/files_sharing/appinfo/info.xml +++ b/apps/files_sharing/appinfo/info.xml @@ -5,7 +5,7 @@ File sharing File sharing - This application enables users to share files within Nextcloud. If enabled, the admin can choose which groups can share files. The applicable users can then share files and folders with other users and groups within Nextcloud. In addition, if the admin enables the share link feature, an external link can be used to share files with other users outside of Nextcloud. Admins can also enforce passwords, expirations dates, and enable server to server sharing via share links, as well as sharing from mobile devices. + This application enables people to share files within Nextcloud. If enabled, the admin can choose which groups can share files. The applicable people can then share files and folders with other people and groups within Nextcloud. In addition, if the admin enables the share link feature, an external link can be used to share files with other people outside of Nextcloud. Admins can also enforce passwords, expirations dates, and enable server to server sharing via share links, as well as sharing from mobile devices. Turning the feature off removes shared files and folders on the server for all share recipients, and also on the sync clients and mobile apps. More information is available in the Nextcloud Documentation. diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php index aa239ae8bb6..5762aa47b3b 100644 --- a/apps/files_sharing/lib/Controller/ShareAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareAPIController.php @@ -687,7 +687,7 @@ class ShareAPIController extends OCSController { if ($shareType === IShare::TYPE_USER) { // Valid user is required to share if ($shareWith === null || !$this->userManager->userExists($shareWith)) { - throw new OCSNotFoundException($this->l->t('Please specify a valid user')); + throw new OCSNotFoundException($this->l->t('Please specify a valid account to share with')); } $share->setSharedWith($shareWith); $share->setPermissions($permissions); @@ -762,7 +762,7 @@ class ShareAPIController extends OCSController { } if ($shareWith === null) { - throw new OCSNotFoundException($this->l->t('Please specify a valid federated user ID')); + throw new OCSNotFoundException($this->l->t('Please specify a valid federated account ID')); } $share->setSharedWith($shareWith); diff --git a/apps/files_sharing/src/components/PersonalSettings.vue b/apps/files_sharing/src/components/PersonalSettings.vue index 7a14b015223..e3fe603c342 100644 --- a/apps/files_sharing/src/components/PersonalSettings.vue +++ b/apps/files_sharing/src/components/PersonalSettings.vue @@ -29,7 +29,7 @@ class="checkbox" type="checkbox" @change="toggleEnabled"> - +

diff --git a/apps/files_sharing/src/components/SharingEntryInternal.vue b/apps/files_sharing/src/components/SharingEntryInternal.vue index f6b900b8bf7..bc5bdd32e57 100644 --- a/apps/files_sharing/src/components/SharingEntryInternal.vue +++ b/apps/files_sharing/src/components/SharingEntryInternal.vue @@ -72,9 +72,9 @@ export default { internalLinkSubtitle() { if (this.fileInfo.type === 'dir') { - return t('files_sharing', 'Only works for users with access to this folder') + return t('files_sharing', 'Only works for people with access to this folder') } - return t('files_sharing', 'Only works for users with access to this file') + return t('files_sharing', 'Only works for people with access to this file') }, }, diff --git a/apps/files_sharing/src/views/SharingInherited.vue b/apps/files_sharing/src/views/SharingInherited.vue index b61f65ae47a..515ab8c1608 100644 --- a/apps/files_sharing/src/views/SharingInherited.vue +++ b/apps/files_sharing/src/views/SharingInherited.vue @@ -94,7 +94,7 @@ export default { }, subTitle() { return (this.showInheritedShares && this.shares.length === 0) - ? t('files_sharing', 'No other users with access found') + ? t('files_sharing', 'No other accounts with access found') : '' }, toggleTooltip() { diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php index 822212ae86f..eb77cd3142b 100644 --- a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php @@ -1679,7 +1679,7 @@ class ShareAPIControllerTest extends TestCase { public function testCreateShareUserNoShareWith() { $this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class); - $this->expectExceptionMessage('Please specify a valid user'); + $this->expectExceptionMessage('Please specify a valid person to share with'); $share = $this->newShare(); $this->shareManager->method('newShare')->willReturn($share); @@ -1707,7 +1707,7 @@ class ShareAPIControllerTest extends TestCase { public function testCreateShareUserNoValidShareWith() { $this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class); - $this->expectExceptionMessage('Please specify a valid user'); + $this->expectExceptionMessage('Please specify a valid person to share with'); $share = $this->newShare(); $this->shareManager->method('newShare')->willReturn($share); -- cgit v1.2.3 From 4a509dfe8ec3287b513cc7d68342adc859870ee5 Mon Sep 17 00:00:00 2001 From: John Molakvoæ Date: Tue, 13 Feb 2024 10:26:36 +0100 Subject: fix: phpunit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ --- apps/federatedfilesharing/tests/FederatedShareProviderTest.php | 2 +- apps/files_sharing/tests/Controller/ShareAPIControllerTest.php | 4 ++-- apps/sharebymail/lib/ShareByMailProvider.php | 4 ++-- core/Controller/ProfileApiController.php | 2 +- lib/private/Share20/Manager.php | 4 ++-- tests/Core/Controller/OCSControllerTest.php | 2 +- tests/lib/Share20/ManagerTest.php | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'apps/files_sharing') diff --git a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php index 0879217e293..6f0cb93c4a9 100644 --- a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php +++ b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php @@ -459,7 +459,7 @@ class FederatedShareProviderTest extends \Test\TestCase { try { $this->provider->create($share); } catch (\Exception $e) { - $this->assertEquals('Sharing myFile failed, because this item is already shared with account user@server.com', $e->getMessage()); + $this->assertEquals('Sharing myFile failed, because this item is already shared with the account user@server.com', $e->getMessage()); } } diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php index eb77cd3142b..caa121932f9 100644 --- a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php @@ -1679,7 +1679,7 @@ class ShareAPIControllerTest extends TestCase { public function testCreateShareUserNoShareWith() { $this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class); - $this->expectExceptionMessage('Please specify a valid person to share with'); + $this->expectExceptionMessage('Please specify a valid account to share with'); $share = $this->newShare(); $this->shareManager->method('newShare')->willReturn($share); @@ -1707,7 +1707,7 @@ class ShareAPIControllerTest extends TestCase { public function testCreateShareUserNoValidShareWith() { $this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class); - $this->expectExceptionMessage('Please specify a valid person to share with'); + $this->expectExceptionMessage('Please specify a valid account to share with'); $share = $this->newShare(); $this->shareManager->method('newShare')->willReturn($share); diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php index d255b5e9b1a..1c7b716e1e4 100644 --- a/apps/sharebymail/lib/ShareByMailProvider.php +++ b/apps/sharebymail/lib/ShareByMailProvider.php @@ -116,8 +116,8 @@ class ShareByMailProvider implements IShareProvider { */ $alreadyShared = $this->getSharedWith($shareWith, IShare::TYPE_EMAIL, $share->getNode(), 1, 0); if (!empty($alreadyShared)) { - $message = 'Sharing %1$s failed, because this item is already shared with account %2$s'; - $message_t = $this->l->t('Sharing %1$s failed, because this item is already shared with account %2$s', [$share->getNode()->getName(), $shareWith]); + $message = 'Sharing %1$s failed, because this item is already shared with the account %2$s'; + $message_t = $this->l->t('Sharing %1$s failed, because this item is already shared with the account %2$s', [$share->getNode()->getName(), $shareWith]); $this->logger->debug(sprintf($message, $share->getNode()->getName(), $shareWith), ['app' => 'Federated File Sharing']); throw new \Exception($message_t); } diff --git a/core/Controller/ProfileApiController.php b/core/Controller/ProfileApiController.php index 1ffba071f2b..7a11e5f93c1 100644 --- a/core/Controller/ProfileApiController.php +++ b/core/Controller/ProfileApiController.php @@ -64,7 +64,7 @@ class ProfileApiController extends OCSController { * @return DataResponse, array{}> * @throws OCSBadRequestException Updating visibility is not possible * @throws OCSForbiddenException Not allowed to edit other users visibility - * @throws OCSNotFoundException User not found + * @throws OCSNotFoundException Account not found * * 200: Visibility updated successfully */ diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index ca99a4299ce..40af8546818 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -578,7 +578,7 @@ class Manager implements IManager { // Identical share already exists if ($existingShare->getSharedWith() === $share->getSharedWith() && $existingShare->getShareType() === $share->getShareType()) { - $message = $this->l->t('Sharing %s failed, because this item is already shared with account %s', [$share->getNode()->getName(), $share->getSharedWithDisplayName()]); + $message = $this->l->t('Sharing %s failed, because this item is already shared with the account %s', [$share->getNode()->getName(), $share->getSharedWithDisplayName()]); throw new AlreadySharedException($message, $existingShare); } @@ -589,7 +589,7 @@ class Manager implements IManager { $user = $this->userManager->get($share->getSharedWith()); if ($group->inGroup($user) && $existingShare->getShareOwner() !== $share->getShareOwner()) { - $message = $this->l->t('Sharing %s failed, because this item is already shared with account %s', [$share->getNode()->getName(), $share->getSharedWithDisplayName()]); + $message = $this->l->t('Sharing %s failed, because this item is already shared with the account %s', [$share->getNode()->getName(), $share->getSharedWithDisplayName()]); throw new AlreadySharedException($message, $existingShare); } } diff --git a/tests/Core/Controller/OCSControllerTest.php b/tests/Core/Controller/OCSControllerTest.php index 61ed4a50d62..a10455e482a 100644 --- a/tests/Core/Controller/OCSControllerTest.php +++ b/tests/Core/Controller/OCSControllerTest.php @@ -196,7 +196,7 @@ class OCSControllerTest extends TestCase { ->with('NotExistingUser') ->willReturn(null); - $expected = new DataResponse(['User not found'], 404); + $expected = new DataResponse(['Account not found'], 404); $this->assertEquals($expected, $this->controller->getIdentityProof('NotExistingUser')); } diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php index 165b818517b..bf871b2bf8f 100644 --- a/tests/lib/Share20/ManagerTest.php +++ b/tests/lib/Share20/ManagerTest.php @@ -1618,7 +1618,7 @@ class ManagerTest extends \Test\TestCase { public function testUserCreateChecksIdenticalShareExists() { $this->expectException(AlreadySharedException::class); - $this->expectExceptionMessage('Sharing name.txt failed, because this item is already shared with account user'); + $this->expectExceptionMessage('Sharing name.txt failed, because this item is already shared with the account user'); $share = $this->manager->newShare(); $share->setSharedWithDisplayName('user'); @@ -1647,7 +1647,7 @@ class ManagerTest extends \Test\TestCase { public function testUserCreateChecksIdenticalPathSharedViaGroup() { $this->expectException(AlreadySharedException::class); - $this->expectExceptionMessage('Sharing name2.txt failed, because this item is already shared with account userName'); + $this->expectExceptionMessage('Sharing name2.txt failed, because this item is already shared with the account userName'); $share = $this->manager->newShare(); -- cgit v1.2.3 From 524ed97d621ded1aafa0f2f92670765af22ba55f Mon Sep 17 00:00:00 2001 From: John Molakvoæ Date: Tue, 13 Feb 2024 14:37:09 +0100 Subject: fix: replace `Account name` by `Login` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ --- apps/dav/lib/Controller/OutOfOfficeController.php | 2 +- apps/files/lib/Activity/Provider.php | 4 ++-- apps/files_external/lib/Command/Notify.php | 2 +- apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV2.php | 2 +- apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php | 2 +- apps/files_external/lib/Lib/Auth/OpenStack/Rackspace.php | 2 +- apps/files_external/lib/Lib/Auth/Password/Password.php | 4 ++-- apps/files_external/lib/Lib/Auth/Password/UserProvided.php | 2 +- apps/files_external/lib/Lib/Auth/PublicKey/RSA.php | 2 +- apps/files_external/lib/Lib/Auth/PublicKey/RSAPrivateKey.php | 2 +- apps/files_external/lib/Lib/Backend/SMB_OC.php | 2 +- apps/files_external/lib/Lib/Storage/Swift.php | 2 +- apps/files_external/templates/settings.php | 2 +- apps/files_sharing/appinfo/info.xml | 2 +- apps/settings/lib/Controller/ChangePasswordController.php | 2 +- apps/settings/lib/Mailer/NewUserMailHelper.php | 2 +- apps/settings/src/components/AuthTokenSetupDialog.vue | 2 +- apps/settings/templates/settings/admin/additional-mail.php | 2 +- apps/settings/tests/Mailer/NewUserMailHelperTest.php | 8 ++++---- core/Command/Maintenance/Install.php | 4 ++-- core/Command/User/Add.php | 2 +- core/Command/User/AuthTokens/Add.php | 2 +- core/Command/User/ResetPassword.php | 2 +- core/src/components/login/LoginForm.vue | 4 ++-- core/src/components/login/PasswordLessLoginForm.vue | 4 ++-- core/src/components/login/ResetPassword.vue | 4 ++-- core/templates/installation.php | 2 +- core/templates/loginflow/authpicker.php | 4 ++-- core/templates/loginflowv2/authpicker.php | 4 ++-- cypress/e2e/login/login.cy.ts | 4 ++-- dist/core-login.js | 4 ++-- dist/core-login.js.map | 2 +- dist/settings-vue-settings-personal-security.js | 4 ++-- dist/settings-vue-settings-personal-security.js.map | 2 +- lib/private/Setup.php | 2 +- 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/User/Manager.php | 12 ++++++------ 40 files changed, 62 insertions(+), 62 deletions(-) (limited to 'apps/files_sharing') diff --git a/apps/dav/lib/Controller/OutOfOfficeController.php b/apps/dav/lib/Controller/OutOfOfficeController.php index a2e7378f32d..5ab99c34b79 100644 --- a/apps/dav/lib/Controller/OutOfOfficeController.php +++ b/apps/dav/lib/Controller/OutOfOfficeController.php @@ -57,7 +57,7 @@ class OutOfOfficeController extends OCSController { } /** - * Get the currently configured out-of-office data of a user. + * Get the currently configured out-of-office data of a user * * @param string $userId The user id to get out-of-office data for. * @return DataResponse|DataResponse diff --git a/apps/files/lib/Activity/Provider.php b/apps/files/lib/Activity/Provider.php index aede4bda127..fb81e200688 100644 --- a/apps/files/lib/Activity/Provider.php +++ b/apps/files/lib/Activity/Provider.php @@ -163,7 +163,7 @@ class Provider implements IProvider { if (!isset($parsedParameters['user'])) { // External user via public link share - $subject = str_replace('{user}', $this->activityLang->t('"remote person"'), $subject); + $subject = str_replace('{user}', $this->activityLang->t('"remote account"'), $subject); } $this->setSubjects($event, $subject, $parsedParameters); @@ -281,7 +281,7 @@ class Provider implements IProvider { if (!isset($parsedParameters['user'])) { // External user via public link share - $subject = str_replace('{user}', $this->activityLang->t('"remote person"'), $subject); + $subject = str_replace('{user}', $this->activityLang->t('"remote account"'), $subject); } $this->setSubjects($event, $subject, $parsedParameters); diff --git a/apps/files_external/lib/Command/Notify.php b/apps/files_external/lib/Command/Notify.php index 1602ea6e354..2fdd2f3a2ee 100644 --- a/apps/files_external/lib/Command/Notify.php +++ b/apps/files_external/lib/Command/Notify.php @@ -158,7 +158,7 @@ class Notify extends Base { } catch (\Exception $e) { $output->writeln('Error while trying to create storage'); if ($noAuth) { - $output->writeln('Account name and/or password required'); + $output->writeln('Login and/or password required'); } return self::FAILURE; } diff --git a/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV2.php b/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV2.php index b16dcb5b651..a36a86afce4 100644 --- a/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV2.php +++ b/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV2.php @@ -38,7 +38,7 @@ class OpenStackV2 extends AuthMechanism { ->setScheme(self::SCHEME_OPENSTACK) ->setText($l->t('OpenStack v2')) ->addParameters([ - new DefinitionParameter('user', $l->t('Account name')), + new DefinitionParameter('user', $l->t('Login')), (new DefinitionParameter('password', $l->t('Password'))) ->setType(DefinitionParameter::VALUE_PASSWORD), new DefinitionParameter('tenant', $l->t('Tenant name')), diff --git a/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php b/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php index 62f9dda783b..090a54596bc 100644 --- a/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php +++ b/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php @@ -42,7 +42,7 @@ class OpenStackV3 extends AuthMechanism { ->setScheme(self::SCHEME_OPENSTACK) ->setText($l->t('OpenStack v3')) ->addParameters([ - new DefinitionParameter('user', $l->t('Account name')), + new DefinitionParameter('user', $l->t('Login')), new DefinitionParameter('domain', $l->t('Domain')), (new DefinitionParameter('password', $l->t('Password'))) ->setType(DefinitionParameter::VALUE_PASSWORD), diff --git a/apps/files_external/lib/Lib/Auth/OpenStack/Rackspace.php b/apps/files_external/lib/Lib/Auth/OpenStack/Rackspace.php index 4e0f46a2359..2ec0b8b035e 100644 --- a/apps/files_external/lib/Lib/Auth/OpenStack/Rackspace.php +++ b/apps/files_external/lib/Lib/Auth/OpenStack/Rackspace.php @@ -37,7 +37,7 @@ class Rackspace extends AuthMechanism { ->setScheme(self::SCHEME_OPENSTACK) ->setText($l->t('Rackspace')) ->addParameters([ - new DefinitionParameter('user', $l->t('Account name')), + new DefinitionParameter('user', $l->t('Login')), (new DefinitionParameter('key', $l->t('API key'))) ->setType(DefinitionParameter::VALUE_PASSWORD), ]) diff --git a/apps/files_external/lib/Lib/Auth/Password/Password.php b/apps/files_external/lib/Lib/Auth/Password/Password.php index 6f0322b8020..3435ebbb1de 100644 --- a/apps/files_external/lib/Lib/Auth/Password/Password.php +++ b/apps/files_external/lib/Lib/Auth/Password/Password.php @@ -35,9 +35,9 @@ class Password extends AuthMechanism { $this ->setIdentifier('password::password') ->setScheme(self::SCHEME_PASSWORD) - ->setText($l->t('Account name and password')) + ->setText($l->t('Login and password')) ->addParameters([ - new DefinitionParameter('user', $l->t('Account name')), + new DefinitionParameter('user', $l->t('Login')), (new DefinitionParameter('password', $l->t('Password'))) ->setType(DefinitionParameter::VALUE_PASSWORD), ]); diff --git a/apps/files_external/lib/Lib/Auth/Password/UserProvided.php b/apps/files_external/lib/Lib/Auth/Password/UserProvided.php index 933bbeb9d8b..87bf96aeae1 100644 --- a/apps/files_external/lib/Lib/Auth/Password/UserProvided.php +++ b/apps/files_external/lib/Lib/Auth/Password/UserProvided.php @@ -52,7 +52,7 @@ class UserProvided extends AuthMechanism implements IUserProvided { ->setScheme(self::SCHEME_PASSWORD) ->setText($l->t('Manually entered, store in database')) ->addParameters([ - (new DefinitionParameter('user', $l->t('Account name'))) + (new DefinitionParameter('user', $l->t('Login'))) ->setFlag(DefinitionParameter::FLAG_USER_PROVIDED), (new DefinitionParameter('password', $l->t('Password'))) ->setType(DefinitionParameter::VALUE_PASSWORD) diff --git a/apps/files_external/lib/Lib/Auth/PublicKey/RSA.php b/apps/files_external/lib/Lib/Auth/PublicKey/RSA.php index 9aef3995f7f..c9ed8d1b9e3 100644 --- a/apps/files_external/lib/Lib/Auth/PublicKey/RSA.php +++ b/apps/files_external/lib/Lib/Auth/PublicKey/RSA.php @@ -47,7 +47,7 @@ class RSA extends AuthMechanism { ->setScheme(self::SCHEME_PUBLICKEY) ->setText($l->t('RSA public key')) ->addParameters([ - new DefinitionParameter('user', $l->t('Account name')), + new DefinitionParameter('user', $l->t('Login')), new DefinitionParameter('public_key', $l->t('Public key')), (new DefinitionParameter('private_key', 'private_key')) ->setType(DefinitionParameter::VALUE_HIDDEN), diff --git a/apps/files_external/lib/Lib/Auth/PublicKey/RSAPrivateKey.php b/apps/files_external/lib/Lib/Auth/PublicKey/RSAPrivateKey.php index 7868594eb12..c648173a82b 100644 --- a/apps/files_external/lib/Lib/Auth/PublicKey/RSAPrivateKey.php +++ b/apps/files_external/lib/Lib/Auth/PublicKey/RSAPrivateKey.php @@ -46,7 +46,7 @@ class RSAPrivateKey extends AuthMechanism { ->setScheme(self::SCHEME_PUBLICKEY) ->setText($l->t('RSA private key')) ->addParameters([ - new DefinitionParameter('user', $l->t('Account name')), + new DefinitionParameter('user', $l->t('Login')), (new DefinitionParameter('password', $l->t('Password'))) ->setFlag(DefinitionParameter::FLAG_OPTIONAL) ->setType(DefinitionParameter::VALUE_PASSWORD), diff --git a/apps/files_external/lib/Lib/Backend/SMB_OC.php b/apps/files_external/lib/Lib/Backend/SMB_OC.php index c7bde7ce171..35743c5bc3b 100644 --- a/apps/files_external/lib/Lib/Backend/SMB_OC.php +++ b/apps/files_external/lib/Lib/Backend/SMB_OC.php @@ -46,7 +46,7 @@ class SMB_OC extends Backend { ->setText($l->t('SMB/CIFS using OC login')) ->addParameters([ new DefinitionParameter('host', $l->t('Host')), - (new DefinitionParameter('username_as_share', $l->t('Account name as share'))) + (new DefinitionParameter('username_as_share', $l->t('Login as share'))) ->setType(DefinitionParameter::VALUE_BOOLEAN), (new DefinitionParameter('share', $l->t('Share'))) ->setFlag(DefinitionParameter::FLAG_OPTIONAL), diff --git a/apps/files_external/lib/Lib/Storage/Swift.php b/apps/files_external/lib/Lib/Storage/Swift.php index f7283631699..7283e5ae7b1 100644 --- a/apps/files_external/lib/Lib/Storage/Swift.php +++ b/apps/files_external/lib/Lib/Storage/Swift.php @@ -167,7 +167,7 @@ class Swift extends \OC\Files\Storage\Common { or (empty($params['user']) && empty($params['userid'])) or empty($params['bucket']) or empty($params['region']) ) { - throw new StorageBadConfigException("API Key or password, Account name, Bucket and Region have to be configured."); + throw new StorageBadConfigException("API Key or password, Login, Bucket and Region have to be configured."); } $user = $params['user']; diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index d22ec50614c..c6525a8be83 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -228,7 +228,7 @@ uasort($sortedBackends, function ($a, $b) { + placeholder="t('Login')) ?>"/> File sharing

File sharing - This application enables people to share files within Nextcloud. If enabled, the admin can choose which groups can share files. The applicable people can then share files and folders with other people and groups within Nextcloud. In addition, if the admin enables the share link feature, an external link can be used to share files with other people outside of Nextcloud. Admins can also enforce passwords, expirations dates, and enable server to server sharing via share links, as well as sharing from mobile devices. + This application enables people to share files within Nextcloud. If enabled, the admin can choose which groups can share files. The applicable people can then share files and folders with other accounts and groups within Nextcloud. In addition, if the admin enables the share link feature, an external link can be used to share files with other people outside of Nextcloud. Admins can also enforce passwords, expirations dates, and enable server to server sharing via share links, as well as sharing from mobile devices. Turning the feature off removes shared files and folders on the server for all share recipients, and also on the sync clients and mobile apps. More information is available in the Nextcloud Documentation. diff --git a/apps/settings/lib/Controller/ChangePasswordController.php b/apps/settings/lib/Controller/ChangePasswordController.php index b878d343525..50d72e582dd 100644 --- a/apps/settings/lib/Controller/ChangePasswordController.php +++ b/apps/settings/lib/Controller/ChangePasswordController.php @@ -132,7 +132,7 @@ class ChangePasswordController extends Controller { return new JSONResponse([ 'status' => 'error', 'data' => [ - 'message' => $this->l->t('No account name supplied'), + 'message' => $this->l->t('No Login supplied'), ], ]); } diff --git a/apps/settings/lib/Mailer/NewUserMailHelper.php b/apps/settings/lib/Mailer/NewUserMailHelper.php index 598b69c0a9e..2d41577f554 100644 --- a/apps/settings/lib/Mailer/NewUserMailHelper.php +++ b/apps/settings/lib/Mailer/NewUserMailHelper.php @@ -134,7 +134,7 @@ class NewUserMailHelper { } $emailTemplate->addBodyText($l10n->t('Welcome to your %s account, you can add, protect, and share your data.', [$this->themingDefaults->getName()])); if ($user->getBackendClassName() !== 'LDAP') { - $emailTemplate->addBodyText($l10n->t('Your account name is: %s', [$userId])); + $emailTemplate->addBodyText($l10n->t('Your Login is: %s', [$userId])); } if ($generatePasswordResetToken) { $leftButtonText = $l10n->t('Set your password'); diff --git a/apps/settings/src/components/AuthTokenSetupDialog.vue b/apps/settings/src/components/AuthTokenSetupDialog.vue index 71fb53a014c..20e3b29d0f1 100644 --- a/apps/settings/src/components/AuthTokenSetupDialog.vue +++ b/apps/settings/src/components/AuthTokenSetupDialog.vue @@ -27,7 +27,7 @@ {{ t('settings', 'Use the credentials below to configure your app or device. For security reasons this password will only be shown once.') }}

- +