Merge pull request #7178 from nextcloud/comradekingu-patch-1

No "to equal to" "We" or "Our", properly

2 files changed, 5 insertions, 5 deletions

diff --git a/apps/comments/lib/Notification/Notifier.php b/apps/comments/lib/Notification/Notifier.php
index 55802c9a08d..ead68840a4f 100644
--- a/apps/comments/lib/Notification/Notifier.php
+++ b/apps/comments/lib/Notification/Notifier.php
@@ -99,17 +99,17 @@ class Notifier implements INotifier {
 				$userFolder = $this->rootFolder->getUserFolder($notification->getUser());
 				$nodes = $userFolder->getById((int)$parameters[1]);
 				if(empty($nodes)) {
-					throw new \InvalidArgumentException('Cannot resolve file id to Node instance');
+					throw new \InvalidArgumentException('Cannot resolve file ID to node instance');
 				}
 				$node = $nodes[0];
 
 				if ($isDeletedActor) {
 					$notification->setParsedSubject($l->t(
-							'A (now) deleted user mentioned you in a comment on “%s”',
+							'You were mentioned on “%s”, in a comment by a user that has since been deleted',
 							[$node->getName()]
 						))
 						->setRichSubject(
-							$l->t('A (now) deleted user mentioned you in a comment on “{file}”'),
+							$l->t('You were mentioned on “{file}”, in a comment by a user that has since been deleted'),
 							[
 								'file' => [
 									'type' => 'file',
diff --git a/apps/comments/tests/Unit/Notification/NotifierTest.php b/apps/comments/tests/Unit/Notification/NotifierTest.php
index a7ada41d43a..07dcbfdd849 100644
--- a/apps/comments/tests/Unit/Notification/NotifierTest.php
+++ b/apps/comments/tests/Unit/Notification/NotifierTest.php
@@ -188,7 +188,7 @@ class NotifierTest extends TestCase {
 
 	public function testPrepareSuccessDeletedUser() {
 		$fileName = 'Gre\'thor.odp';
-		$message = 'A (now) deleted user mentioned you in a comment on “Gre\'thor.odp”';
+		$message = 'You were mentioned on “Gre\'thor.odp”, in a comment by a user that has since been deleted';
 
 		/** @var Node|\PHPUnit_Framework_MockObject_MockObject $node */
 		$node = $this->createMock(Node::class);
@@ -230,7 +230,7 @@ class NotifierTest extends TestCase {
 		$this->notification
 			->expects($this->once())
 			->method('setRichSubject')
-			->with('A (now) deleted user mentioned you in a comment on “{file}”', $this->anything())
+			->with('You were mentioned on “{file}”, in a comment by a user that has since been deleted', $this->anything())
 			->willReturnSelf();
 		$this->notification
 			->expects($this->once())