kalipso/racalmas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

format recurrence date

Browse Source
This commit is contained in:
Milan
2020-07-07 22:56:33 +02:00
parent c27bbdc27e
commit 000b6ace49
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/calcms/events.pm
View File

@@ -413,11 +413,21 @@ sub add_recurrence_dates {
}
# set start dates to results
my $language = $config->{date}->{language} || 'en';
for my $result (@$results) {
next unless defined $result->{recurrence};
next if $result->{recurrence} == 0;
$result->{recurrence_date} =
$recurrence_dates->{ $result->{recurrence} };
my $rdate = $recurrence_dates->{ $result->{recurrence} };
if ($rdate){
$result->{recurrence_date} = $rdate;
$result->{recurrence_date_name} = time::date_format( $config, $rdate, $language );
( $result->{recurrence_time_name} ) = $rdate =~ m/(\d\d\:\d\d)\:\d\d/ ;
my $ymd = time::date_to_array($rdate);
my $weekdayIndex = time::weekday( $ymd->[0], $ymd->[1], $ymd->[2] );
$result->{recurrence_weekday_name} = time::getWeekdayNames($language)->[$weekdayIndex];
$result->{recurrence_weekday_short_name} = time::getWeekdayNamesShort($language)->[$weekdayIndex];
}
}
}
@@ -517,12 +527,11 @@ sub calc_dates {
if ( defined $result->{weekday} ) {
my $language = $config->{date}->{language} || 'en';
my $weekdayIndex = time::getWeekdayIndex( $result->{weekday} ) || 0;
$result->{weekday_name} = time::getWeekdayNames($language)->[$weekdayIndex];
$result->{weekday_short_name} = time::getWeekdayNamesShort($language)->[$weekdayIndex];
}
return $result;
}

4
website/agenda/templates/event_details.html
View File

@@ -60,7 +60,9 @@
</TMPL_IF>
<TMPL_VAR topic escape=none><TMPL_VAR content escape=none>
<TMPL_IF recurrence_date><a href="<TMPL_VAR recurrence>.html">Wiederholung vom <TMPL_VAR recurrence_date></a></TMPL_IF>
<TMPL_IF recurrence_date><a href="<TMPL_VAR recurrence>.html">
Wiederholung vom <TMPL_VAR recurrence_weekday_name>, <TMPL_VAR recurrence_date_name>, <TMPL_VAR recurrence_time_name> Uhr</a>
</TMPL_IF>
</div>
</div>