diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-11-16 21:11:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-16 21:11:44 +0100 |
| commit | 20868e17e84e84d445082d4ab0aa29d2d9c90379 (patch) | |
| tree | 507a4cb74dcf8f4045796750ccafa18d2be720a0 /apps | |
| parent | f32fbbca2e90559458460be40df6850903b1168e (diff) | |
| parent | b073b13d9f86c29ba876761b01317ac779b8d2c0 (diff) | |
| download | nextcloud-server-20868e17e84e84d445082d4ab0aa29d2d9c90379.tar.gz nextcloud-server-20868e17e84e84d445082d4ab0aa29d2d9c90379.zip | |
Merge pull request #7193 from nextcloud/bugfix/noid/invitation-email-refinements
refine invitation email
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dav/lib/CalDAV/Schedule/IMipPlugin.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php index 5e103bfc5c0..781baa2032d 100644 --- a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php +++ b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php @@ -378,11 +378,12 @@ class IMipPlugin extends SabreIMipPlugin { } } - $localeStart = $l10n->l('datetime', $dtstartDt, ['width' => 'medium']); + $localeStart = $l10n->l('weekdayName', $dtstartDt, ['width' => 'abbreviated']) . ', ' . + $l10n->l('datetime', $dtstartDt, ['width' => 'medium|short']); // always show full date with timezone if timezones are different if ($startTimezone !== $endTimezone) { - $localeEnd = $l10n->l('datetime', $dtendDt, ['width' => 'medium']); + $localeEnd = $l10n->l('datetime', $dtendDt, ['width' => 'medium|short']); return $localeStart . ' (' . $startTimezone . ') - ' . $localeEnd . ' (' . $endTimezone . ')'; @@ -390,9 +391,10 @@ class IMipPlugin extends SabreIMipPlugin { // show only end time if date is the same if ($this->isDayEqual($dtstartDt, $dtendDt)) { - $localeEnd = $l10n->l('time', $dtendDt, ['width' => 'medium']); + $localeEnd = $l10n->l('time', $dtendDt, ['width' => 'short']); } else { - $localeEnd = $l10n->l('datetime', $dtendDt, ['width' => 'medium']); + $localeEnd = $l10n->l('weekdayName', $dtendDt, ['width' => 'abbreviated']) . ', ' . + $l10n->l('datetime', $dtendDt, ['width' => 'medium|short']); } return $localeStart . ' - ' . $localeEnd . ' (' . $startTimezone . ')'; |