Attachment 137430 Details for Bug 31122 – Bug 31122: Terminology - Replace occurences of 'Notices & slips' with 'Notices and slips'

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

Bug-31122-Terminology---Replace-occurences-of-Noti.patch (text/plain), 8.05 KB, created by Katrin Fischer on 2022-07-08 15:23:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2022-07-08 15:23:06 UTC

Size: 8.05 KB

patch

obsolete

>From d914410fadec8b6b06f44300f38d92c7e83d59c3 Mon Sep 17 00:00:00 2001
>From: David Nind <david@davidnind.com>
>Date: Fri, 8 Jul 2022 12:25:01 +0000
>Subject: [PATCH] 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 &amp; 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>
>---
> .../intranet-tmpl/prog/en/includes/tools-menu.inc    |  2 +-
> .../intranet-tmpl/prog/en/modules/tools/letter.tt    | 12 ++++++------
> .../prog/en/modules/tools/tools-home.tt              |  2 +-
> misc/cronjobs/holds/holds_reminder.pl                |  2 +-
> misc/cronjobs/thirdparty/TalkingTech.README          |  4 ++--
> 5 files changed, 11 insertions(+), 11 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
>index 7ec650be1c..a31ef9a51d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
>@@ -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>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>index 341379e84f..635bd6c641 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>@@ -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 %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
>index 6fad2a129b..7efa6aba1c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
>@@ -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 %]
> 
>diff --git a/misc/cronjobs/holds/holds_reminder.pl b/misc/cronjobs/holds/holds_reminder.pl
>index b99259f43d..d1f49287ca 100755
>--- a/misc/cronjobs/holds/holds_reminder.pl
>+++ b/misc/cronjobs/holds/holds_reminder.pl
>@@ -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.
> 
>diff --git a/misc/cronjobs/thirdparty/TalkingTech.README b/misc/cronjobs/thirdparty/TalkingTech.README
>index f1e66a8d7c..f79bc6a068 100644
>--- a/misc/cronjobs/thirdparty/TalkingTech.README
>+++ b/misc/cronjobs/thirdparty/TalkingTech.README
>@@ -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).
> 
> 
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 31122: 137407 | 137430