Bugzilla – Attachment 68126 Details for
Bug 19441
Several tests are failing on 16.05.x
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19441: Fix xt/sample_notices.t
Bug-19441-Fix-xtsamplenoticest.patch (text/plain), 6.44 KB, created by
Mark Tompsett
on 2017-10-14 04:00:59 UTC
(
hide
)
Description:
Bug 19441: Fix xt/sample_notices.t
Filename:
MIME Type:
Creator:
Mark Tompsett
Created:
2017-10-14 04:00:59 UTC
Size:
6.44 KB
patch
obsolete
>From 3795b2603745912c0f885dba160d82457e18482b Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Mon, 9 Oct 2017 18:21:03 -0300 >Subject: [PATCH] Bug 19441: Fix xt/sample_notices.t > >fr-CA is not up-to-date: >- RESERVESLIP have been renamed with HOLD_SLIP >- PASSWORD_RESET and MEMBERSHIP_EXPIRY are not defined > >Signed-off-by: Mark Tompsett <mtompset@hotmail.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 52d3019..c230c7b 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'), > ('members','ACCTDETAILS','','Modèle de message pour les détails d\'un compte lecteur - DEFAULT',0,'Votre compte Koha','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nLes informations pour vous connecter à votre compte lecteur sont :\r\n\r\nIdentifiant : <<borrowers.userid>>\r\nMot de passe: <<borrowers.password>>\r\n\r\nSi vous rencontrez des problèmes ou avez des questions concernant votre compte, veuillez contacter l\'administrateur de Koha.\r\n\r\nMerci, \r\nL\'administrateur de Koha\r\nkohaadmin@yoursite.org','email'), >@@ -44,3 +44,7 @@ INSERT INTO letter ( module, code, branchcode, name, is_html, title, content, me > > <item>"<<biblio.title>>" par <<biblio.author>>, <<items.itemcallnumber>>, Code-barres : <<items.barcode>> Amendes : <<items.fine>></item> > ', 'print' ); >+ >+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',0,'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.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 19441
:
67852
|
67853
|
67854
|
67855
|
67856
|
67957
| 68126 |
68127
|
68128
|
68129
|
68130
|
68131