From 94ba96441a9b27d2b992877a9e12d567e731e476 Mon Sep 17 00:00:00 2001
From: Alex Buckley
Date: Wed, 6 Apr 2022 12:40:01 +0000
Subject: [PATCH] Bug 23538: (follow-up) Fix up notices
- Add toolkit template syntax to notices
- Add translated notice
Sponsored-by: Catalyst IT
---
...lAddressForPatronRegistrations_sysprefs.pl | 20 +++++++++----------
.../mysql/en/mandatory/sample_notices.yml | 20 +++++++++----------
.../fr-FR/1-Obligatoire/sample_notices.sql | 15 ++++++++++++++
3 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/installer/data/mysql/atomicupdate/bug23538-add_EmailPatronRegistrations_and_EmailAddressForPatronRegistrations_sysprefs.pl b/installer/data/mysql/atomicupdate/bug23538-add_EmailPatronRegistrations_and_EmailAddressForPatronRegistrations_sysprefs.pl
index 55082df006..b70d5dc2a7 100755
--- a/installer/data/mysql/atomicupdate/bug23538-add_EmailPatronRegistrations_and_EmailAddressForPatronRegistrations_sysprefs.pl
+++ b/installer/data/mysql/atomicupdate/bug23538-add_EmailPatronRegistrations_and_EmailAddressForPatronRegistrations_sysprefs.pl
@@ -11,17 +11,17 @@ return {
$dbh->do(q{INSERT IGNORE INTO letter (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES ( 'members', 'OPAC_REG', '', 'New OPAC self-registration submitted', 1, 'New OPAC self-registration',
'New OPAC self-registration
- Self-registration made by
+ Self-registration made:
- - <> <>
- - Email: <>
- - Phone: <>
- - Mobile: <>
- - Fax: <>
- - Secondary email: <>
- - Secondary phone:<>
- - Home library: <>
- - Patron category: <>
+ - [% borrowers.firstname %] [% borrowers.surname %]
+ - Email: [% borrowers.email %]
+ - Phone: [% borrowers.phone %]
+ - Mobile: [% borrowers.mobile %]
+ - Fax: [% borrowers.fax %]
+ - Secondary email: [% borrowers.emailpro %]
+ - Secondary phone:[% borrowers.phonepro %]
+ - Home library: [% borrowers.branchcode %]
+ - Patron category: [% borrowers.categorycode %]
', 'email', 'default') });
},
diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml
index 953d158355..26d2c27bc6 100644
--- a/installer/data/mysql/en/mandatory/sample_notices.yml
+++ b/installer/data/mysql/en/mandatory/sample_notices.yml
@@ -1646,16 +1646,16 @@ tables:
lang: default
content:
- "New OPAC self-registration
"
- - "Self-registration made by
"
+ - "Self-registration made:
"
- ""
- - "- <> <>
"
- - "- Email: <>
"
- - "- Phone: <>
"
- - "- Mobile: <>
"
- - "- Fax: <>
"
- - "- Secondary email: <>
"
- - "- Secondary phone:<>
"
- - "- Home library: <>
"
- - "- Temporary patron category: <>
"
+ - "- [% borrowers.firstname %] [% borrowers.surname %]
"
+ - "- Email: [% borrowers.email %]
"
+ - "- Phone: [% borrowers.phone %]
"
+ - "- Mobile: [% borrowers.mobile %]
"
+ - "- Fax: [% borrowers.fax %]
"
+ - "- Secondary email: [% borrowers.emailpro %]
"
+ - "- Secondary phone: [% borrowers.phonepro %]
"
+ - "- Home library: [% borrowers.branchcode %]
"
+ - "- Temporary patron category: [% borrowers.categorycode %]
"
- "
"
- ""
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 fa662135bb..79b64b01aa 100644
--- a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
@@ -503,3 +503,18 @@ INSERT IGNORE INTO letter (module, code, name, title, content, message_transport
[% END %]
[% END %]
", 'email');
+
+INSERT IGNORE INTO letter (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES ( 'members', 'OPAC_REG', '', 'New OPAC self-registration submitted', 1, 'New OPAC self-registration','New OPAC self-registration
+ Self-registration made:
+
+ - [% borrowers.firstname %] [% borrowers.surname %]
+ - Email: [% borrowers.email %]
+ - Phone: [% borrowers.phone %]
+ - Mobile: [% borrowers.mobile %]
+ - Fax: [% borrowers.fax %]
+ - Secondary email: [% borrowers.emailpro %]
+ - Secondary phone:[% borrowers.phonepro %]
+ - Home library: [% borrowers.branchcode %]
+ - Patron category: [% borrowers.categorycode %]
+
+ ', 'email', 'default')
--
2.20.1