From b37b22a4fd7aa3f4a59a1c541aae2fcd5b9cbd1f Mon Sep 17 00:00:00 2001
From: Katrin Fischer
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
Signed-off-by: Caitlin Goodger
Signed-off-by: Katrin Fischer
Signed-off-by: Jonathan Druart
Signed-off-by: Kyle M Hall
---
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 <> <>,\r\n\r\nNous souhaitons vous informer que le prêt de ce document arrive bientôt à expiration :\r\n\r\n<>, <> (<>)\r\n\r\nMerci.\r\n\r\n<>','email'),
('circulation','PREDUEDGST','','Document à rendre bientôt (Résumé)',0,'Document(s) à rendre bientôt','Bonjour <> <>,\r\n\r\nVous avez <> document(s) dont le prêt arrive bientôt à expiration.\r\n\r\n<>','email'),
('circulation','RENEWAL','','Renouvellements',0,'Renouvellements','Bonjour <> <>,\r\n\r\nVous avez renouvelé les documents suivants :\r\n----\r\n<>\r\n----\r\nMerci.\r\n\r\n<>.','email'),
-('circulation','RESERVESLIP','','Ticket de réservation',1,'Ticket de réservation','Date : <>
\r\n\r\n Transfert / Réservation disponible à <>
\r\n\r\n<>, <>
\r\n\r\n\r\n - <>
\r\n - <>
\r\n - <>
\r\n <>
\r\n <> <>\r\n \r\n - <>
\r\n
\r\n
\r\nDOCUMENT RÉSERVÉ
\r\n<>
\r\n<>
\r\n\r\n - <>
\r\n - <>
\r\n - <>
\r\n
\r\nNotes :\r\n
<>
\r\n
\r\n','email'),
+('circulation','HOLD_SLIP','','Ticket de réservation',1,'Ticket de réservation','Date : <>
\r\n\r\n Transfert / Réservation disponible à <>
\r\n\r\n<>, <>
\r\n\r\n\r\n - <>
\r\n - <>
\r\n - <>
\r\n <>
\r\n <> <>\r\n \r\n - <>
\r\n
\r\n
\r\nDOCUMENT RÉSERVÉ
\r\n<>
\r\n<>
\r\n\r\n - <>
\r\n - <>
\r\n - <>
\r\n
\r\nNotes :\r\n
<>
\r\n\r\n','email'),
('circulation','TRANSFERSLIP','','Ticket de transfert',1,'Ticket de transfert','Date : <>
\r\n\r\nTransfert à <>
\r\n\r\nDOCUMENT
\r\n<>
\r\n<>
\r\n','email'),
('claimacquisition','ACQCLAIM','','Réclamation d\'une commande',0,'Document non reçu','<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n\r\nBonjour,\r\n\r\nLa commande suivante n\'a pas été reçue par notre service d\'acquisitions.\r\n\r\nCommande n. <> (<>) (<> exemplaire(s) commandé(s)) ($<> / unité).\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<>\r\n<>\r\n<>\r\n<>\r\n<> <>\r\n<>\r\n<>\r\n','email'),
('orderacquisition','ACQORDER','','Acquisition order',0,'Order','<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n\r\nPlease order for the library:\r\n\r\nOrdernumber <> (<>) (quantity: <>) ($<> each).\r\n\r\nThank you,\n\n<>', '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 <> <> (<>)\r\n\r\nWe have received your request for an article from <> (<>).\r\n\r\nArticle requested:\r\nTitle: <>\r\nAuthor: <>\r\nVolume: <>\r\nIssue: <>\r\nDate: <>\r\nPages: <>\r\nChapters: <>\r\nNotes: <>\r\n\r\n\r\nThank you!', 'email'),
('circulation', 'AR_SLIP', '', 'Article request - print slip', 0, 'Article request', 'Article request:\r\n\r\n<> <> (<>),\r\n\r\nTitle: <>\r\nBarcode: <>\r\n\r\nArticle requested:\r\nTitle: <>\r\nAuthor: <>\r\nVolume: <>\r\nIssue: <>\r\nDate: <>\r\nPages: <>\r\nChapters: <>\r\nNotes: <>\r\n', 'print'),
('circulation', 'AR_PROCESSING', '', 'Article request - processing', 0, 'Article request processing', 'Dear <> <> (<>),\r\n\r\nWe are now processing your request for an article from <> (<>).\r\n\r\nArticle requested:\r\nTitle: <>\r\nAuthor: <>\r\nVolume: <>\r\nIssue: <>\r\nDate: <>\r\nPages: <>\r\nChapters: <>\r\nNotes: <>\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','\r\nThis email has been sent in response to your password recovery request for the account <>.\r\n
\r\n\r\nYou can now create your new password using the following link:\r\n
>\"><>\r\n
\r\nThis link will be valid for 2 days from this email\'s reception, then you must reapply if you do not change your password.
\r\nThank you.
\r\n\r\n','email'),
+('members','MEMBERSHIP_EXPIRY','','Account expiration','Account expiration','Dear <> <> <>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<>\r\n\r\nThank you,\r\n\r\nLibrarian\r\n\r\n<>','email');
--
2.11.4.GIT