Attachment 4115 Details for Bug 5268 – Signed-off patch

[patch] Signed-off patch

bug_5268.patch (text/plain), 10.01 KB, created by Jared Camins-Esakov on 2011-05-14 13:17:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jared Camins-Esakov

Created: 2011-05-14 13:17:56 UTC

Size: 10.01 KB

patch

obsolete

>From 1375da028b5f004fc64548ebaf7aa87c6aaea13a Mon Sep 17 00:00:00 2001
>From: Nicole C. Engard <nengard@bywatersolutions.com>
>Date: Wed, 11 May 2011 04:30:20 -0400
>Subject: [PATCH] Bug 5268: Change all occurances of 'debar' to 'restrict'
>Content-Type: text/plain; charset="UTF-8"
>
>Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
>Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
>---
> koha-tmpl/intranet-tmpl/prog/en/columns.def        |    2 +-
> .../intranet-tmpl/prog/en/modules/circ/overdue.tt  |    2 +-
> .../prog/en/modules/help/members/moremember.tt     |    2 +-
> .../prog/en/modules/help/tools/overduerules.tt     |    4 ++--
> .../prog/en/modules/members/memberentrygen.tt      |    2 +-
> .../prog/en/modules/members/moremember.tt          |    2 +-
> .../prog/en/modules/tools/overduerules.tt          |   10 +++++-----
> 7 files changed, 12 insertions(+), 12 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/columns.def b/koha-tmpl/intranet-tmpl/prog/en/columns.def
>index b8d6e8c..3c67949 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/columns.def
>+++ b/koha-tmpl/intranet-tmpl/prog/en/columns.def
>@@ -22,7 +22,7 @@ borrowers.categorycode	Borrowers Category
> borrowers.dateenrolled	Date Enrolled
> borrowers.gonenoaddress	Address Missing
> borrowers.lost	Lost Card
>-borrowers.debarred	Debarred
>+borrowers.debarred	Restricted
> borrowers.studentnumber	 Student Id number
> borrowers.school	School
> borrowers.contactname	Contact Name
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>index 9f4ec8d..67df77c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>@@ -178,7 +178,7 @@
>         <select name="borflag" size="1" id="borflag">
>             <option value="">None</option>
>             <option value="gonenoaddress"[% IF ( borflag_gonenoaddress ) %] selected="selected"[% END %]>Address in question</option>
>-            <option value="debarred"[% IF ( borflag_debarred ) %] selected="selected"[% END %]>Debarred</option>
>+            <option value="debarred"[% IF ( borflag_debarred ) %] selected="selected"[% END %]>Restricted</option>
>             <option value="lost"[% IF ( borflag_lost ) %] selected="selected"[% END %]>Lost Card</option>
>         </select>
>     </li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tt
>index d0ead07..9384e6f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tt
>@@ -63,7 +63,7 @@ In the case of patrons who are marked as 'Child' or 'Professional' and their Gua
> 	<li>Patrons can also be blocked from checking items out by setting Patron Flags
> <ul>
> 	<li>If you would like your circulation staff to confirm a patron's address before checking items out to the patron, you can see the 'Gone no Address' flag</li>
>-	<li>If you would like to bar a patron from the library you can set the 'Debarred' flag
>+	<li>If you would like to prevent a patron from checking items out or performing circulation actions at the library you can set the 'Restricted' flag
> <ul>
> 	<li>This flag can automatically be set with the Overdue/Notice Status Triggers</li>
> </ul>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/overduerules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/overduerules.tt
>index 630ef0c..7b7704b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/overduerules.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/overduerules.tt
>@@ -12,9 +12,9 @@
> 
> <ul><li>Delay is the number of days after an issue is due before an action is triggered.</li>
> <ul><li style="color:#990000;"><strong>Important: These rules should not be used for Advanced Notices.  Advanced Notices should be set using the Enhanched Messaging Preferences on the Patron Profile.</strong></li>
>-<li style="color:#990000;"><strong>Important: If you want Koha to trigger an action (send a letter or debar member), a delay value is required.</strong></li></ul>
>+<li style="color:#990000;"><strong>Important: If you want Koha to trigger an action (send a letter or restrict a member), a delay value is required.</strong></li></ul>
> <li>To send additional notices, click on the tabs for 'Second' and 'Third' notice</li>
>-<li>If you would like to prevent a patron from checking items out because of their overdue items, check the 'Debar' box, this will put a notice on the patron's record at checkout informing the librarian that the patron cannot check out due to overdue items.</li></ul>
>+<li>If you would like to prevent a patron from checking items out because of their overdue items, check the 'Restrict' box, this will put a notice on the patron's record at checkout informing the librarian that the patron cannot check out due to overdue items.</li></ul>
> 
> <p>If the numbers you've entered in a give row beneath the 'delay' columns are logically inconsistent, Koha will give you an alert, and explain the inconsistency.</p>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>index 497b9ac..e815dfb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>@@ -947,7 +947,7 @@
> 			[% FOREACH flagloo IN flagloop %]
> 				<li><label class="radio" for="yes[% flagloo.name %]">
> 				[% IF ( flagloo.key == 'gonenoaddress' ) %]Gone no Address:[% END %]
>-				[% IF ( flagloo.key == 'debarred' ) %]Debarred:[% END %]
>+				[% IF ( flagloo.key == 'debarred' ) %]Restricted:[% END %]
> 				[% IF ( flagloo.key == 'lost' ) %]Lost Card:[% END %]
>                 </label>
> 				<label for="yes[% flagloo.name %]">Yes </label>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>index f8073bb..e023009 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>@@ -163,7 +163,7 @@ function validate1(date) {
>             <form class="inline compact" action="/cgi-bin/koha/members/setdebar.pl" method="post">
>                 <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
>                 <input type="hidden" name="status" value="0" />
>-                <input type="submit" value="Lift Debarment" />
>+                <input type="submit" value="Lift Restriction" />
>             </form>
>             </li>
>         [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt
>index 75d4b79..c3ad0c9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt
>@@ -30,7 +30,7 @@ $(document).ready(function() {
>         <h1>Defining [% IF ( branch ) %]overdue actions for [% branch %][% ELSE %]default overdue actions[% END %]</h1>
>         <div class="help">
>             <p>Delay is the number of days after an checkout is due before an action is triggered. </p>
>-            <p>If you want Koha to trigger an action (send a letter or debar member), a delay value is required.</p>
>+            <p>If you want Koha to trigger an action (send a letter or restrict a member), a delay value is required.</p>
>             <p>Columns must be filled left to right: if the first column is blank, other columns will be ignored. </p>
>         </div>
>             <form method="post" action="/cgi-bin/koha/tools/overduerules.pl" id="selectlibrary">
>@@ -56,7 +56,7 @@ $(document).ready(function() {
>                     <li>Delay [% ERRORDELAY %] for [% BORERR %] patron category has some unexpected characters. There should be only numerical characters. </li>
>                 [% END %]
>                 [% IF ( ERRORUSELESSDELAY ) %]
>-                    <li>No letter or debar action specified for delay [% ERRORUSELESSDELAY %] for [% BORERR %] patron category.  If a delay is supplied, either a letter, debar action, or both should be specified.</li>
>+                    <li>No letter or restriction action specified for delay [% ERRORUSELESSDELAY %] for [% BORERR %] patron category.  If a delay is supplied, either a letter, restrict action, or both should be specified.</li>
>                 [% END %]
>                 [% IF ( ERRORORDER ) %]
>                     <li>The first notice's delay should be less than the second, which should be less than the third for the <strong>[% BORERR %]</strong> patron category </li>
>@@ -79,7 +79,7 @@ $(document).ready(function() {
> 	</ul>
> 
> <div id="first"><table>
>-					<tr><th>&nbsp;</th><th scope="col">Delay</th><th scope="col">First Letter</th><th scope="col">Debar</th></tr>
>+					<tr><th>&nbsp;</th><th scope="col">Delay</th><th scope="col">First Letter</th><th scope="col">Restrict</th></tr>
>                     [% FOREACH tabl IN table %]
>                      [% UNLESS ( loop.odd ) %]
>                                 <tr class="highlight">
>@@ -119,7 +119,7 @@ $(document).ready(function() {
> </div>
> 
> <div id="second"><table>
>-					<tr><th>&nbsp;</th><th scope="col">Delay</th><th scope="col">Second Letter</th><th scope="col">Debar</th></tr>
>+					<tr><th>&nbsp;</th><th scope="col">Delay</th><th scope="col">Second Letter</th><th scope="col">Restrict</th></tr>
>                     [% FOREACH tabl IN table %]
>                      [% UNLESS ( loop.odd ) %]
>                                 <tr class="highlight">
>@@ -159,7 +159,7 @@ $(document).ready(function() {
> </div>
> 
> <div id="third"><table>
>-					<tr><th>&nbsp;</th><th scope="col">Delay</th><th scope="col">Third Letter</th><th scope="col">Debar</th></tr>
>+					<tr><th>&nbsp;</th><th scope="col">Delay</th><th scope="col">Third Letter</th><th scope="col">Restrict</th></tr>
>                     [% FOREACH tabl IN table %]
>                      [% UNLESS ( loop.odd ) %]
>                                 <tr class="highlight">
>-- 
>1.7.2.3
>

Actions: View | Diff | Splinter Review

Attachments on bug 5268: 4115