Attachment 119384 Details for Bug 15986 – Bug 15986: Use KohaDates filter to correctly format the waitingdate

[patch] Bug 15986: Use KohaDates filter to correctly format the waitingdate

Bug-15986-Use-KohaDates-filter-to-correctly-format.patch (text/plain), 20.68 KB, created by Jonathan Druart on 2021-04-09 14:18:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2021-04-09 14:18:33 UTC

Size: 20.68 KB

patch

obsolete

>From 55a1c3f27467880cec7cb48a3ed42e7eaef14327 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Fri, 9 Apr 2021 16:18:10 +0200
>Subject: [PATCH] Bug 15986: Use KohaDates filter to correctly format the
> waitingdate
>
>---
> .../mysql/atomicupdate/bug_15986_add_holdreminder_notice.perl | 4 ++--
> installer/data/mysql/en/mandatory/sample_notices.yml          | 2 +-
> installer/data/mysql/fr-CA/obligatoire/sample_notices.sql     | 2 +-
> installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql   | 2 +-
> installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql  | 2 +-
> installer/data/mysql/pl-PL/mandatory/sample_notices.sql       | 2 +-
> installer/data/mysql/ru-RU/mandatory/sample_notices.sql       | 2 +-
> installer/data/mysql/uk-UA/mandatory/sample_notices.sql       | 2 +-
> 8 files changed, 9 insertions(+), 9 deletions(-)
>
>diff --git a/installer/data/mysql/atomicupdate/bug_15986_add_holdreminder_notice.perl b/installer/data/mysql/atomicupdate/bug_15986_add_holdreminder_notice.perl
>index 3e8ac683a14..d6142790e08 100644
>--- a/installer/data/mysql/atomicupdate/bug_15986_add_holdreminder_notice.perl
>+++ b/installer/data/mysql/atomicupdate/bug_15986_add_holdreminder_notice.perl
>@@ -1,9 +1,9 @@
> $DBversion = 'XXX';
> if( CheckVersion( $DBversion ) ) {
>     $dbh->do(q{
>-        INSERT IGNORE INTO letter 
>+        INSERT IGNORE INTO letter
>         (module,code,branchcode,name,is_html,title,content,message_transport_type,lang)
>-        VALUES ('reserves','HOLD_REMINDER','','Waiting hold reminder',0,'You have waiting holds.','Dear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nThe follwing holds are waiting at [% branch.branchname %]:\r\n\\r\n[% FOREACH hold IN holds %]\r\n    [% hold.biblio.title %] : waiting since [% hold.waitingdate %]\r\n[% END %]','email','default')
>+        VALUES ('reserves','HOLD_REMINDER','','Waiting hold reminder',0,'You have waiting holds.','Dear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nThe follwing holds are waiting at [% branch.branchname %]:\r\n\\r\n[% FOREACH hold IN holds %]\r\n    [% hold.biblio.title %] : waiting since [% hold.waitingdate | $KohaDates %]\r\n[% END %]','email','default')
>     });
>     NewVersion( $DBversion, 15986, "Add sample HOLD_REMINDER notice");
> }
>diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml
>index bc21739ee23..66c2feba65f 100644
>--- a/installer/data/mysql/en/mandatory/sample_notices.yml
>+++ b/installer/data/mysql/en/mandatory/sample_notices.yml
>@@ -1242,7 +1242,7 @@ tables:
>           message_transport_type: email
>           lang: default
>           content:
>-            - "Dear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nThe follwing holds are waiting at [% branch.branchname %]:\r\n\\r\n[% FOREACH hold IN holds %]\r\n    [% hold.biblio.title %] : waiting since [% hold.waitingdate %]\r\n[% END %]"
>+            - "Dear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nThe follwing holds are waiting at [% branch.branchname %]:\r\n\\r\n[% FOREACH hold IN holds %]\r\n    [% hold.biblio.title %] : waiting since [% hold.waitingdate | $KohaDates %]\r\n[% END %]"
> 
>         - module: serial
>           code: SERIAL_ALERT
>diff --git a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql b/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql
>index d6b8eb50977..3ea07e31f32 100644
>--- a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql
>+++ b/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql
>@@ -17,7 +17,7 @@ INSERT INTO `letter` (module, code, branchcode, name, is_html, title, content, m
> ('reserves','HOLD','','RÃ©servation en attente de retrait',0,'RÃ©servation en attente de retrait Ã  <<branches.branchname>>','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVotre rÃ©servation est disponible depuis le <<reserves.waitingdate>> :\r\n\r\nTitre : <<biblio.title>>\r\nAuteur : <<biblio.author>>\r\nCopie : <<items.copynumber>>\r\nLocalisation : <<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n<<branches.branchaddress3>>\r\n<<branches.branchcity>> <<branches.branchzip>>\r\n\r\nNous vous invitons Ã  venir emprunter votre document rapidement.\r\n\r\nMerci.\r\n\r\n<<branches.branchname>>','email'),
> ('reserves','HOLD','','RÃ©servation en attente de retrait',0,'RÃ©servation en attente de retrait Ã  <<branches.branchname>>','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVotre rÃ©servation est disponible depuis le <<reserves.waitingdate>> :\r\n\r\nTitre : <<biblio.title>>\r\nAuteur : <<biblio.author>>\r\nCopie : <<items.copynumber>>\r\nLocalisation : <<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n<<branches.branchaddress3>>\r\n<<branches.branchcity>> <<branches.branchzip>>\r\n\r\nNous vous invitons Ã  venir emprunter votre document rapidement.\r\n\r\nMerci.\r\n\r\n<<branches.branchname>>','print'),
> ('reserves','HOLDPLACED','','RÃ©servation sur un document',0,'Un document a Ã©tÃ© rÃ©servÃ©','Le document suivant a Ã©tÃ© rÃ©servÃ© : \r\n<<biblio.title>> (<<biblio.biblionumber>>) par l\'adhÃ©rent <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).','email'),
>-('reserves','HOLD_REMINDER','','Waiting hold reminder',0,'You have waiting holds.','Dear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nThe follwing holds are waiting at [% branch.branchname %]:\r\n\\r\n[% FOREACH hold IN holds %]\r\n    [% hold.biblio.title %] : waiting since [% hold.waitingdate %]\r\n[% END %]','email'),
>+('reserves','HOLD_REMINDER','','Waiting hold reminder',0,'You have waiting holds.','Dear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nThe follwing holds are waiting at [% branch.branchname %]:\r\n\\r\n[% FOREACH hold IN holds %]\r\n    [% hold.biblio.title %] : waiting since [% hold.waitingdate | $KohaDates %]\r\n[% END %]','email'),
> ('reserves', 'CANCEL_HOLD_ON_LOST', '','RÃ©servation annulÃ©e',0,"RÃ©servation annulÃ©e", "Bonjour [% borrower.firstname %] [% borrower.surname %],\n\nVotre rÃ©servation pour le document suivant ne peut malheureusement pas Ãªtre comblÃ©e parce que le document est introuvable.\n\nTitre : [% biblio.title %]\nAuteur : [% biblio.author %]\nExemplaire : [% item.copynumber %]\nLocalisation : [% branch.branchname %]", 'email'),
> ('serial','SERIAL_ALERT','','Liste de circulation',0,'Le nouveau numÃ©ro de <<biblio.title>> est disponible','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nLe nouveau numÃ©ro de <<biblio.title>> est disponible.\r\n\r\nVous pouvez venir Ã  la bilbliothÃ¨que pour le consulter.\r\n\r\nMerci.\r\n\r\n<<branches.branchname>>','email'),
> ('suggestions','ACCEPTED','','Suggestion d\'achat acceptÃ©e',0,'Suggestion d\'achat acceptÃ©e','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVous nous avez suggÃ©rÃ© l\'achat du document <<suggestions.title>> par <<suggestions.author>>.\r\n\r\nNous avons Ã©valuÃ© votre suggestion aujourdhui. Le document sera commandÃ© dÃ¨s que possible. Vous serez tenu au courant par courriel quand le document aura Ã©tÃ© commandÃ© et quand il sera disponible Ã  la bibliothÃ¨que.\r\n\r\nPour toute question, veuillez nous contacter Ã  l\'adresse suivante : <<branches.branchemail>>.\r\n\r\nMerci.\r\n\r\n<<branches.branchname>>','email'),
>diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
>index 19e69cfc517..77fd8c3ff61 100644
>--- a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
>+++ b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
>@@ -15,7 +15,7 @@ VALUES
> ('circulation','CHECKIN','Document rendu (rÃ©sumÃ©)','Retours','Les documents suivants ont Ã©tÃ© rendus:\r\n----\r\n[% biblio.title %]\r\n----\r\nMerci.', 'email'),
> ('circulation','CHECKOUT','Document prÃªtÃ© (rÃ©sumÃ©)','PrÃªts','Les documents suivants ont Ã©tÃ© prÃªtÃ©s:\r\n----\r\n[% biblio.title %]\r\n----\r\nMerci de votre visite [% branch.branchname %].', 'email'),
> ('reserves', 'HOLDPLACED', 'Demande de rÃ©servation', 'Demande de rÃ©servation','Une demande de rÃ©servation a Ã©tÃ© placÃ©e sur le document : <<biblio.title>> (<<biblio.biblionumber>>) par l\'adhÃ©rent <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).', 'email'),
>-('reserves','HOLD_REMINDER','','Waiting hold reminder',0,'You have waiting holds.','Dear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nThe follwing holds are waiting at [% branch.branchname %]:\r\n\\r\n[% FOREACH hold IN holds %]\r\n    [% hold.biblio.title %] : waiting since [% hold.waitingdate %]\r\n[% END %]','email'),
>+('reserves','HOLD_REMINDER','','Waiting hold reminder',0,'You have waiting holds.','Dear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nThe follwing holds are waiting at [% branch.branchname %]:\r\n\\r\n[% FOREACH hold IN holds %]\r\n    [% hold.biblio.title %] : waiting since [% hold.waitingdate | $KohaDates %]\r\n[% END %]','email'),
> ('reserves', 'CANCEL_HOLD_ON_LOST', 'Hold has been cancelled', "Hold has been cancelled", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nWe regret to inform you, that the following item can not be provided due to it being missing. Your hold was cancelled.\n\nTitle: [% biblio.title %]\nAuthor: [% biblio.author %]\nCopy: [% item.copynumber %]\nLocation: [% branch.branchname %]", 'email'),
> ('suggestions','ACCEPTED','Suggestion accceptÃ©e', 'Suggestion acceptÃ©e','Cher(e) <<borrowers.firstname>> <<borrowers.surname>>,\n\nVous avez crÃ©e une suggestion d\'achat au sujet du document <<suggestions.title>> de <<suggestions.author>>.\n\nLa BibliothÃ¨que a reÃ§u votre demande ce jour. Nous donnerons suite Ã  votre demande aussi vite que possible. Vous serez averti par courriel dÃ¨s que la commande sera envoyÃ©e,et quand les documents seront arrivÃ©s Ã  la BibliothÃ¨que.\n\nSi vous avez des questions, merci de nous contacter Ã  l\'adresse suivante <<branches.branchemail>>.\n\nMerci,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','AVAILABLE','Suggestion disponible', 'Suggestion d\'achat disponible','cher(e) <<borrowers.firstname>> <<borrowers.surname>>,\n\nVous avez effectuÃ© une suggestion d\'achat pour le docuement  <<suggestions.title>> de <<suggestions.author>>.\n\nNous sommes heureux de vous informer que le document que vous aviez demandÃ© est maintenant disponible dans nos collections.\n\nSi vous avez des questions, merci de nous contacter par courriel Ã  l\'adresse <<branches.branchemail>>.\n\nMerci,\n\n<<branches.branchname>>', 'email'),
>diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
>index 37301a11080..98831c4e675 100644
>--- a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
>+++ b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
>@@ -35,7 +35,7 @@ VALUES ('circulation','ODUE','Purring','Purring pÃ¥ dokument','<<borrowers.first
> ('circulation','CHECKIN','Innlevering','Melding om innlevering','FÃ¸lgende dokument har blitt innlevert:\r\n----\r\n[% biblio.title %]\r\n----\r\nVennlig hilsen\r\nBiblioteket', 'email'),
> ('circulation','CHECKOUT','UtlÃ¥n','Melding om utlÃ¥n','FÃ¸lgende dokument har blitt lÃ¥nt ut:\r\n----\r\n[% biblio.title %]\r\n----\r\nVennlig hilsen\r\nBiblioteket', 'email'),
> ('reserves', 'HOLDPLACED', 'Melding om reservasjon', 'Melding om reservasjon','FÃ¸lgende dokument har blitt reservert : <<biblio.title>> (<<biblio.biblionumber>>) av <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).', 'email'),
>-('reserves','HOLD_REMINDER','','Waiting hold reminder',0,'You have waiting holds.','Dear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nThe follwing holds are waiting at [% branch.branchname %]:\r\n\\r\n[% FOREACH hold IN holds %]\r\n    [% hold.biblio.title %] : waiting since [% hold.waitingdate %]\r\n[% END %]','email'),
>+('reserves','HOLD_REMINDER','','Waiting hold reminder',0,'You have waiting holds.','Dear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nThe follwing holds are waiting at [% branch.branchname %]:\r\n\\r\n[% FOREACH hold IN holds %]\r\n    [% hold.biblio.title %] : waiting since [% hold.waitingdate | $KohaDates %]\r\n[% END %]','email'),
> ('reserves', 'CANCEL_HOLD_ON_LOST', 'Hold has been cancelled', "Hold has been cancelled", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nWe regret to inform you, that the following item can not be provided due to it being missing. Your hold was cancelled.\n\nTitle: [% biblio.title %]\nAuthor: [% biblio.author %]\nCopy: [% item.copynumber %]\nLocation: [% branch.branchname %]", 'email'),
> ('suggestions','ACCEPTED','Forslag godtatt', 'InnkjÃ¸psforslag godtatt','<<borrowers.firstname>> <<borrowers.surname>>,\n\nDu har foreslÃ¥tt at biblioteket kjÃ¸per inn <<suggestions.title>> av <<suggestions.author>>.\n\nBiblioteket har vurdert forslaget i dag. Dokumentet vil bli bestilt sÃ¥ fort det lar seg gjÃ¸re. Du vil fÃ¥ en ny melding nÃ¥r bestillingen er gjort, og nÃ¥r dokumentet ankommer biblioteket.\n\nEr det noe du lurer pÃ¥, vennligst kontakt oss pÃ¥ <<branches.branchemail>>.\n\nVennlig hilsen,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','AVAILABLE','ForeslÃ¥tt dokument tilgjengelig', 'ForeslÃ¥tt dokument tilgjengelig','<<borrowers.firstname>> <<borrowers.surname>>,\n\nDu har foreslÃ¥tt at biblioteket kjÃ¸per inn <<suggestions.title>> av <<suggestions.author>>.\n\nVi har gleden av Ã¥ informere deg om at dokumentet nÃ¥ er innlemmet i samlingen.\n\nEr det noe du lurer pÃ¥, vennligst kontakt oss pÃ¥ <<branches.branchemail>>.\n\nVennlig hilsen,\n\n<<branches.branchname>>', 'email'),
>diff --git a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
>index 815e92517ba..263203094d6 100644
>--- a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
>+++ b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
>@@ -14,7 +14,7 @@ VALUES ('circulation','ODUE','Overdue notice','Item overdue','Dear <<borrowers.f
> ('circulation','CHECKIN','Item check-in (digest)','Check-ins','The following items have been checked in:\r\n----\r\n[% biblio.title %]\r\n----\r\nThank you.', 'email'),
> ('circulation','CHECKOUT','Item check-out (digest)','Checkouts','The following items have been checked out:\r\n----\r\n[% biblio.title %]\r\n----\r\nThank you for visiting [% branch.branchname %].', 'email'),
> ('reserves', 'HOLDPLACED', 'Hold placed on item', 'Hold placed on item','A hold has been placed on the following item : <<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).', 'email'),
>-('reserves','HOLD_REMINDER','','Waiting hold reminder',0,'You have waiting holds.','Dear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nThe follwing holds are waiting at [% branch.branchname %]:\r\n\\r\n[% FOREACH hold IN holds %]\r\n    [% hold.biblio.title %] : waiting since [% hold.waitingdate %]\r\n[% END %]','email'),
>+('reserves','HOLD_REMINDER','','Waiting hold reminder',0,'You have waiting holds.','Dear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nThe follwing holds are waiting at [% branch.branchname %]:\r\n\\r\n[% FOREACH hold IN holds %]\r\n    [% hold.biblio.title %] : waiting since [% hold.waitingdate | $KohaDates %]\r\n[% END %]','email'),
> ('reserves', 'CANCEL_HOLD_ON_LOST', 'Hold has been cancelled', "Hold has been cancelled", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nWe regret to inform you, that the following item can not be provided due to it being missing. Your hold was cancelled.\n\nTitle: [% biblio.title %]\nAuthor: [% biblio.author %]\nCopy: [% item.copynumber %]\nLocation: [% branch.branchname %]", 'email'),
> ('suggestions','ACCEPTED','Suggestion accepted', 'Purchase suggestion accepted','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your suggestion today. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the item arrives at the library.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','AVAILABLE','Suggestion available', 'Suggested purchase available','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested is now part of the collection.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
>diff --git a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
>index c4572b54326..f8bf00a23ab 100644
>--- a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
>+++ b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
>@@ -13,7 +13,7 @@ VALUES ('circulation','ODUE','Overdue notice','Item overdue','Dear <<borrowers.f
> ('circulation','CHECKIN','Item check-in (digest)','Check-ins','The following items have been checked in:\r\n----\r\n[% biblio.title %]\r\n----\r\nThank you.', 'email'),
> ('circulation','CHECKOUT','Item check-out (digest)','Checkouts','The following items have been checked out:\r\n----\r\n[% biblio.title %]\r\n----\r\nThank you for visiting [% branch.branchname %].', 'email'),
> ('reserves', 'HOLDPLACED', 'Hold placed on item', 'Hold placed on item','A hold has been placed on the following item : <<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).', 'email'),
>-('reserves','HOLD_REMINDER','','Waiting hold reminder',0,'You have waiting holds.','Dear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nThe follwing holds are waiting at [% branch.branchname %]:\r\n\\r\n[% FOREACH hold IN holds %]\r\n    [% hold.biblio.title %] : waiting since [% hold.waitingdate %]\r\n[% END %]','email'),
>+('reserves','HOLD_REMINDER','','Waiting hold reminder',0,'You have waiting holds.','Dear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nThe follwing holds are waiting at [% branch.branchname %]:\r\n\\r\n[% FOREACH hold IN holds %]\r\n    [% hold.biblio.title %] : waiting since [% hold.waitingdate | $KohaDates %]\r\n[% END %]','email'),
> ('reserves', 'CANCEL_HOLD_ON_LOST', 'Hold has been cancelled', "Hold has been cancelled", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nWe regret to inform you, that the following item can not be provided due to it being missing. Your hold was cancelled.\n\nTitle: [% biblio.title %]\nAuthor: [% biblio.author %]\nCopy: [% item.copynumber %]\nLocation: [% branch.branchname %]", 'email'),
> ('suggestions','ACCEPTED','Suggestion accepted', 'Purchase suggestion accepted','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your suggestion today. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the item arrives at the library.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','AVAILABLE','Suggestion available', 'Suggested purchase available','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested is now part of the collection.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
>diff --git a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
>index c9da726042b..1ae464b8d4e 100644
>--- a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
>+++ b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
>@@ -64,7 +64,7 @@ INSERT INTO `letter` (module, code, name, title, content, message_transport_type
>  'email'),
> 
> ('reserves','HOLD_REMINDER','Waiting hold reminder', 'You have waiting holds.',
>- 'Dear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nThe follwing holds are waiting at [% branch.branchname %]:\r\n\\r\n[% FOREACH hold IN holds %]\r\n    [% hold.biblio.title %] : waiting since [% hold.waitingdate %]\r\n[% END %]',
>+ 'Dear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nThe follwing holds are waiting at [% branch.branchname %]:\r\n\\r\n[% FOREACH hold IN holds %]\r\n    [% hold.biblio.title %] : waiting since [% hold.waitingdate | $KohaDates %]\r\n[% END %]',
>  'email'),
> 
> ('suggestions','ACCEPTED','Ð¿ÑÐ¾Ð¿Ð¾Ð·Ð¸ÑÑÑ Ð¿ÑÐ¸Ð¹Ð½ÑÑÐ°', 'ÐÑÐ¾Ð¿Ð¾Ð·Ð¸ÑÑÑ Ð½Ð° Ð¿ÑÐ¸Ð´Ð±Ð°Ð½Ð½Ñ Ð¿ÑÐ¸Ð¹Ð½ÑÑÐ¾',
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 15986: 53323 | 53354 | 53594 | 55723 | 91767 | 91768 | 99919 | 102723 | 102926 | 106962 | 106963 | 106964 | 112999 | 113000 | 113001 | 118733 | 118734 | 118735 | 118736 | 118737 | 119277 | 119308 | 119327 | 119328 | 119329 | 119383 | 119384 | 119386 | 119624 | 119725 | 119748 | 120224