From a00b92f1e6df3e4bb83529ed780e9f9b907cff1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6?= Date: Tue, 13 Feb 2024 14:37:09 +0100 Subject: [PATCH] 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 +- .../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/UserProvided.php | 2 +- apps/files_external/lib/Lib/Auth/PublicKey/RSA.php | 2 +- .../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 +- .../lib/Controller/ChangePasswordController.php | 2 +- apps/settings/lib/Mailer/NewUserMailHelper.php | 2 +- .../settings/src/components/AuthTokenSetupDialog.vue | 2 +- .../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(-) diff --git a/apps/dav/lib/Controller/OutOfOfficeController.php b/apps/dav/lib/Controller/OutOfOfficeController.php index a2e7378f32de1..5ab99c34b7942 100644 --- a/apps/dav/lib/Controller/OutOfOfficeController.php +++ b/apps/dav/lib/Controller/OutOfOfficeController.php @@ -57,7 +57,7 @@ public function __construct( } /** - * 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 aede4bda12748..fb81e200688fa 100644 --- a/apps/files/lib/Activity/Provider.php +++ b/apps/files/lib/Activity/Provider.php @@ -163,7 +163,7 @@ public function parseShortVersion(IEvent $event, IEvent $previousEvent = null) { 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 @@ public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) { 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 1602ea6e3540f..2fdd2f3a2ee00 100644 --- a/apps/files_external/lib/Command/Notify.php +++ b/apps/files_external/lib/Command/Notify.php @@ -158,7 +158,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int } 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 b16dcb5b65114..a36a86afce46d 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 @@ public function __construct(IL10N $l) { ->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 62f9dda783b24..090a54596bc7e 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 @@ public function __construct(IL10N $l) { ->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 4e0f46a2359a7..2ec0b8b035e08 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 @@ public function __construct(IL10N $l) { ->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 6f0322b802080..3435ebbb1deb8 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 @@ public function __construct(IL10N $l) { $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 933bbeb9d8bb5..87bf96aeae16d 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 @@ public function __construct(IL10N $l, ICredentialsManager $credentialsManager) { ->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 9aef3995f7fc2..c9ed8d1b9e38d 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 @@ public function __construct(IL10N $l, IConfig $config) { ->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 7868594eb1296..c648173a82b7c 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 @@ public function __construct(IL10N $l, IConfig $config) { ->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 c7bde7ce171f2..35743c5bc3bf0 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 @@ public function __construct(IL10N $l, SessionCredentials $legacyAuth, SMB $smbBa ->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 f72836316992e..7283e5ae7b12a 100644 --- a/apps/files_external/lib/Lib/Storage/Swift.php +++ b/apps/files_external/lib/Lib/Storage/Swift.php @@ -167,7 +167,7 @@ public function __construct($params) { 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 d22ec50614cd1..c6525a8be8376 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -228,7 +228,7 @@ class="" - placeholder="t('Account name')) ?>"/> + 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 b878d34352569..50d72e582dd1d 100644 --- a/apps/settings/lib/Controller/ChangePasswordController.php +++ b/apps/settings/lib/Controller/ChangePasswordController.php @@ -132,7 +132,7 @@ public function changeUserPassword(string $username = null, string $password = n 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 598b69c0a9ec8..2d41577f5545b 100644 --- a/apps/settings/lib/Mailer/NewUserMailHelper.php +++ b/apps/settings/lib/Mailer/NewUserMailHelper.php @@ -134,7 +134,7 @@ public function generateTemplate(IUser $user, $generatePasswordResetToken = fals } $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 71fb53a014ccd..20e3b29d0f139 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.') }}

- +