From b37b22a4fd7aa3f4a59a1c541aae2fcd5b9cbd1f Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Thu, 20 Oct 2016 00:10:52 +0200
Subject: [PATCH] Bug 17469: Add missing sample notices to fr-CA web installer

Adds missing notices to the fr-CA web installer:
- MEMBERSHIP_EXPIRY
- PASSWORD_RESET
Renames RESERVESLIP to HOLD_SLIP

TEST PLAN
---------
1) Apply the first patch
2) prove xt/sample_notices.t
   -- it should fail for fr-CA.
3) Apply the second patch
4) prove xt/sample_notices.t
   -- it should pass.
5) run all tests (prove t; prove xt)
   -- they should generally pass
6) run koha qa test tools

NOTE: Split test patch from fix patch, so could prove problem
      exists easily.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Caitlin Goodger <caitlingoodger.student@wegc.school.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 installer/data/mysql/fr-CA/obligatoire/sample_notices.sql | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql b/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql
index eb23be54b8..a02e4ca472 100644
--- a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql
+++ b/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql
@@ -9,7 +9,7 @@ INSERT INTO `letter` (module, code, branchcode, name, is_html, title, content, m
 ('circulation','PREDUE','','Document à rendre bientôt',0,'Document à rendre bientôt','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nNous souhaitons vous informer que le prêt de ce document arrive bientôt à expiration :\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nMerci.\r\n\r\n<<branches.branchname>>','email'),
 ('circulation','PREDUEDGST','','Document à rendre bientôt (Résumé)',0,'Document(s) à rendre bientôt','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVous avez <<count>> document(s) dont le prêt arrive bientôt à expiration.\r\n\r\n<<branches.branchname>>','email'),
 ('circulation','RENEWAL','','Renouvellements',0,'Renouvellements','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVous avez renouvelé les documents suivants :\r\n----\r\n<<biblio.title>>\r\n----\r\nMerci.\r\n\r\n<<branches.branchname>>.','email'),
-('circulation','RESERVESLIP','','Ticket de réservation',1,'Ticket de réservation','<h5>Date : <<today>></h5>\r\n\r\n<h3> Transfert / Réservation disponible à <<branches.branchname>></h3>\r\n\r\n<h3><<borrowers.surname>>, <<borrowers.firstname>> </h3>\r\n\r\n<ul>\r\n    <li><<borrowers.cardnumber>></li>\r\n    <li><<borrowers.phone>></li>\r\n    <li> <<borrowers.address>><br />\r\n         <<borrowers.address2>><br />\r\n         <<borrowers.city >>  <<borrowers.zipcode>>\r\n    </li>\r\n    <li><<borrowers.email>></li>\r\n</ul>\r\n<br />\r\n<h3>DOCUMENT RÉSERVÉ</h3>\r\n<h4><<biblio.title>></h4>\r\n<h5><<biblio.author>></h5>\r\n<ul>\r\n   <li><<items.barcode>></li>\r\n   <li><<items.itemcallnumber>></li>\r\n   <li><<reserves.waitingdate>></li>\r\n</ul>\r\n<p>Notes :\r\n<pre><<reserves.reservenotes>></pre>\r\n</p>\r\n','email'),
+('circulation','HOLD_SLIP','','Ticket de réservation',1,'Ticket de réservation','<h5>Date : <<today>></h5>\r\n\r\n<h3> Transfert / Réservation disponible à <<branches.branchname>></h3>\r\n\r\n<h3><<borrowers.surname>>, <<borrowers.firstname>> </h3>\r\n\r\n<ul>\r\n    <li><<borrowers.cardnumber>></li>\r\n    <li><<borrowers.phone>></li>\r\n    <li> <<borrowers.address>><br />\r\n         <<borrowers.address2>><br />\r\n         <<borrowers.city >>  <<borrowers.zipcode>>\r\n    </li>\r\n    <li><<borrowers.email>></li>\r\n</ul>\r\n<br />\r\n<h3>DOCUMENT RÉSERVÉ</h3>\r\n<h4><<biblio.title>></h4>\r\n<h5><<biblio.author>></h5>\r\n<ul>\r\n   <li><<items.barcode>></li>\r\n   <li><<items.itemcallnumber>></li>\r\n   <li><<reserves.waitingdate>></li>\r\n</ul>\r\n<p>Notes :\r\n<pre><<reserves.reservenotes>></pre>\r\n</p>\r\n','email'),
 ('circulation','TRANSFERSLIP','','Ticket de transfert',1,'Ticket de transfert','<h5>Date : <<today>></h5>\r\n\r\n<h3>Transfert à <<branches.branchname>></h3>\r\n\r\n<h3>DOCUMENT</h3>\r\n<h4><<biblio.title>></h4>\r\n<h5><<biblio.author>></h5>\r\n<ul>\r\n   <li><<items.barcode>></li>\r\n   <li><<items.itemcallnumber>></li>\r\n</ul>','email'),
 ('claimacquisition','ACQCLAIM','','Réclamation d\'une commande',0,'Document non reçu','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nBonjour,\r\n\r\nLa commande suivante n\'a pas été reçue par notre service d\'acquisitions.\r\n\r\n<order>Commande n. <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> exemplaire(s) commandé(s)) ($<<aqorders.listprice>> / unité).</order>\r\n\r\nMerci de faire le nécessaire pour nous la faire parvenir rapidement.\r\n\r\nEn cas de problème, veuillez nous contacter à l\'adresse ci-dessous.\r\n\r\nCordialement,\r\n\r\n<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n<<branches.branchaddress3>>\r\n<<branches.branchcity>> <<branches.branchzip>>\r\n<<branches.branchphone>>\r\n<<branches.branchemail>>\r\n','email'),
 ('orderacquisition','ACQORDER','','Acquisition order',0,'Order','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nPlease order for the library:\r\n\r\n<order>Ordernumber <<aqorders.ordernumber>> (<<biblio.title>>) (quantity: <<aqorders.quantity>>) ($<<aqorders.listprice>> each).</order>\r\n\r\nThank you,\n\n<<branches.branchname>>', 'email'),
@@ -52,3 +52,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`
 ('circulation', 'AR_PENDING', '', 'Article request - pending', 0, 'Article request received', 'Dear <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>)\r\n\r\nWe have received your request for an article from <<biblio.title>> (<<items.barcode>>).\r\n\r\nArticle requested:\r\nTitle: <<article_requests.title>>\r\nAuthor: <<article_requests.author>>\r\nVolume: <<article_requests.volume>>\r\nIssue: <<article_requests.issue>>\r\nDate: <<article_requests.date>>\r\nPages: <<article_requests.pages>>\r\nChapters: <<article_requests.chapters>>\r\nNotes: <<article_requests.patron_notes>>\r\n\r\n\r\nThank you!', 'email'),
 ('circulation', 'AR_SLIP', '', 'Article request - print slip', 0, 'Article request', 'Article request:\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>),\r\n\r\nTitle: <<biblio.title>>\r\nBarcode: <<items.barcode>>\r\n\r\nArticle requested:\r\nTitle: <<article_requests.title>>\r\nAuthor: <<article_requests.author>>\r\nVolume: <<article_requests.volume>>\r\nIssue: <<article_requests.issue>>\r\nDate: <<article_requests.date>>\r\nPages: <<article_requests.pages>>\r\nChapters: <<article_requests.chapters>>\r\nNotes: <<article_requests.patron_notes>>\r\n', 'print'),
 ('circulation', 'AR_PROCESSING', '', 'Article request - processing', 0, 'Article request processing', 'Dear <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>),\r\n\r\nWe are now processing your request for an article from <<biblio.title>> (<<items.barcode>>).\r\n\r\nArticle requested:\r\nTitle: <<article_requests.title>>\r\nAuthor: <<article_requests.author>>\r\nVolume: <<article_requests.volume>>\r\nIssue: <<article_requests.issue>>\r\nDate: <<article_requests.date>>\r\nPages: <<article_requests.pages>>\r\nChapters: <<article_requests.chapters>>\r\nNotes: <<article_requests.patron_notes>>\r\n\r\nThank you!', 'email');
+
+INSERT INTO `letter` (module, code, branchcode, name, is_html, title, content, message_transport_type)
+VALUES ('members','PASSWORD_RESET','','Online password reset',1,'Koha password recovery','<html>\r\n<p>This email has been sent in response to your password recovery request for the account <strong><<user>></strong>.\r\n</p>\r\n<p>\r\nYou can now create your new password using the following link:\r\n<br/><a href=\"<<passwordreseturl>>\"><<passwordreseturl>></a>\r\n</p>\r\n<p>This link will be valid for 2 days from this email\'s reception, then you must reapply if you do not change your password.</p>\r\n<p>Thank you.</p>\r\n</html>\r\n','email'),
+('members','MEMBERSHIP_EXPIRY','','Account expiration','Account expiration','Dear <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<<borrowers.dateexpiry>>\r\n\r\nThank you,\r\n\r\nLibrarian\r\n\r\n<<branches.branchname>>','email');
-- 
2.39.5