From eb796f4eb8c5b0c3a7cd29fdd32e250d88166350 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Tue, 20 Feb 2018 21:33:10 +0000 Subject: [PATCH] Bug 19794: Rename RLIST notice to SERIAL_ALERT to better reflect its purpose The RLIST sample notice is used to send an email to patrons who have subscribed to be notified when a new issue for a subscription arrives. This is a feature that is totally independent and not related to the use of routing lists. In the GUI however, this was misleading so far. - Rename RLIST to SERIAL_ALERT and fixes the sample notices - Fix explanations in the helf files - Fix name of the module in letters from 'serials (routing list)' to 'serials (new issue)' Note: There is no logic to be changed as the notice template to be used is defined for each subscriptions and this is just the sample notice. I've also opted against a database update, to not interfere with existing installations, reports etc. A patch to the manual will be submitted shortly after this passes QA. Signed-off-by: Brendan Gallagher Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart --- installer/data/mysql/de-DE/mandatory/sample_notices.sql | 2 +- installer/data/mysql/en/mandatory/sample_notices.sql | 2 +- installer/data/mysql/es-ES/mandatory/sample_notices.sql | 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/it-IT/necessari/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/ru-RU/optional/sample_notices.sql | 2 +- installer/data/mysql/uk-UA/mandatory/sample_notices.sql | 2 +- .../prog/en/modules/help/serials/subscription-add.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt | 4 ++-- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/installer/data/mysql/de-DE/mandatory/sample_notices.sql b/installer/data/mysql/de-DE/mandatory/sample_notices.sql index e4c82a65fe..839bd9ea7a 100644 --- a/installer/data/mysql/de-DE/mandatory/sample_notices.sql +++ b/installer/data/mysql/de-DE/mandatory/sample_notices.sql @@ -2,7 +2,7 @@ INSERT INTO `letter` (module, code, name, title, content, message_transport_type VALUES ('circulation','ODUE','Mahnung','Mahnung','Liebe/r <> <>,\n\nNach unseren Unterlagen haben Sie Medien entliehen, die nun überfällig geworden sind. Unsere Bibliothek erhebt keine Mahngebühren, bitte geben Sie die entliehenen Medien schnellstmöglich zurück.\n\n<>\n<>\n<> <>\nTelefon: <>\nFax: <>\nEmail: <>\n\nSie können die überfälligen Medien soweit möglich auch direkt über Ihr Benutzerkonto online verlängern. Wenn ein Medium länger als 30 Tage überfällig ist, wird Ihr Benutzeraccount gesperrt und Sie können keine Medien mehr entleihen.\n\nDie folgenden Medien sind zur Zeit überfällig:\n\n"<>" von <>, <>, Barcode: <> Gebühr: <>\n\nVielen Dank für die schnelle Erledigung.\n\n< Ihr Bibliotheksteam\n', 'email'), ('claimacquisition','ACQCLAIM','Reklamation (Erwerbung)','Titel nicht eingetroffen','<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n\r\nOrdernumber <> (<>) (<> bestellt) (je $<> €) sind nicht eingetroffen.', 'email'), ('orderacquisition','ACQORDER','Bestellung (Erwerbung)','Bestellung','<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n\r\nBitte bestellen Sie für die Bibliothek:\r\n\r\nBestelnummer <> (<>) (Anzahl: <>) (je <>).\r\n\r\nVielen Dank,\n\n<>', 'email'), -('serial','RLIST','Neues Heft zugegangen','Zeitschrift ist jetzt verfügbar','<> <>,\r\n\r\nDas folgende Heft ist jetzt verfügbar:\r\n\r\n<>, <> (<>)\r\n\r\nBitte holen Sie es sobald möglich ab.', 'email'), +('serial','SERIAL_ALERT','Neues Heft zugegangen','Zeitschrift ist jetzt verfügbar','<> <>,\r\n\r\nDas folgende Heft ist jetzt verfügbar:\r\n\r\n<>, <> (<>)\r\n\r\nBitte holen Sie es sobald möglich ab.', 'email'), ('members','ACCTDETAILS','Kontoinformationen - Standard','Ihr neues Benutzerkonto','Liebe/r <> <> <>.\r\n\r\nDie Daten Ihres neuen Benutzerkontos sind:\r\n\r\nBenutzer: <>\r\nPasswort: <>\r\n\r\nWenn Sie Probleme in Hinsicht auf Ihr Benutzerkonto haben, wenden Sie sich bitte an die Bibliothek.\r\n\r\nVielen Dank,\r\nIhr Bibliotheksteam', 'email'), ('circulation','DUE','Fälligkeitsbenachrichtigung','Fälligkeitsbenachrichtigung','Liebe/r <> <>,\r\n\r\nDie folgenden Medien sind ab heute fällig:\r\n\r\n<>, <> (<>)', 'email'), ('circulation','DUEDGST','Fälligkeitsbenachrichtigung (Zusammenfassung)','Fälligkeitsbenachrichtigung','Sie haben <> überfällige Medien.', 'email'), diff --git a/installer/data/mysql/en/mandatory/sample_notices.sql b/installer/data/mysql/en/mandatory/sample_notices.sql index 0eb0051d23..dee5836943 100644 --- a/installer/data/mysql/en/mandatory/sample_notices.sql +++ b/installer/data/mysql/en/mandatory/sample_notices.sql @@ -2,7 +2,7 @@ INSERT INTO `letter` (module, code, name, title, content, message_transport_type VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <> <>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<>\n<>\n<> <>\nPhone: <>\nFax: <>\nEmail: <>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n"<>" by <>, <>, Barcode: <> Fine: <>\n\nThank-you for your prompt attention to this matter.\n\n<> Staff\n', 'email'), ('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n\r\nOrdernumber <> (<>) (<> ordered) ($<> each) has not been received.', 'email'), ('orderacquisition','ACQORDER','Acquisition order','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'), -('serial','RLIST','Routing List','Serial is now available','<> <>,\r\n\r\nThe following issue is now available:\r\n\r\n<>, <> (<>)\r\n\r\nPlease pick it up at your convenience.', 'email'), +('serial','SERIAL_ALERT','New serial issue','New serial issue is now available','<> <>,\r\n\r\nThe following issue is now available:\r\n\r\n<>, <> (<>)\r\n\r\nPlease pick it up at your convenience.', 'email'), ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <> <> <>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser: <>\r\nPassword: <>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin@yoursite.org', 'email'), ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <> <>,\r\n\r\nThe following item is now due:\r\n\r\n<>, <> (<>)', 'email'), ('circulation','DUEDGST','Item Due Reminder (Digest)','Item Due Reminder','You have <> items due', 'email'), diff --git a/installer/data/mysql/es-ES/mandatory/sample_notices.sql b/installer/data/mysql/es-ES/mandatory/sample_notices.sql index 0494eab0c8..0cf9d7ebe9 100644 --- a/installer/data/mysql/es-ES/mandatory/sample_notices.sql +++ b/installer/data/mysql/es-ES/mandatory/sample_notices.sql @@ -2,7 +2,7 @@ INSERT INTO `letter` (module, code, name, title, content, message_transport_type VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <> <>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<>\n<>\n<> <>\nPhone: <>\nFax: <>\nEmail: <>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n"<>" by <>, <>, Barcode: <> Fine: <>\n\nThank-you for your prompt attention to this matter.\n\n<> Staff\n', 'email'), ('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n\r\nOrdernumber <> (<>) (<> ordered) ($<> each) has not been received.', 'email'), ('orderacquisition','ACQORDER','Acquisition order','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'), -('serial','RLIST','Routing List','Serial is now available','<> <>,\r\n\r\nThe following issue is now available:\r\n\r\n<>, <> (<>)\r\n\r\nPlease pick it up at your convenience.', 'email'), +('serial','SERIAL_ALERT','New serial issue','New serial issue is now available','<> <>,\r\n\r\nThe following issue is now available:\r\n\r\n<>, <> (<>)\r\n\r\nPlease pick it up at your convenience.', 'email'), ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <> <> <>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser: <>\r\nPassword: <>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin@yoursite.org', 'email'), ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <> <>,\r\n\r\nThe following item is now due:\r\n\r\n<>, <> (<>)', 'email'), ('circulation','DUEDGST','Item Due Reminder (Digest)','Item Due Reminder','You have <> items due', 'email'), diff --git a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql b/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql index 4e46a769c5..af377bf3b1 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 à <>','Bonjour <> <>,\r\n\r\nVotre réservation est disponible depuis le <> :\r\n\r\nTitre : <>\r\nAuteur : <>\r\nCopie : <>\r\nLocalisation : <>\r\n<>\r\n<>\r\n<>\r\n<> <>\r\n\r\nNous vous invitons à venir emprunter votre document rapidement.\r\n\r\nMerci.\r\n\r\n<>','email'), ('reserves','HOLD','','Réservation en attente de retrait',0,'Réservation en attente de retrait à <>','Bonjour <> <>,\r\n\r\nVotre réservation est disponible depuis le <> :\r\n\r\nTitre : <>\r\nAuteur : <>\r\nCopie : <>\r\nLocalisation : <>\r\n<>\r\n<>\r\n<>\r\n<> <>\r\n\r\nNous vous invitons à venir emprunter votre document rapidement.\r\n\r\nMerci.\r\n\r\n<>','print'), ('reserves','HOLDPLACED','','Réservation sur un document',0,'Un document a été réservé','Le document suivant a été réservé : \r\n<> (<>) par l\'adhérent <> <> (<>).','email'), -('serial','RLIST','','Liste de circulation',0,'Le nouveau numéro de <> est disponible','Bonjour <> <>,\r\n\r\nLe nouveau numéro de <> est disponible.\r\n\r\nVous pouvez venir à la bilbliothèque pour le consulter.\r\n\r\nMerci.\r\n\r\n<>','email'), +('serial','SERIAL_ALERT','','Liste de circulation',0,'Le nouveau numéro de <> est disponible','Bonjour <> <>,\r\n\r\nLe nouveau numéro de <> est disponible.\r\n\r\nVous pouvez venir à la bilbliothèque pour le consulter.\r\n\r\nMerci.\r\n\r\n<>','email'), ('suggestions','ACCEPTED','','Suggestion d\'achat acceptée',0,'Suggestion d\'achat acceptée','Bonjour <> <>,\r\n\r\nVous nous avez suggéré l\'achat du document <> par <>.\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 : <>.\r\n\r\nMerci.\r\n\r\n<>','email'), ('suggestions','AVAILABLE','','Suggestion d\'achat disponible',0,'Suggestion d\'achat disponible','Bonjour <> <>,\r\n\r\nVous nous avez suggéré l\'achat du document <> par <>.\r\n\r\nNous avons le plaisir de vous informer que le document fait aujourd\'hui partie de nos collection et qu\'il est disponible à la bibliothèque.\r\n\r\nPour toute question, veuillez nous contacter à l\'adresse suivante : <>.\r\n\r\nMerci.\r\n\r\n<>','email'), ('suggestions','ORDERED','','Suggestion d\'achat commandée',0,'Suggestion d\'achat commandée','Bonjour <> <>,\r\n\r\nVous nous avez suggéré l\'achat du document <> par <>.\r\n\r\nNous avons le plaisir de vous informer que le document a été commandé.\r\n\r\nVous recevrez une nouvelle notification quand le document sera disponible à bibliothèque.\r\n\r\nPour toute question, veuillez nous contacter à l\'adresse suivante : <>.\r\n\r\nMerci.\r\n\r\n<>','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 40deae3ec3..312f4da9e9 100644 --- a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql @@ -4,7 +4,7 @@ VALUES ('circulation','ODUE','Avis de retard','Document en retard','Cher(e) <> <>,\n\nSelon nos informations actuelles, vous avez des documents signalés en retard dans votre compte.La Bibliothèque n\'applique pas les pénalités, mais nous vous invitons à retourner ou renouveler ces documents au plus vite dans la Bibliothèque suivante.\n\n<>\n<>\n<> <>\nTéléphone: <>\nFax: <>\nCourriel: <>\n\nSi vous possédez un identifiant et un mot de passe pour vous connecter à notre catalogue en ligne,vous pouvez depuis celui-ci prolonger la durée de prêt des documents. Si les documents ont plus de 3à jours de retard, vous ne pourrez plus utiliser votre carte d\'adhérent tant que les documents ne seront pas rendus.\n\nLe(s) document(s) actuellement en retard:\n\n"<>" de <>, <>, Code barres: <> Pénalité: <>\n\nAvec nos remerciements.\n\n<> La banque de prêt\n', 'email'), ('claimacquisition','ACQCLAIM','Réclamation Acquisitions','Document non reçu','<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n\r\nCommande <> (<>) (<> ordered) ($<> each) pas encore reçue.', 'email'), ('orderacquisition','ACQORDER','Acquisition order','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'), -('serial','RLIST','Liste de routage','Fascicule de périodique disponible','<> <>,\r\n\r\nLe numéro suivant est disponible:\r\n\r\n<>, <> (<>)\r\n\r\nVous pouvez venir le retirer quand vous voulez.', 'email'), +('serial','SERIAL_ALERT','Liste de routage','Fascicule de périodique disponible','<> <>,\r\n\r\nLe numéro suivant est disponible:\r\n\r\n<>, <> (<>)\r\n\r\nVous pouvez venir le retirer quand vous voulez.', 'email'), ('members','ACCTDETAILS','Nouveau compte adhérent','Votre nouveau compte adhérent.','Bonjour <> <> <>.\r\n\r\nLes informations de votre nouveau compte sont:\r\n\r\nIdentifiant: <>\r\nMot de passe: <>\r\n\r\nSi vous avez des questions au sujet de votre nouveau compte, merci de prendre contact à l\'acceuil de la Bibliothèque.\r\n\r\nMerci,\r\nLa Bibliothèque\r\nkohaadmin@yoursite.org', 'email'), ('circulation','DUE','Document à rendre ','Document à rendre','Cher(e) <> <>,\r\n\r\nLe document suivant doit être rendu aujourd\'hui:\r\n\r\n<>, <> (<>)', 'email'), ('circulation','DUEDGST','Document à rendre (résumé)','Document à rendre','Vous avez <> document(s) à rendre', 'email'), diff --git a/installer/data/mysql/it-IT/necessari/notices.sql b/installer/data/mysql/it-IT/necessari/notices.sql index 223db63d61..5fdc6094f1 100644 --- a/installer/data/mysql/it-IT/necessari/notices.sql +++ b/installer/data/mysql/it-IT/necessari/notices.sql @@ -2,7 +2,7 @@ INSERT INTO letter (module, code, name, title, content, message_transport_type) VALUES ('circulation','ODUE','Avviso per i ritardi','Avviso per i ritardi','Salve <> <>,\n\nSecondo le nostre registrazioni, hai dei prestiti in ritard.La biblioteca non dà multe per i ritardi, ma ti chiederemmo di restituirli o di rinnovarli il prima possibile presso la biblioteca:\n\n<>\n<>\n<> <>\nTel:: <>\nFax: <>\nEmail: <>\n\nSe ti sei registrato e hai una login con una password e quei prestiti sono rinnovabili, puoi provare a rinnovarli online. Se il prestito ha un ritardo superiore a 30 giorni, probabilmente non puoi rinnovarli.\n\nRisultano in ritardo:\n\n"<>" di <>, <>, codice a barre: <> Multa: <>\n\nGrazie per l\'attenzione.\n\nLo staff della <> \n', 'email'), ('claimacquisition','ACQCLAIM','Sollecito al fornitore','Sollecito al fornitore','Salve <>\r\n<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n\r\n Questi ordini non ci sono giunti:\r\n\r\nOrdernumber <> (<>) (<> ordinati) ($<> l\'uno).', 'email'), ('orderacquisition','ACQORDER','Ordine da ACQ','Ordine','<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n\r\nLe chiediamo di ordinare questi libri per la biblioteca:\r\n\r\nNumero ordine <> (<>) (quantità: <>) (<> EUR l\'uno).\r\n\r\nGrazie,\n\n<>', 'email'), -('serial','RLIST','Routing List','Routing List','Caro <> <>,\r\n\r\nQuesta pubblicazione è ora disponibile:\r\n\r\n<>, <> (<>)\r\n\r\nPassa a prenderla presso il banco distribuzione.', 'email'), +('serial','SERIAL_ALERT','New serial issue','New serial issue is now available','Caro <> <>,\r\n\r\nQuesta pubblicazione è ora disponibile:\r\n\r\n<>, <> (<>)\r\n\r\nPassa a prenderla presso il banco distribuzione.', 'email'), ('members','ACCTDETAILS','Messaggio per i nuovi utenti registrati','Messaggio per i nuovi utenti registrati.','Salve <> <> <>.\r\n\r\nI dettagli del tuo nuovo account per la biblioteca sono:\r\n\r\nLogin: <>\r\nPassword: <>\r\n\r\nSe hai domande o problemi sul tuo account, contattaci a questo indirizzo e-mail: youremailadmin@library.it.\r\nGrazie di tutto\r\n\r\nLo staff della biblioteca\r\n', 'email'), ('circulation','DUE','Avviso restituzione (copia singola)','Avviso restituzione (copia singola)','Salve <> <>,\r\n\r\nQuesto prestito è ora in ritardo:\r\n\r\n<>, <> (<>)', 'email'), ('circulation','DUEDGST','Avviso restituzione (digest)','Avviso restituzione (digest)','Hai <> prestiti da retituire', '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 e707dc2ff7..6ac9cb4dba 100644 --- a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql +++ b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql @@ -24,7 +24,7 @@ INSERT INTO letter (module, code, name, title, content, message_transport_type) VALUES ('circulation','ODUE','Purring','Purring på dokument','<> <>,\n\nDu har lån som skulle vært levert. Biblioteket krever ikke inn gebyrer, men vennligst lever eller forny lånet/lånene ved biblioteket.\n\n<>\n<>\n<> <>\nTelefon: <>\nFax: <>\nE-post: <>\n\nDersom du har et passord og lånet/lånene kan fornyes kan du gjøre dette på nettet. Dersom du overskrider lånetiden med mer enn 30 dager vil lånekortet bli sperret.\n\nFølgende lån har gått over tiden:\n\n"<>" av <>, <>, Strekkode: <> Gebyr: <>\n\nPå forhånd takk.\n\n<>\n', 'email'), ('claimacquisition','ACQCLAIM','Periodikapurring','Eksemplar ikke mottatt','<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n\r\nBestillingsnummer <> (<>) (<> ordered) ($<> each) har ikke blitt mottatt.', 'email'), ('orderacquisition','ACQORDER','Acquisition order','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'), -('serial','RLIST','Sirkulasjon','Et dokument er nå tilgjengelig','<> <>,\r\n\r\nDette dokumentet er tilgjengelig:\r\n\r\n<>, <> (<>)\r\n\r\nVennligst kom og hent det når det passer.', 'email'), +('serial','SERIAL_ALERT','Sirkulasjon','Et dokument er nå tilgjengelig','<> <>,\r\n\r\nDette dokumentet er tilgjengelig:\r\n\r\n<>, <> (<>)\r\n\r\nVennligst kom og hent det når det passer.', 'email'), ('members','ACCTDETAILS','Mal for kontodetaljer - STANDARD','Dine nye kontodetaljer i Koha.','Hei <> <> <>.\r\n\r\nDine nye detaljer er:\r\n\r\nBruker: <>\r\nPassord: <>\r\n\r\nDersom det oppstår problemer, vennligst kontakt biblioteket.\r\n\r\nVennlig hilsen,\r\nBiblioteket\r\nkohaadmin@yoursite.org', 'email'), ('circulation','DUE','Innleveringspåminnelse','Innleveringspåminnelse','<> <>,\r\n\r\nDette dokumentet må nå leveres:\r\n\r\n<>, <> (<>)', 'email'), ('circulation','DUEDGST','Innleveringspåminnelse (sammendrag)','Innleveringspåminnelse','Du har <> dokumenter som skulle vært levert.', 'email'), diff --git a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql index 08317e006b..f44f1c0370 100644 --- a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql +++ b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql @@ -2,7 +2,7 @@ INSERT INTO `letter` (module, code, name, title, content, message_transport_type VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <> <>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<>\n<>\n<> <>\nPhone: <>\nFax: <>\nEmail: <>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n"<>" by <>, <>, Barcode: <> Fine: <>\n\nThank-you for your prompt attention to this matter.\n\n<> Staff\n', 'email'), ('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n\r\nOrdernumber <> (<>) (<> ordered) ($<> each) has not been received.', 'email'), ('orderacquisition','ACQORDER','Acquisition order','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'), -('serial','RLIST','Routing List','Serial is now available','<> <>,\r\n\r\nThe following issue is now available:\r\n\r\n<>, <> (<>)\r\n\r\nPlease pick it up at your convenience.', 'email'), +('serial','SERIAL_ALERT','New serial issue','New serial issue is now available','<> <>,\r\n\r\nThe following issue is now available:\r\n\r\n<>, <> (<>)\r\n\r\nPlease pick it up at your convenience.', 'email'), ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <> <> <>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser: <>\r\nPassword: <>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin@yoursite.org', 'email'), ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <> <>,\r\n\r\nThe following item is now due:\r\n\r\n<>, <> (<>)', 'email'), ('circulation','DUEDGST','Item Due Reminder (Digest)','Item Due Reminder','You have <> items due', 'email'), diff --git a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql index def87757fc..0de34d40d5 100644 --- a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql +++ b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql @@ -2,7 +2,7 @@ INSERT INTO `letter` (module, code, name, title, content, message_transport_type VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <> <>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<>\n<>\n<> <>\nPhone: <>\nFax: <>\nEmail: <>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n"<>" by <>, <>, Barcode: <> Fine: <>\n\nThank-you for your prompt attention to this matter.\n\n<> Staff\n', 'email'), ('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n\r\nOrdernumber <> (<>) (<> ordered) ($<> each) has not been received.', 'email'), ('orderacquisition','ACQORDER','Acquisition order','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'), -('serial','RLIST','Routing List','Serial is now available','<> <>,\r\n\r\nThe following issue is now available:\r\n\r\n<>, <> (<>)\r\n\r\nPlease pick it up at your convenience.', 'email'), +('serial','SERIAL_ALERT','New serial issue','New serial issue is now available','<> <>,\r\n\r\nThe following issue is now available:\r\n\r\n<>, <> (<>)\r\n\r\nPlease pick it up at your convenience.', 'email'), ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <> <> <>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser: <>\r\nPassword: <>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin@yoursite.org', 'email'), ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <> <>,\r\n\r\nThe following item is now due:\r\n\r\n<>, <> (<>)', 'email'), ('circulation','DUEDGST','Item Due Reminder (Digest)','Item Due Reminder','You have <> items due', 'email'), diff --git a/installer/data/mysql/ru-RU/optional/sample_notices.sql b/installer/data/mysql/ru-RU/optional/sample_notices.sql index 6a76991e70..2daa407103 100644 --- a/installer/data/mysql/ru-RU/optional/sample_notices.sql +++ b/installer/data/mysql/ru-RU/optional/sample_notices.sql @@ -7,7 +7,7 @@ VALUES ('claimacquisition','ACQCLAIM','Требование приобретения','Экземпляр не получено','<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n\r\nНомер заказа <> (<>) (<> каждый) получено не было.', 'email'), -('serial','RLIST','Список скерування','Сериальные издания уже доступное','<> <>,\r\n\r\nСледующий выпуск уже доступен:\r\n\r\n<>\r\n\r\nПросьба забрать его в любое удобное для Вас время.', 'email'), +('serial','SERIAL_ALERT','Список скерування','Сериальные издания уже доступное','<> <>,\r\n\r\nСледующий выпуск уже доступен:\r\n\r\n<>\r\n\r\nПросьба забрать его в любое удобное для Вас время.', 'email'), ('members','ACCTDETAILS','Шаблон данных учетной записи - типовые','Данные Вашего нового учетного счета в Коха.','Hello <> <> <>.\r\n\r\nДанные Вашего нового учетного счета в Коха такие:\r\n\r\nПользователь: <>\r\nПароль: <>\r\n\r\nЕсли у Вас возникли проблемы или вопросы по поводу Вашей учетной записи, пожалуйста, свяжитесь с администратором Коха.\r\n\r\nСпасибо,\r\nадминистратор Koha\r\nkohaadmin@yoursite.org', 'email'), diff --git a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql index 0e018301c6..4664e06712 100644 --- a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql +++ b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql @@ -14,7 +14,7 @@ INSERT INTO `letter` (module, code, name, title, content, message_transport_type '<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n\r\n Будь ласка, замовляйте для бібліотеки:\r\n\r\nНомер замовлення <> (<>) (кількість: <>) ($<> кожний).\r\n\r\n Спасибі,\n\n<>', 'email'), -('serial','RLIST','список скерування', 'Серіальне видання вже доступне', +('serial','SERIAL_ALERT','список скерування', 'Серіальне видання вже доступне', '<> <>,\r\n\r\nНаступний випуск вже доступний:\r\n\r\n<> / <> (<>)\r\n\r\n Прохання забрати його в будь-який зручний для Вас час.', 'email'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-add.tt index a647f394fb..e169ec82ee 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-add.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-add.tt @@ -36,7 +36,7 @@
  • The 'Patron notification' option lets you pick a notice to send to patrons who subscribe to updates on this serial via the OPAC.
      -
    • For this option to appear you need to make sure that you have a Routing List notice set up in the Notices Tool
    • +
    • For this option to appear you need to make sure that you have a New serial issue notice set up in the Notices Tool
  • 'Location' is for the shelving location
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt index b5fe9e052a..8e7abb02e2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt @@ -238,7 +238,7 @@ Barcode: <<items.barcode>> , Checkout date: -
  • RLIST (Routing List) +
  • SERIAL_ALERT (New serial issue)
    • Used in the serials module to notify patrons/staff of new issues of a serial
        diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt index 27e454404d..d7cfab2862 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt @@ -238,9 +238,9 @@ [% END %] [% IF ( module == "serial" ) %] - + [% ELSE %] - + [% END %] [% IF ( module == "suggestions" ) %] -- 2.39.5