diff --git a/lib/AppInfo/Capabilities.php b/lib/AppInfo/Capabilities.php index 14c3e1d06..a5358d357 100644 --- a/lib/AppInfo/Capabilities.php +++ b/lib/AppInfo/Capabilities.php @@ -174,7 +174,7 @@ private function getCapabilitiesCircleConstants(): array { 'core' => [ Member::TYPE_USER => $this->l10n->t('Nextcloud User'), Member::TYPE_GROUP => $this->l10n->t('Nextcloud Group'), - Member::TYPE_MAIL => $this->l10n->t('Mail Address'), + Member::TYPE_MAIL => $this->l10n->t('Email Address'), Member::TYPE_CONTACT => $this->l10n->t('Contact'), Member::TYPE_CIRCLE => $this->l10n->t('Circle'), Member::TYPE_APP => $this->l10n->t('Nextcloud App') diff --git a/lib/Circles/FileSharingBroadcaster.php b/lib/Circles/FileSharingBroadcaster.php index bb184e45e..914b8e300 100644 --- a/lib/Circles/FileSharingBroadcaster.php +++ b/lib/Circles/FileSharingBroadcaster.php @@ -490,11 +490,11 @@ protected function sendPasswordByMail(IShare $share, $circleName, $email, $passw ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null; $plainBodyPart = $this->l10n->t( - "%1\$s shared »%2\$s« with you.\nYou should have already received a separate mail with a link to access it.\n", + "%1\$s shared »%2\$s« with you.\nYou should have already received a separate email with a link to access it.\n", [$initiatorDisplayName, $filename] ); $htmlBodyPart = $this->l10n->t( - '%1$s shared »%2$s« with you. You should have already received a separate mail with a link to access it.', + '%1$s shared »%2$s« with you. You should have already received a separate email with a link to access it.', [$initiatorDisplayName, $filename] ); @@ -638,11 +638,11 @@ protected function sendPasswordExistingShares(DeprecatedMember $author, string $ $this->logger->log(0, "Sending password mail about existing files to '" . $email . "'"); $plainBodyPart = $this->l10n->t( - "%1\$s shared multiple files with you.\nYou should have already received a separate mail with a link to access them.\n", + "%1\$s shared multiple files with you.\nYou should have already received a separate email with a link to access them.\n", [$authorName] ); $htmlBodyPart = $this->l10n->t( - '%1$s shared multiple files with you. You should have already received a separate mail with a link to access them.', + '%1$s shared multiple files with you. You should have already received a separate email with a link to access them.', [$authorName] ); diff --git a/lib/FederatedItems/SingleMemberAdd.php b/lib/FederatedItems/SingleMemberAdd.php index 700b40f49..98aefa833 100644 --- a/lib/FederatedItems/SingleMemberAdd.php +++ b/lib/FederatedItems/SingleMemberAdd.php @@ -546,7 +546,7 @@ private function confirmMemberTypeUser(IFederatedUser $member): void { // // if ($this->configService->isAccountOnly()) { // throw new EmailAccountInvalidFormatException( -// $this->l10n->t('You cannot add a mail address as member of your Circle') +// $this->l10n->t('You cannot add a email address as member of your Circle') // ); // } // @@ -766,11 +766,11 @@ protected function sendPasswordExistingShares(string $author, string $email, str $this->miscService->log("Sending password mail about existing files to '" . $email . "'", 0); $plainBodyPart = $this->l10n->t( - "%1\$s shared multiple files with you.\nYou should have already received a separate mail with a link to access them.\n", + "%1\$s shared multiple files with you.\nYou should have already received a separate email with a link to access them.\n", [$authorName] ); $htmlBodyPart = $this->l10n->t( - '%1$s shared multiple files with you. You should have already received a separate mail with a link to access them.', + '%1$s shared multiple files with you. You should have already received a separate email with a link to access them.', [$authorName] ); diff --git a/lib/GlobalScale/FileShare.php b/lib/GlobalScale/FileShare.php index e1ed72aab..28adc720e 100644 --- a/lib/GlobalScale/FileShare.php +++ b/lib/GlobalScale/FileShare.php @@ -332,11 +332,11 @@ protected function sendPasswordByMail(IShare $share, $circleName, $email, $passw ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null; $plainBodyPart = $this->l10n->t( - "%1\$s shared »%2\$s« with you.\nYou should have already received a separate mail with a link to access it.\n", + "%1\$s shared »%2\$s« with you.\nYou should have already received a separate email with a link to access it.\n", [$initiatorDisplayName, $filename] ); $htmlBodyPart = $this->l10n->t( - '%1$s shared »%2$s« with you. You should have already received a separate mail with a link to access it.', + '%1$s shared »%2$s« with you. You should have already received a separate email with a link to access it.', [$initiatorDisplayName, $filename] ); diff --git a/lib/GlobalScale/MemberAdd.php b/lib/GlobalScale/MemberAdd.php index 8f2f70182..792ca7d28 100644 --- a/lib/GlobalScale/MemberAdd.php +++ b/lib/GlobalScale/MemberAdd.php @@ -395,11 +395,11 @@ protected function sendPasswordExistingShares(string $author, string $email, str $this->miscService->log("Sending password mail about existing files to '" . $email . "'", 0); $plainBodyPart = $this->l10n->t( - "%1\$s shared multiple files with you.\nYou should have already received a separate mail with a link to access them.\n", + "%1\$s shared multiple files with you.\nYou should have already received a separate email with a link to access them.\n", [$authorName] ); $htmlBodyPart = $this->l10n->t( - '%1$s shared multiple files with you. You should have already received a separate mail with a link to access them.', + '%1$s shared multiple files with you. You should have already received a separate email with a link to access them.', [$authorName] ); diff --git a/lib/Model/Circle.php b/lib/Model/Circle.php index 32489f1a8..09ed5a247 100644 --- a/lib/Model/Circle.php +++ b/lib/Model/Circle.php @@ -144,7 +144,7 @@ class Circle extends ManagedModel implements IMemberships, IDeserializable, INC2 public static $DEF_SOURCE = [ 1 => 'Nextcloud User', 2 => 'Nextcloud Group', - 4 => 'Mail Address', + 4 => 'Email Address', 8 => 'Contact', 16 => 'Circle', 10001 => 'Circles App'