Skip to content

l10n: Spelling unification #607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArtificialOwl merged 7 commits into from
Jun 3, 2021
Merged

l10n: Spelling unification #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4fce7f5
l10n: Spelling unification
Valdnet Jun 2, 2021
e8c5ac8
l10n: Spelling unification
Valdnet Jun 2, 2021
0667581
l10n: Spelling unification
Valdnet Jun 2, 2021
41c9080
l10n: Spelling unification
Valdnet Jun 2, 2021
fe2df95
l10n: Spelling unification
Valdnet Jun 2, 2021
19d66e6
l10n: Spelling unification
Valdnet Jun 2, 2021
28f1ecb
l10n: Spelling unification
Valdnet Jun 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/AppInfo/Capabilities.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
8 changes: 4 additions & 4 deletions lib/Circles/FileSharingBroadcaster.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
);

Expand Down Expand Up @@ -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]
);

Expand Down
6 changes: 3 additions & 3 deletions lib/FederatedItems/SingleMemberAdd.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
// );
// }
//
Expand Down Expand Up @@ -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]
);

Expand Down
4 changes: 2 additions & 2 deletions lib/GlobalScale/FileShare.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
);

Expand Down
4 changes: 2 additions & 2 deletions lib/GlobalScale/MemberAdd.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
);

Expand Down
2 changes: 1 addition & 1 deletion lib/Model/Circle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down