From b56382f790b47393a588aa3936c5f797d0042152 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Wed, 29 Jul 2020 11:12:12 +0000 Subject: [PATCH] Bug 20472: Add format to sample notices NOTE: We are only changing English here. A follow-up will care for the translated languages. (English is in yml format, the remainder not yet.) We need to change the following notices: AR_SLIP, AR_CANCELED, AR_PROCESSING, AR_PENDING and AR_COMPLETED. In AR_COMPLETED the last sentence about picking up has been modified too. Test plan: Reinstall Koha. Choose English. Check notice text. Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens --- installer/data/mysql/en/mandatory/sample_notices.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml index 60635f49a8..db40a3a4cc 100644 --- a/installer/data/mysql/en/mandatory/sample_notices.yml +++ b/installer/data/mysql/en/mandatory/sample_notices.yml @@ -243,6 +243,7 @@ tables: - "Pages: <>" - "Chapters: <>" - "Notes: <>" + - "Format: [% IF article_request.format == 'PHOTOCOPY' %]Copy[% ELSIF article_request.format == 'SCAN' %]Scan[% END %]" - "" - "Your library" @@ -268,8 +269,9 @@ tables: - "Pages: <>" - "Chapters: <>" - "Notes: <>" + - "Format: [% IF article_request.format == 'PHOTOCOPY' %]Copy[% ELSIF article_request.format == 'SCAN' %]Scan[% END %]" - "" - - "You may pick your article up at <>." + - "[% IF article_request.format == 'PHOTOCOPY' %]You may pick up your article at [% branch.branchname %].[% ELSIF article_request.format == 'SCAN' %]You can download the scanned materials via the following url(s): [% article_request.urls %].[% END %]" - "" - "Thank you!" @@ -295,7 +297,7 @@ tables: - "Pages: <>" - "Chapters: <>" - "Notes: <>" - - "" + - "Format: [% IF article_request.format == 'PHOTOCOPY' %]Copy[% ELSIF article_request.format == 'SCAN' %]Scan[% END %]" - "" - "Thank you!" @@ -321,6 +323,7 @@ tables: - "Pages: <>" - "Chapters: <>" - "Notes: <>" + - "Format: [% IF article_request.format == 'PHOTOCOPY' %]Copy[% ELSIF article_request.format == 'SCAN' %]Scan[% END %]" - "" - "Thank you!" @@ -349,6 +352,7 @@ tables: - "Pages: <>" - "Chapters: <>" - "Notes: <>" + - "Format: [% IF article_request.format == 'PHOTOCOPY' %]Copy[% ELSIF article_request.format == 'SCAN' %]Scan[% END %]" - "" - module: circulation -- 2.20.1