Merge pull request #23080 from owncloud/use-non-localized-birthday-title

Use a birthday title which does not require translation because we ha…

2 files changed, 3 insertions, 3 deletions

diff --git a/apps/dav/lib/caldav/birthdayservice.php b/apps/dav/lib/caldav/birthdayservice.php
index 3b0a2a10e1c..1cd52db8f48 100644
--- a/apps/dav/lib/caldav/birthdayservice.php
+++ b/apps/dav/lib/caldav/birthdayservice.php
@@ -123,7 +123,7 @@ class BirthdayService {
 		}
 		$title = str_replace('{name}',
 			strtr((string)$doc->FN, array('\,' => ',', '\;' => ';')),
-			'{name}\'s Birthday'
+			'{name}'
 		);
 		try {
 			$date = new \DateTime($birthday);
@@ -146,7 +146,7 @@ class BirthdayService {
 		$vEvent->DTEND['VALUE'] = 'DATE';
 		$vEvent->{'UID'} = $doc->UID;
 		$vEvent->{'RRULE'} = 'FREQ=YEARLY';
-		$vEvent->{'SUMMARY'} = $title . ' (' . $date->format('Y') . ')';
+		$vEvent->{'SUMMARY'} = $title . ' (*' . $date->format('Y') . ')';
 		$vEvent->{'TRANSP'} = 'TRANSPARENT';
 		$vCal->add($vEvent);
 		return $vCal;
diff --git a/apps/dav/tests/unit/carddav/birthdayservicetest.php b/apps/dav/tests/unit/carddav/birthdayservicetest.php
index faf42d9e1b8..2efb3c09aea 100644
--- a/apps/dav/tests/unit/carddav/birthdayservicetest.php
+++ b/apps/dav/tests/unit/carddav/birthdayservicetest.php
@@ -59,7 +59,7 @@ class BirthdayServiceTest extends TestCase {
 			$this->assertInstanceOf('Sabre\VObject\Component\VCalendar', $cal);
 			$this->assertTrue(isset($cal->VEVENT));
 			$this->assertEquals('FREQ=YEARLY', $cal->VEVENT->RRULE->getValue());
-			$this->assertEquals('12345\'s Birthday (1900)', $cal->VEVENT->SUMMARY->getValue());
+			$this->assertEquals('12345 (*1900)', $cal->VEVENT->SUMMARY->getValue());
 			$this->assertEquals('TRANSPARENT', $cal->VEVENT->TRANSP->getValue());
 		}
 	}