From 00ac3790bcb6757d1a770c1981eef4062f205f37 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Wed, 14 Jul 2021 14:42:30 +0000 Subject: [PATCH] Bug 27944: (follow-up) Improving consistency between notice names Content-Type: text/plain; charset=utf-8 --- installer/data/mysql/atomicupdate/bug_27944.perl | 4 ++-- installer/data/mysql/en/mandatory/sample_notices.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_27944.perl b/installer/data/mysql/atomicupdate/bug_27944.perl index 89e004d753..bc6489fd78 100644 --- a/installer/data/mysql/atomicupdate/bug_27944.perl +++ b/installer/data/mysql/atomicupdate/bug_27944.perl @@ -10,7 +10,7 @@ if ( CheckVersion($DBversion) ) { q{ UPDATE `letter` SET `code` = 'AR_REQUESTED', - `name` = 'Article requested' + `name` = REPLACE(name, '- open', '- new') WHERE `module` = 'circulation' AND `code` = 'AR_PENDING' } @@ -19,7 +19,7 @@ if ( CheckVersion($DBversion) ) { $dbh->do( q{ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`) VALUES - ('circulation', 'AR_PENDING', '', 'Article request - open', 0, 'Pending article request', 'Dear <> <> (<>)\r\n\r\nYour request for an article from <> (<>) is now in pending state.\r\n\r\nArticle requested:\r\nTitle: <>\r\nAuthor: <>\r\nVolume: <>\r\nIssue: <>\r\nDate: <>\r\nPages: <>\r\nChapters: <>\r\nNotes: <>\r\n\r\n\r\nThank you!', 'email') + ('circulation', 'AR_PENDING', '', 'Article request - pending', 0, 'Pending article request', 'Dear <> <> (<>)\r\n\r\nYour request for an article from <> (<>) is now in pending state.\r\n\r\nArticle requested:\r\nTitle: <>\r\nAuthor: <>\r\nVolume: <>\r\nIssue: <>\r\nDate: <>\r\nPages: <>\r\nChapters: <>\r\nNotes: <>\r\n\r\n\r\nThank you!', 'email') } ); diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml index eef498e3b5..450e9cc9a0 100644 --- a/installer/data/mysql/en/mandatory/sample_notices.yml +++ b/installer/data/mysql/en/mandatory/sample_notices.yml @@ -278,7 +278,7 @@ tables: - module: circulation code: AR_PENDING branchcode: "" - name: "Article request - open" + name: "Article request - pending" is_html: 0 title: "Pending article request" message_transport_type: email @@ -304,7 +304,7 @@ tables: - module: circulation code: AR_REQUESTED branchcode: "" - name: "Article requested" + name: "Article request - new" is_html: 0 title: "Article request received" message_transport_type: email -- 2.20.1