From 445df24e0c5b5b4b6bfedb058253de3be9920cfd Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
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.
---
 Koha/Patron.pm                                       |  2 +-
 installer/data/mysql/atomicupdate/bug_25936.pl       | 11 +++--------
 installer/data/mysql/en/mandatory/sample_notices.yml |  2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Koha/Patron.pm b/Koha/Patron.pm
index d8197e5ba6..28accf3322 100644
--- a/Koha/Patron.pm
+++ b/Koha/Patron.pm
@@ -886,7 +886,7 @@ sub set_password {
                 eval {
                     my $letter = GetPreparedLetter(
                         module      => 'members',
-                        letter_code => 'PASSCHANGE',
+                        letter_code => 'PASSWORD_CHANGE',
                         branchcode  => $self_from_storage->branchcode,
                         ,
                         lang   => $self_from_storage->lang || 'default',
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 d54b24c330..9ace2071cd 100644
--- a/installer/data/mysql/en/mandatory/sample_notices.yml
+++ b/installer/data/mysql/en/mandatory/sample_notices.yml
@@ -1025,7 +1025,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.20.1