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 <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml
index 60635f4..db40a3a 100644 (file)
--- a/installer/data/mysql/en/mandatory/sample_notices.yml
+++ b/installer/data/mysql/en/mandatory/sample_notices.yml
@@ -243,6 +243,7 @@ tables:
             - "Pages: <<article_requests.pages>>"
             - "Chapters: <<article_requests.chapters>>"
             - "Notes: <<article_requests.patron_notes>>"
+            - "Format: [% IF article_request.format == 'PHOTOCOPY' %]Copy[% ELSIF article_request.format == 'SCAN' %]Scan[% END %]"
             - ""
             - "Your library"
 
@@ -268,8 +269,9 @@ tables:
             - "Pages: <<article_requests.pages>>"
             - "Chapters: <<article_requests.chapters>>"
             - "Notes: <<article_requests.patron_notes>>"
+            - "Format: [% IF article_request.format == 'PHOTOCOPY' %]Copy[% ELSIF article_request.format == 'SCAN' %]Scan[% END %]"
             - ""
-            - "You may pick your article up at <<branches.branchname>>."
+            - "[% 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: <<article_requests.pages>>"
             - "Chapters: <<article_requests.chapters>>"
             - "Notes: <<article_requests.patron_notes>>"
-            - ""
+            - "Format: [% IF article_request.format == 'PHOTOCOPY' %]Copy[% ELSIF article_request.format == 'SCAN' %]Scan[% END %]"
             - ""
             - "Thank you!"
 
@@ -321,6 +323,7 @@ tables:
             - "Pages: <<article_requests.pages>>"
             - "Chapters: <<article_requests.chapters>>"
             - "Notes: <<article_requests.patron_notes>>"
+            - "Format: [% IF article_request.format == 'PHOTOCOPY' %]Copy[% ELSIF article_request.format == 'SCAN' %]Scan[% END %]"
             - ""
             - "Thank you!"
 
@@ -349,6 +352,7 @@ tables:
             - "Pages: <<article_requests.pages>>"
             - "Chapters: <<article_requests.chapters>>"
             - "Notes: <<article_requests.patron_notes>>"
+            - "Format: [% IF article_request.format == 'PHOTOCOPY' %]Copy[% ELSIF article_request.format == 'SCAN' %]Scan[% END %]"
             - ""
 
         - module: circulation