Bugzilla – Attachment 182907 Details for
Bug 37344
Patrons with cancelled discharge are seen as discharged when suspended due to overdue
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 37344: (follow-up) Fix wording for messages
Bug-37344-follow-up-Fix-wording-for-messages.patch (text/plain), 4.34 KB, created by
Baptiste Wojtkowski (bwoj)
on 2025-06-02 12:03:41 UTC
(
hide
)
Description:
Bug 37344: (follow-up) Fix wording for messages
Filename:
MIME Type:
Creator:
Baptiste Wojtkowski (bwoj)
Created:
2025-06-02 12:03:41 UTC
Size:
4.34 KB
patch
obsolete
>From cd19d28888e89e633c74fec769b7d1d7f1ab7bbe Mon Sep 17 00:00:00 2001 >From: David Nind <david@davidnind.com> >Date: Fri, 23 May 2025 00:45:20 +0000 >Subject: [PATCH] Bug 37344: (follow-up) Fix wording for messages > >This fixes the wording for some messages. > >Signed-off-by: David Nind <david@davidnind.com> >Signed-off-by: Baptiste Wojtkowski <baptiste.wojtkowski@biblibre.com> >--- > installer/data/mysql/atomicupdate/bug_37344.pl | 4 ++-- > .../prog/en/modules/admin/authorised_values.tt | 2 +- > .../intranet-tmpl/prog/en/modules/members/discharge.tt | 6 +++--- > 3 files changed, 6 insertions(+), 6 deletions(-) > >diff --git a/installer/data/mysql/atomicupdate/bug_37344.pl b/installer/data/mysql/atomicupdate/bug_37344.pl >index 7e6e30d7..f818e988 100755 >--- a/installer/data/mysql/atomicupdate/bug_37344.pl >+++ b/installer/data/mysql/atomicupdate/bug_37344.pl >@@ -27,8 +27,8 @@ return { > $dbh->do( > q{ > INSERT IGNORE INTO authorised_values (category, authorised_value, lib) VALUES >- ('DISCHARGE_CANCELLATION','PATRON_MISTAKE', 'Patron asked a discharge by mistake'), >- ('DISCHARGE_CANCELLATION','PATRON_STILL_NEEDS_ACCOUNT','Administration required a discharge however the patron still needs to use their account') >+ ('DISCHARGE_CANCELLATION','PATRON_MISTAKE', 'The patron asked for a discharge by mistake.'), >+ ('DISCHARGE_CANCELLATION','PATRON_STILL_NEEDS_ACCOUNT','A discharge was required, however the patron still needs to use their account.') > } > ); > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >index e2633573..7e401810 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >@@ -514,7 +514,7 @@ > [% CASE 'AR_CANCELLATION' %] > <p>Reasons why an article request might have been cancelled</p> > [% CASE 'DISCHARGE_CANCELLATION' %] >- <p>Reasons why a discharge can be cancelled</p> >+ <p>Reasons for cancelling a discharge</p> > [% CASE 'HSBND_FREQ' %] > <p>Frequencies used by the housebound module. They are displayed on the housebound tab in the patron account in staff.</p> > [% CASE 'ITEMTYPECAT' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt >index a67114c7..39f96fda 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt >@@ -87,7 +87,7 @@ > <th>Requested</th> > <th>Validated</th> > <th>Cancelled</th> >- <th>Reason of cancellation</th> >+ <th>Reason cancelled</th> > <th>Cancel</th> > </tr> > </thead> >@@ -126,7 +126,7 @@ > <div class="modal-dialog modal-lg"> > <div class="modal-content"> > <div class="modal-header"> >- <h1 class="modal-title" id="cancelModalLabel">Confirm deletion</h1> >+ <h1 class="modal-title" id="cancelModalLabel">Confirm cancellation</h1> > <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> > </div> > <form id="cancel_modal_form" method="post" action="discharge.pl"> >@@ -135,7 +135,7 @@ > <input name="op" type="hidden" value="cud-cancel-discharge" /> > <div id="cancel_discharge_alert" class="alert alert-danger" style="display:none;"></div> > <fieldset class="action"> >- <p>Are you sure you want to cancel this discharge ? Borrower will again have right to check out books after this.</p> >+ <p>Are you sure you want to cancel this discharge? The patron will be able to check out items again.</p> > [% SET discharge_cancellation_reasons = AuthorisedValues.GetAuthValueDropbox('DISCHARGE_CANCELLATION') %] > [% IF discharge_cancellation_reasons.count %] > <label for="cancellation-reason">Cancellation reason: </label> >-- >2.30.2
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 37344
:
179461
|
179489
|
179763
|
179826
|
179827
|
179828
|
181709
|
182647
|
182648
|
182649
|
182650
|
182747
|
182748
|
182749
|
182750
|
182751
| 182907