Merge pull request #7193 from nextcloud/bugfix/noid/invitation-email-refinements
refine invitation email
This commit is contained in:
commit
20868e17e8
|
@ -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
|
// always show full date with timezone if timezones are different
|
||||||
if ($startTimezone !== $endTimezone) {
|
if ($startTimezone !== $endTimezone) {
|
||||||
$localeEnd = $l10n->l('datetime', $dtendDt, ['width' => 'medium']);
|
$localeEnd = $l10n->l('datetime', $dtendDt, ['width' => 'medium|short']);
|
||||||
|
|
||||||
return $localeStart . ' (' . $startTimezone . ') - ' .
|
return $localeStart . ' (' . $startTimezone . ') - ' .
|
||||||
$localeEnd . ' (' . $endTimezone . ')';
|
$localeEnd . ' (' . $endTimezone . ')';
|
||||||
|
@ -390,9 +391,10 @@ class IMipPlugin extends SabreIMipPlugin {
|
||||||
|
|
||||||
// show only end time if date is the same
|
// show only end time if date is the same
|
||||||
if ($this->isDayEqual($dtstartDt, $dtendDt)) {
|
if ($this->isDayEqual($dtstartDt, $dtendDt)) {
|
||||||
$localeEnd = $l10n->l('time', $dtendDt, ['width' => 'medium']);
|
$localeEnd = $l10n->l('time', $dtendDt, ['width' => 'short']);
|
||||||
} else {
|
} 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 . ')';
|
return $localeStart . ' - ' . $localeEnd . ' (' . $startTimezone . ')';
|
||||||
|
|
Loading…
Reference in New Issue