From 00a552d270002db4766bbd2bdddd25e556ce9dcd Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 9 Mar 2022 12:23:07 +0000 Subject: [PATCH] Bug 25936: (follow-up) Rename notice and fix indentation This patch renames the notice from PASSCHANGE to PASSWORD_CHANGE which is both clearer and more consistent. It also fixes the indentation issues mentioned in the atomicupdate. Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi --- installer/data/mysql/atomicupdate/bug_25936.pl | 11 +++-------- installer/data/mysql/en/mandatory/sample_notices.yml | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_25936.pl b/installer/data/mysql/atomicupdate/bug_25936.pl index ded356bc6b..973fd232e1 100755 --- a/installer/data/mysql/atomicupdate/bug_25936.pl +++ b/installer/data/mysql/atomicupdate/bug_25936.pl @@ -7,15 +7,10 @@ return { my ($args) = @_; my ($dbh, $out) = @$args{qw(dbh out)}; - # Add PASSCHANGE notice + # Add PASSWORD_CHANGE notice $dbh->do( q{ - INSERT IGNORE INTO letter (module, code, name, title, content, message_transport_type) VALUES ('members', 'PASSCHANGE', 'Notification of password change', 'Library account password change notification', - "Dear [% borrower.firstname %] [% borrower.surname %], - - Someone has changed your library user account password. - - If this is unexpected, please contact the library. - ", 'email'); + INSERT IGNORE INTO letter (module, code, name, title, content, message_transport_type) VALUES ('members', 'PASSWORD_CHANGE', 'Notification of password change', 'Library account password change notification', + "Dear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nSomeone has changed your library user account password.\r\n\r\nIf this is unexpected, please contact the library.", 'email'); }); # Add systempreference diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml index e58b67891c..935f5bae65 100644 --- a/installer/data/mysql/en/mandatory/sample_notices.yml +++ b/installer/data/mysql/en/mandatory/sample_notices.yml @@ -1077,7 +1077,7 @@ tables: - "If you did not initiate this request, you may safely ignore this one-time message. The request will expire shortly." - module: members - code: PASSCHANGE + code: PASSWORD_CHANGE branchcode: "" name: "Notification of password change" is_html: 1 -- 2.39.5