From 64ccfa85635fa83108fa58c5216967aef547566c Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Fri, 5 Mar 2021 12:29:41 +0100 Subject: [PATCH] Bug 12224: (follow-up) Format today with KohaDates Updates the slip templates to use [% today | $KohaDates %]. Adding an explicit USE statement is not necessary in this case. To test: - When testing the feature according to the test plan, make sure that the date for today shows up formatted to the DateFormat system preference. Note: As we are printing today's checkins, I have intentionally left oft the time. But it could be easily added if a library wanted it. Signed-off-by: Katrin Fischer --- installer/data/mysql/atomicupdate/bug_12224-add_CHECKINSLIP_notice.perl | 2 +- installer/data/mysql/en/mandatory/sample_notices.yml | 2 +- installer/data/mysql/fr-CA/obligatoire/sample_notices.sql | 2 +- installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql | 2 +- installer/data/mysql/it-IT/necessari/notices.sql | 2 +- installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql | 2 +- installer/data/mysql/pl-PL/mandatory/sample_notices.sql | 2 +- installer/data/mysql/ru-RU/mandatory/sample_notices.sql | 2 +- installer/data/mysql/uk-UA/mandatory/sample_notices.sql | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_12224-add_CHECKINSLIP_notice.perl b/installer/data/mysql/atomicupdate/bug_12224-add_CHECKINSLIP_notice.perl index 6edfbc9877..d48dde9d53 100644 --- a/installer/data/mysql/atomicupdate/bug_12224-add_CHECKINSLIP_notice.perl +++ b/installer/data/mysql/atomicupdate/bug_12224-add_CHECKINSLIP_notice.perl @@ -6,7 +6,7 @@ if( CheckVersion( $DBversion ) ) { Checked in items for [% borrower.title %] [% borrower.firstname %] [% borrower.initials %] [% borrower.surname %]
([% borrower.cardnumber %])
-[% today %]
+[% today | $KohaDates %]

Checked in today

[% FOREACH checkin IN old_checkouts %] diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml index 52d68c6f70..e58c0075af 100644 --- a/installer/data/mysql/en/mandatory/sample_notices.yml +++ b/installer/data/mysql/en/mandatory/sample_notices.yml @@ -1468,7 +1468,7 @@ tables: - "Checked in items for [% borrower.title %] [% borrower.firstname %] [% borrower.initials %] [% borrower.surname %]
" - "([% borrower.cardnumber %])
" - "" - - "[% today %]
" + - "[% today | $KohaDates %]
" - "" - "

Checked in today

" - "[% FOREACH checkin IN old_checkouts %]" diff --git a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql b/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql index 44bfec61e9..2317e98575 100644 --- a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql +++ b/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql @@ -27,7 +27,7 @@ INSERT INTO `letter` (module, code, branchcode, name, is_html, title, content, m Checked in items for [% borrower.title %] [% borrower.firstname %] [% borrower.initials %] [% borrower.surname %]
([% borrower.cardnumber %])
-[% today %]
+[% today | $KohaDates %]

Checked in today

[% FOREACH checkin IN old_checkouts %] diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql index 1eac37924e..7bc86d3ec2 100644 --- a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql @@ -56,7 +56,7 @@ VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New suggestion','

Su Checked in items for [% borrower.title %] [% borrower.firstname %] [% borrower.initials %] [% borrower.surname %]
([% borrower.cardnumber %])
-[% today %]
+[% today | $KohaDates %]

Checked in today

[% FOREACH checkin IN old_checkouts %] diff --git a/installer/data/mysql/it-IT/necessari/notices.sql b/installer/data/mysql/it-IT/necessari/notices.sql index 681f5f7d34..c2c2a9cfc0 100644 --- a/installer/data/mysql/it-IT/necessari/notices.sql +++ b/installer/data/mysql/it-IT/necessari/notices.sql @@ -61,7 +61,7 @@ VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New suggestion','

Su Checked in items for [% borrower.title %] [% borrower.firstname %] [% borrower.initials %] [% borrower.surname %]
([% borrower.cardnumber %])
-[% today %]
+[% today | $KohaDates %]

Checked in today

[% FOREACH checkin IN old_checkouts %] diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql index 9ae18e92ae..19821cb794 100644 --- a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql +++ b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql @@ -76,7 +76,7 @@ VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New suggestion','

Su Checked in items for [% borrower.title %] [% borrower.firstname %] [% borrower.initials %] [% borrower.surname %]
([% borrower.cardnumber %])
-[% today %]
+[% today | $KohaDates %]

Checked in today

[% FOREACH checkin IN old_checkouts %] diff --git a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql index 21de6f284f..6a6da3c021 100644 --- a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql +++ b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql @@ -55,7 +55,7 @@ VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New suggestion','

Su Checked in items for [% borrower.title %] [% borrower.firstname %] [% borrower.initials %] [% borrower.surname %]
([% borrower.cardnumber %])
-[% today %]
+[% today | $KohaDates %]

Checked in today

[% FOREACH checkin IN old_checkouts %] diff --git a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql index 52f7fdb4c0..e9b0006f91 100644 --- a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql +++ b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql @@ -54,7 +54,7 @@ VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New suggestion','

Su Checked in items for [% borrower.title %] [% borrower.firstname %] [% borrower.initials %] [% borrower.surname %]
([% borrower.cardnumber %])
-[% today %]
+[% today | $KohaDates %]

Checked in today

[% FOREACH checkin IN old_checkouts %] diff --git a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql index 713810d81c..1c8b70eda7 100644 --- a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql +++ b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql @@ -119,7 +119,7 @@ VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New suggestion','

Su Checked in items for [% borrower.title %] [% borrower.firstname %] [% borrower.initials %] [% borrower.surname %]
([% borrower.cardnumber %])
-[% today %]
+[% today | $KohaDates %]

Checked in today

[% FOREACH checkin IN old_checkouts %] -- 2.11.0