Merge pull request #2448 from nextcloud/backport/2447/stable4

[stable4] Fix translation problem in notifications

Author: Chartman123

lib/Activity/Provider.php

@@ -102,7 +102,7 @@ public function getSubjectString(IL10N $l10n, string $subject): string {
 				return $l10n->t('{user} has shared the form {formTitle} with team {circle}');
 
 			case ActivityConstants::SUBJECT_NEWSUBMISSION:
-				return $l10n->t('{user} answered your form {formTitle}');
+				return $l10n->t('Your form {formTitle} was answered by {user}');
 
 			default:
 				$this->logger->warning('Some unknown activity has been found: ' . $subject);

tests/Unit/Activity/ProviderTest.php

@@ -178,10 +178,10 @@ public function testFullParse() {
 			]);
 		$event->expects($this->once())
 			->method('setParsedSubject')
-			->with('The affected User answered your form SomeChangedNiceFormTitle');
+			->with('Your form SomeChangedNiceFormTitle was answered by The affected User');
 		$event->expects($this->once())
 			->method('setRichSubject')
-			->with('{user} answered your form {formTitle}', [
+			->with('Your form {formTitle} was answered by {user}', [
 				'user' => [
 					'type' => 'user',
 					'id' => 'affectedUser',
@@ -211,7 +211,7 @@ public function dataGetSubjectString() {
 			['newshare', '{user} has shared the form {formTitle} with you'],
 			['newgroupshare', '{user} has shared the form {formTitle} with group {group}'],
 			['newcircleshare', '{user} has shared the form {formTitle} with team {circle}'],
-			['newsubmission', '{user} answered your form {formTitle}']
+			['newsubmission', 'Your form {formTitle} was answered by {user}']
 		];
 	}
 	/**