Bugzilla – Attachment 192082 Details for
Bug 30295
Send a notification when a recall is manually canceled
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30295: (follow-up) Spelling: Update cancelled to canceled
Bug-30295-follow-up-Spelling-Update-cancelled-to-c.patch (text/plain), 8.37 KB, created by
Katrin Fischer
on 2026-01-27 07:07:50 UTC
(
hide
)
Description:
Bug 30295: (follow-up) Spelling: Update cancelled to canceled
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2026-01-27 07:07:50 UTC
Size:
8.37 KB
patch
obsolete
>From fba6e6e70291ad18a37b8a2e9c0ed6dfe69dc355 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer.83@web.de> >Date: Mon, 26 Jan 2026 18:38:42 +0000 >Subject: [PATCH] Bug 30295: (follow-up) Spelling: Update cancelled to canceled > >According to: >https://wiki.koha-community.org/wiki/Terminology#C > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > Koha/Recall.pm | 2 +- > .../bug_30295-add_RECALL_MANUAL_CANCEL.pl | 10 +++++----- > installer/data/mysql/en/mandatory/sample_notices.yml | 12 ++++++------ > .../mandatory/sample_notices_message_attributes.sql | 2 +- > .../prog/en/includes/messaging-preference-form.inc | 4 ++-- > .../opac-tmpl/bootstrap/en/modules/opac-messaging.tt | 4 ++-- > 6 files changed, 17 insertions(+), 17 deletions(-) > >diff --git a/Koha/Recall.pm b/Koha/Recall.pm >index 7b2f88c5a3f..8ebd52ee91b 100644 >--- a/Koha/Recall.pm >+++ b/Koha/Recall.pm >@@ -485,7 +485,7 @@ sub set_cancelled { > ); > > my $messaging_preferences = C4::Members::Messaging::GetMessagingPreferences( >- { borrowernumber => $self->patron_id, message_name => 'Recall_Cancelled' } ); >+ { borrowernumber => $self->patron_id, message_name => 'Recall_Canceled' } ); > while ( my ( $transport, $letter_code ) = each %{ $messaging_preferences->{transports} } ) { > if ( $transport eq 'email' ) { > C4::Message->enqueue( $letter, $self->patron, 'email' ); >diff --git a/installer/data/mysql/atomicupdate/bug_30295-add_RECALL_MANUAL_CANCEL.pl b/installer/data/mysql/atomicupdate/bug_30295-add_RECALL_MANUAL_CANCEL.pl >index e248dd8fd1e..58f7b50643c 100755 >--- a/installer/data/mysql/atomicupdate/bug_30295-add_RECALL_MANUAL_CANCEL.pl >+++ b/installer/data/mysql/atomicupdate/bug_30295-add_RECALL_MANUAL_CANCEL.pl >@@ -9,7 +9,7 @@ return { > my ( $dbh, $out ) = @$args{qw(dbh out)}; > > $dbh->do( >- q{ INSERT IGNORE INTO message_attributes (message_attribute_id, message_name, takes_days) VALUES (14, 'Recall_Cancelled', 0) } >+ q{ INSERT IGNORE INTO message_attributes (message_attribute_id, message_name, takes_days) VALUES (14, 'Recall_Canceled', 0) } > ); > > say_success( $out, "Added RECALL_MANUAL_CANCEL to message_attributes" ); >@@ -20,15 +20,15 @@ return { > say_success( $out, "Added RECALL_MANUAL_CANCEL to message_transports" ); > > $dbh->do( >- q{ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`) VALUES ('circulation','RECALL_MANUAL_CANCEL','','Recall has been cancelled','0','Recall has been cancelled','Dear [% borrower.firstname %] [% borrower.surname %], >+ q{ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`) VALUES ('circulation','RECALL_MANUAL_CANCEL','','Recall has been canceled','0','Recall has been canceled','Dear [% borrower.firstname %] [% borrower.surname %], > >-We regret to inform you that the item you have recalled cannot be provided. Your recall was cancelled. >+We regret to inform you that the item you have recalled cannot be provided. Your recall was canceled. > > Title: [% biblio.title %] > Author: [% biblio.author %] >-Location: [% branch.branchname %]','sms'), ('circulation','RECALL_MANUAL_CANCEL','','Recall has been cancelled','0','Recall has been cancelled','Dear [% borrower.firstname %] [% borrower.surname %], >+Location: [% branch.branchname %]','sms'), ('circulation','RECALL_MANUAL_CANCEL','','Recall has been canceled','0','Recall has been canceled','Dear [% borrower.firstname %] [% borrower.surname %], > >-We regret to inform you that the item you have recalled cannot be provided. Your recall was cancelled. >+We regret to inform you that the item you have recalled cannot be provided. Your recall was canceled. > > Title: [% biblio.title %] > Author: [% biblio.author %] >diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml >index 4ad7573dc63..f11baca5e64 100644 >--- a/installer/data/mysql/en/mandatory/sample_notices.yml >+++ b/installer/data/mysql/en/mandatory/sample_notices.yml >@@ -2725,15 +2725,15 @@ tables: > - module: circulation > code: RECALL_MANUAL_CANCEL > branchcode: "" >- name: "Recall has been cancelled" >+ name: "Recall has been canceled" > is_html: 0 >- title: "Recall has been cancelled" >+ title: "Recall has been canceled" > message_transport_type: email > lang: default > content: > - "Dear [% borrower.firstname %] [% borrower.surname %]," > - "" >- - "We regret to inform you that the item you have recalled cannot be provided. Your recall was cancelled." >+ - "We regret to inform you that the item you have recalled cannot be provided. Your recall was canceled." > - "" > - "Title: [% biblio.title %]" > - "Author: [% biblio.author %]" >@@ -2742,15 +2742,15 @@ tables: > - module: circulation > code: RECALL_MANUAL_CANCEL > branchcode: "" >- name: "Recall has been cancelled" >+ name: "Recall has been canceled" > is_html: 0 >- title: "Recall has been cancelled" >+ title: "Recall has been canceled" > message_transport_type: sms > lang: default > content: > - "Dear [% borrower.firstname %] [% borrower.surname %]," > - "" >- - "We regret to inform you that the item you have recalled cannot be provided. Your recall was cancelled." >+ - "We regret to inform you that the item you have recalled cannot be provided. Your recall was canceled." > - "" > - "Title: [% biblio.title %]" > - "Author: [% biblio.author %]" >diff --git a/installer/data/mysql/mandatory/sample_notices_message_attributes.sql b/installer/data/mysql/mandatory/sample_notices_message_attributes.sql >index 34d98e6c7ae..d71d8c32a51 100644 >--- a/installer/data/mysql/mandatory/sample_notices_message_attributes.sql >+++ b/installer/data/mysql/mandatory/sample_notices_message_attributes.sql >@@ -14,4 +14,4 @@ values > (12, 'Recall_Waiting', 0), > (13, 'Recall_Requested', 0), > (14, 'Patron_Expiry', 0), >-(15, 'Recall_Cancelled', 0); >+(15, 'Recall_Canceled', 0); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc >index b27a55fe9ac..95cbe92d199 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc >@@ -57,8 +57,8 @@ > <span>Recall awaiting pickup</span> > [% ELSIF ( messaging_preference.Recall_Requested ) %] > <span>Return recalled item</span> >- [% ELSIF ( messaging_preference.Recall_Cancelled ) %] >- <span>Recall cancelled</span> >+ [% ELSIF ( messaging_preference.Recall_Canceled ) %] >+ <span>Recall canceled</span> > [% ELSE %] > <span>Unknown</span> > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt >index 4ca52d18d32..41b402b8509 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt >@@ -110,8 +110,8 @@ > <span>Recall awaiting pickup</span> > [% ELSIF ( messaging_preference.Recall_Requested ) %] > <span>Return recalled item</span> >- [% ELSIF ( messaging_preference.Recall_Cancelled ) %] >- <span>Recall cancelled</span> >+ [% ELSIF ( messaging_preference.Recall_Canceled ) %] >+ <span>Recall canceled</span> > [% ELSE %] > <span>Unknown</span> > [% END %]</td >-- >2.39.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 30295
:
131763
|
140243
|
140245
|
147108
|
148114
|
149127
|
150431
|
155347
|
155358
|
158699
|
158700
|
158701
|
159007
|
159008
|
159009
|
172038
|
172039
|
172041
|
186346
|
186347
|
186348
|
192078
|
192079
|
192080
|
192081
| 192082 |
192083
|
192084