forward porting Event dateSpan display fix and Event.t test
This commit is contained in:
parent
92c3652406
commit
0a1974ba4c
3 changed files with 80 additions and 12 deletions
|
|
@ -1239,19 +1239,28 @@ sub getTemplateVars {
|
|||
? 1 : 0
|
||||
;
|
||||
|
||||
# Make a Friendly date span
|
||||
# Make a Friendly date span.
|
||||
$var{dateSpan}
|
||||
= $var{startDateDayName}.", "
|
||||
. $var{startDateMonthName}." "
|
||||
. $var{startDateDayOfMonth}." "
|
||||
. ( !$var{isAllDay} ? $var{startDateHour}.":".$var{startDateMinute}." ".$var{startDateM} : "" )
|
||||
. ( !$var{isOneDay} ?
|
||||
' • '
|
||||
. $var{endDateDayName}.", "
|
||||
.$var{endDateMonthName}." "
|
||||
.$var{endDateDayOfMonth}." "
|
||||
. ( !$var{isAllDay} ? $var{endDateHour}.":".$var{endDateMinute}." ".$var{endDateM} : "")
|
||||
: "");
|
||||
. $var{startDateDayOfMonth};
|
||||
if (! $var{isAllDay}) {
|
||||
$var{dateSpan} .= ' '.$var{startDateHour}.":".$var{startDateMinute}." ".$var{startDateM};
|
||||
}
|
||||
if (! $var{isOneDay}) {
|
||||
$var{dateSpan}
|
||||
.= ' • '
|
||||
. $var{endDateDayName}.", "
|
||||
. $var{endDateMonthName}." "
|
||||
. $var{endDateDayOfMonth}." "
|
||||
}
|
||||
elsif (! $var{isAllDay}) {
|
||||
$var{dateSpan}
|
||||
.= ' ‐ '
|
||||
}
|
||||
if (! $var{isAllDay}) {
|
||||
$var{dateSpan} .= ' '.$var{endDateHour}.":".$var{endDateMinute}." ".$var{endDateM};
|
||||
}
|
||||
|
||||
# Make some friendly URLs
|
||||
my $urlStartParam = $dtStart->cloneToUserTimeZone->truncate(to => "day");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue