@@ -, +, @@
---
installer/data/mysql/atomicupdate/bug_30237.pl | 2 +-
installer/data/mysql/en/mandatory/sample_notices.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--- a/installer/data/mysql/atomicupdate/bug_30237.pl
+++ a/installer/data/mysql/atomicupdate/bug_30237.pl
@@ -8,7 +8,7 @@ return {
my ($dbh, $out) = @$args{qw(dbh out)};
# Add WELCOME notice
$dbh->do( q{
- INSERT IGNORE INTO letter (module, code, name, is_html, title, content, message_transport_type) VALUES ('members', 'WELCOME', 'Welcome notice', 1, "[% USE Koha %]Welcome to [% Koha.Preference('LibraryName') %]", "[% USE Koha %]\r\nHello [% borrower.title %] [% borrower.firstname %] [% borrower.surname %].\r\n\r\nThank you for joining [% Koha.Preference('LibraryName') %]\r\n\r\nYou can search for all our materials in our catalog.\r\n\r\nYour library card number is [% borrower.cardnumber %]\r\n\r\nIf you have any problems or questions regarding your account, please contact the library.", 'email');});
+ INSERT IGNORE INTO letter (module, code, name, is_html, title, content, message_transport_type) VALUES ('members', 'WELCOME', 'Welcome notice', 1, "[% USE Koha %]Welcome to [% IF Koha.Preference('LibraryName') %][% Koha.Preference('LibraryName') %][% ELSE %]the library[% END %]", "[% USE Koha %]\r\nHello [% borrower.title %] [% borrower.firstname %] [% borrower.surname %].\r\n\r\nThank you for joining [% IF Koha.Preference('LibraryName') %][% Koha.Preference('LibraryName') %][% ELSE %]the library[% END %]\r\n\r\nYou can search for all our materials in our catalog.\r\n\r\nYour library card number is [% borrower.cardnumber %]\r\n\r\nIf you have any problems or questions regarding your account, please contact the library.", 'email');});
# Update system preference
$dbh->do( q{
--- a/installer/data/mysql/en/mandatory/sample_notices.yml
+++ a/installer/data/mysql/en/mandatory/sample_notices.yml
@@ -1068,14 +1068,14 @@ tables:
branchcode: ""
name: "Welcome notice "
is_html: 1
- title: "[% USE Koha %]Welcome to [% Koha.Preference('LibraryName') %]"
+ title: "[% USE Koha %][% IF Koha.Preference('LibraryName') %]Welcome to [% Koha.Preference('LibraryName') %][% ELSE %]Welcome to the library[% END %]"
message_transport_type: email
lang: default
content:
- "[% USE Koha %]"
- "Hello [% borrower.title %] [% borrower.firstname %] [% borrower.surname %]."
- ""
- - "Thankyou for joining [% Koha.Preference('LibraryName') %]"
+ - "Thankyou for joining [% IF Koha.Preference('LibraryName') %][% Koha.Preference('LibraryName') %][% ELSE %]the library[% END %]"
- ""
- "You can search for all our materials in our catalog."
- ""
--