Bug 16768: (followup) Add Swiss format for datatables (format_price.inc)

[koha.git] / tools / holidays.pl

diff --git a/tools/holidays.pl b/tools/holidays.pl
index f1739bd..74fa036 100755 (executable)
--- a/tools/holidays.pl
+++ b/tools/holidays.pl
@@ -43,7 +43,7 @@ my ($template, $loggedinuser, $cookie)
 
 # calendardate - date passed in url for human readability (syspref)
 # if the url has an invalid date default to 'now.'
-my $calendarinput_dt = eval { dt_from_string( $input->param('calendardate') ); } || dt_from_string;
+my $calendarinput_dt = eval { dt_from_string( scalar $input->param('calendardate') ); } || dt_from_string;
 my $calendardate = output_pref( { dt => $calendarinput_dt, dateonly => 1 } );
 
 # keydate - date passed to calendar.js.  calendar.js does not process dashes within a date.
@@ -99,7 +99,10 @@ foreach my $monthDay (keys %$day_month_holidays) {
     if (C4::Context->preference("dateformat") eq "metric") {
       $day_monthdate_sort = "$day_month_holidays->{$monthDay}{month}-$day_month_holidays->{$monthDay}{day}";
       $day_monthdate = "$day_month_holidays->{$monthDay}{day}/$day_month_holidays->{$monthDay}{month}";
-    } elsif (C4::Context->preference("dateformat") eq "us") {
+    } elsif (C4::Context->preference("dateformat") eq "dmydot") {
+      $day_monthdate_sort = "$day_month_holidays->{$monthDay}{month}.$day_month_holidays->{$monthDay}{day}";
+      $day_monthdate = "$day_month_holidays->{$monthDay}{day}.$day_month_holidays->{$monthDay}{month}";
+    }elsif (C4::Context->preference("dateformat") eq "us") {
       $day_monthdate = "$day_month_holidays->{$monthDay}{month}/$day_month_holidays->{$monthDay}{day}";
       $day_monthdate_sort = $day_monthdate;
     } else {
@@ -122,7 +125,7 @@ foreach my $yearMonthDay (keys %$exception_holidays) {
     my %exception_holiday;
     %exception_holiday = (KEY => $yearMonthDay,
                           DATE_SORT => $exception_holidays->{$yearMonthDay}{date},
-                          DATE => output_pref( { dt => $exceptiondate, dateonly => 1, dateformat => 'iso' } ),
+                          DATE => output_pref( { dt => $exceptiondate, dateonly => 1 } ),
                           TITLE => $exception_holidays->{$yearMonthDay}{title},
                           DESCRIPTION => $exception_holidays->{$yearMonthDay}{description});
     push @exception_holidays, \%exception_holiday;