Skip to content
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

Jump to bottom

l10n: Spelling unification #27283

Merged
merged 3 commits into from
Jun 22, 2021
Merged

l10n: Spelling unification #27283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
898e87a
l10n: Spelling unification
Valdnet May 29, 2021
64ad2eb
l10n: Spelling unification
Valdnet May 29, 2021
52e0c65
l10n: Spelling unification
Valdnet May 29, 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
34 changes: 17 additions & 17 deletions apps/dav/lib/CardDAV/Activity/Provider/Addressbook.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,39 +85,39 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null): I
}

if ($event->getSubject() === self::SUBJECT_ADD) {
$subject = $l->t('{actor} created addressbook {addressbook}');
$subject = $l->t('{actor} created address book {addressbook}');
} elseif ($event->getSubject() === self::SUBJECT_ADD . '_self') {
$subject = $l->t('You created addressbook {addressbook}');
$subject = $l->t('You created address book {addressbook}');
} elseif ($event->getSubject() === self::SUBJECT_DELETE) {
$subject = $l->t('{actor} deleted addressbook {addressbook}');
$subject = $l->t('{actor} deleted address book {addressbook}');
} elseif ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
$subject = $l->t('You deleted addressbook {addressbook}');
$subject = $l->t('You deleted address book {addressbook}');
} elseif ($event->getSubject() === self::SUBJECT_UPDATE) {
$subject = $l->t('{actor} updated addressbook {addressbook}');
$subject = $l->t('{actor} updated address book {addressbook}');
} elseif ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
$subject = $l->t('You updated addressbook {addressbook}');
$subject = $l->t('You updated address book {addressbook}');
} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER) {
$subject = $l->t('{actor} shared addressbook {addressbook} with you');
$subject = $l->t('{actor} shared address book {addressbook} with you');
} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') {
$subject = $l->t('You shared addressbook {addressbook} with {user}');
$subject = $l->t('You shared address book {addressbook} with {user}');
} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') {
$subject = $l->t('{actor} shared addressbook {addressbook} with {user}');
$subject = $l->t('{actor} shared address book {addressbook} with {user}');
} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER) {
$subject = $l->t('{actor} unshared addressbook {addressbook} from you');
$subject = $l->t('{actor} unshared address book {addressbook} from you');
} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') {
$subject = $l->t('You unshared addressbook {addressbook} from {user}');
$subject = $l->t('You unshared address book {addressbook} from {user}');
} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') {
$subject = $l->t('{actor} unshared addressbook {addressbook} from {user}');
$subject = $l->t('{actor} unshared address book {addressbook} from {user}');
} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') {
$subject = $l->t('{actor} unshared addressbook {addressbook} from themselves');
$subject = $l->t('{actor} unshared address book {addressbook} from themselves');
} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') {
$subject = $l->t('You shared addressbook {addressbook} with group {group}');
$subject = $l->t('You shared address book {addressbook} with group {group}');
} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') {
$subject = $l->t('{actor} shared addressbook {addressbook} with group {group}');
$subject = $l->t('{actor} shared address book {addressbook} with group {group}');
} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') {
$subject = $l->t('You unshared addressbook {addressbook} from group {group}');
$subject = $l->t('You unshared address book {addressbook} from group {group}');
} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
$subject = $l->t('{actor} unshared addressbook {addressbook} from group {group}');
$subject = $l->t('{actor} unshared address book {addressbook} from group {group}');
} else {
throw new \InvalidArgumentException();
}
Expand Down
12 changes: 6 additions & 6 deletions apps/dav/lib/CardDAV/Activity/Provider/Card.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,17 +87,17 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null): I
}

if ($event->getSubject() === self::SUBJECT_ADD) {
$subject = $l->t('{actor} created contact {card} in addressbook {addressbook}');
$subject = $l->t('{actor} created contact {card} in address book {addressbook}');
} elseif ($event->getSubject() === self::SUBJECT_ADD . '_self') {
$subject = $l->t('You created contact {card} in addressbook {addressbook}');
$subject = $l->t('You created contact {card} in address book {addressbook}');
} elseif ($event->getSubject() === self::SUBJECT_DELETE) {
$subject = $l->t('{actor} deleted contact {card} from addressbook {addressbook}');
$subject = $l->t('{actor} deleted contact {card} from address book {addressbook}');
} elseif ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
$subject = $l->t('You deleted contact {card} from addressbook {addressbook}');
$subject = $l->t('You deleted contact {card} from address book {addressbook}');
} elseif ($event->getSubject() === self::SUBJECT_UPDATE) {
$subject = $l->t('{actor} updated contact {card} in addressbook {addressbook}');
$subject = $l->t('{actor} updated contact {card} in address book {addressbook}');
} elseif ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
$subject = $l->t('You updated contact {card} in addressbook {addressbook}');
$subject = $l->t('You updated contact {card} in address book {addressbook}');
} else {
throw new \InvalidArgumentException();
}
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/lib/CardDAV/Activity/Setting.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function getIdentifier(): string {
* @return string A translated string
*/
public function getName(): string {
return $this->l->t('A <strong>contact</strong> or <strong>addressbook</strong> was modified');
return $this->l->t('A <strong>contact</strong> or <strong>address book</strong> was modified');
}

/**
Expand Down