gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 31122: Terminology - Replace occurences of 'Notices & slips' with 'Notices and slips' 

Replace occurences of 'Notices & slips' with 'Notices and slips'
(replacing '&' and '&amp' with 'and'), as per the terminology
guidelines.

See the terminology list:
https://wiki.koha-community.org/wiki/Terminology

Test plan:
1. Find occurrences of 'Notices & slips':
   - git grep 'Notices & slips' -- :^misc/translator/po
   - git grep 'Notices & slips'
2. Review places in the staff interface where 'Messages & slips' is
   displayed:
   - Tools home page
   - Tools > Notices & slips: page title and breadcrumb
   - Other breadcrumbs:
     . Tools > Notices & slips > New notice > [select any module]
     . Tools > Notices & slips > [select Edit for any notice]
     . Tools > Notices & slips > [select Delete for any notice]
3. Review other occurences:
   . The cron job description for misc/cronjobs/holds/holds_reminder.pl:
     misc/cronjobs/holds/holds_reminder.pl -man (scroll down to the
     description)
   . The TalkingTech README file:
     vi misc/cronjobs/thirdparty/TalkingTech.README
4. Apply the patch.
5. Re-run the grep queries from step 1 - no occurences are now found.
6. Review places where 'Notices & slips' was found in steps 2 and 3 -
   these should all be replaced with 'Notices and slips' and should
   read correctly.
7. Sign off!

Alernative: review the diff for the patch and check that occurences of
'&amp' and '&' are replaced with 'and' and the updated text reads
correctly.

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
David Nind 2022-07-08 12:25:01 +00:00 committed by Tomas Cohen Arazi
parent e3faa4d66b
commit d614a0199b
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
View File

@ -21,7 +21,7 @@
<li><a href="/cgi-bin/koha/tools/import_borrowers.pl">Import patrons</a></li>
[% END %]
[% IF ( CAN_user_tools_edit_notices ) %]
<li><a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; slips</a></li>
<li><a href="/cgi-bin/koha/tools/letter.pl">Notices and slips</a></li>
[% END %]
[% IF ( CAN_user_tools_edit_notice_status_triggers ) %]
<li><a href="/cgi-bin/koha/tools/overduerules.pl">Overdue notice/status triggers</a></li>

12
koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
View File

@ -64,7 +64,7 @@
[% IF ( add_form or copy_form) %]
[% IF ( modify ) %]
<li>
<a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; slips</a>
<a href="/cgi-bin/koha/tools/letter.pl">Notices and slips</a>
</li>
<li>
<a href="#" aria-current="page">
@ -73,7 +73,7 @@
</li>
[% ELSE %]
<li>
<a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; slips</a>
<a href="/cgi-bin/koha/tools/letter.pl">Notices and slips</a>
</li>
<li>
<a href="#" aria-current="page">
@ -84,7 +84,7 @@
[% ELSE %]
[% IF ( add_validate or copy_validate) %]
<li>
<a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; slips</a>
<a href="/cgi-bin/koha/tools/letter.pl">Notices and slips</a>
</li>
<li>
<a href="#" aria-current="page">
@ -94,7 +94,7 @@
[% ELSE %]
[% IF ( delete_confirm ) %]
<li>
<a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; slips</a>
<a href="/cgi-bin/koha/tools/letter.pl">Notices and slips</a>
</li>
<li>
<a href="#" aria-current="page">
@ -104,7 +104,7 @@
[% ELSE %]
<li>
<a href="#" aria-current="page">
Notices &amp; slips
Notices and slips
</a>
</li>
[% END %]
@ -145,7 +145,7 @@
[% END %]
[% IF ( no_op_set ) %]
<h1>Notices &amp; slips</h1>
<h1>Notices and slips</h1>
<form method="get" action="/cgi-bin/koha/tools/letter.pl" id="selectlibrary">
<input type="hidden" name="searchfield" value="[% searchfield | html %]" />
[% UNLESS independant_branch %]

2
koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
View File

@ -52,7 +52,7 @@
[% END %]
[% IF ( CAN_user_tools_edit_notices ) %]
<dt><a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; slips</a></dt>
<dt><a href="/cgi-bin/koha/tools/letter.pl">Notices and slips</a></dt>
<dd>Define notices (print and email notification messages for overdues, etc.)</dd>
[% END %]

2
misc/cronjobs/holds/holds_reminder.pl
View File

@ -131,7 +131,7 @@ holds.
=head2 Configuration
This script sends reminders to patrons with waiting holds using a notice
defined in the Tools->Notices & slips module within Koha. The lettercode
defined in the Tools > Notices and slips module within Koha. The lettercode
is passed into this script and, along with other options, determine the content
of the notices sent to patrons.

4
misc/cronjobs/thirdparty/TalkingTech.README vendored
View File

@ -1,11 +1,11 @@
Installation and Setup instructions for Talking Tech I-tiva phone notification
=============================
Be sure you enabled the TalkingTechItivaPhoneNotification syspref and you created notice text for the Phone message transport type under the HOLD, PREDUE and OVERDUE notices. (See Tools > Notices & Slips.)
Be sure you enabled the TalkingTechItivaPhoneNotification syspref and you created notice text for the Phone message transport type under the HOLD, PREDUE and OVERDUE notices. (See Tools > Notices and Slips.)
If you wish to process PREDUE or HOLD messages, you'll need the EnhancedMessagingPreferences system preference turned on, and patrons to have filled in a preference for receiving these notices by phone.
For OVERDUE messages, overdue notice triggers must be configured under Koha -> Tools -> Overdue Notice Triggers.
For OVERDUE messages, overdue notice triggers must be configured under Koha > Tools > Overdue Notice Triggers.
Either branch-specific triggers or the default level triggers may be used (script will select whichever is appropriate).