From b073b13d9f86c29ba876761b01317ac779b8d2c0 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <developer@georgehrke.com>
Date: Thu, 16 Nov 2017 10:09:25 +0100
Subject: [PATCH] refine invitation email
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
---
apps/dav/lib/CalDAV/Schedule/IMipPlugin.php | 10 ++++++----
1 file 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 . ')';
--
GitLab