From 54d42771258681762b659a2685e2678dc6bd8ef6 Mon Sep 17 00:00:00 2001 From: "Nicole C. Engard" Date: Wed, 11 May 2011 04:30:20 -0400 Subject: [PATCH] Bug 5268: Change all occurances of 'debar' to 'restrict' Signed-off-by: Nicole C. Engard Signed-off-by: Jared Camins-Esakov Signed-off-by: Chris Cormack --- 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 b8d6e8ce53..3c6794946f 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 9f4ec8d3e6..67df77c147 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 @@ 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 d0ead07c13..9384e6f4ab 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
  • Patrons can also be blocked from checking items out by setting Patron Flags
    • 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
      • -
    • If you would like to bar a patron from the library you can set the 'Debarred' flag +
    • 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
      • This flag can automatically be set with the Overdue/Notice Status Triggers
      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 630ef0c10c..7b7704b4a8 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 @@
      • Delay is the number of days after an issue is due before an action is triggered.
        • Important: These rules should not be used for Advanced Notices. Advanced Notices should be set using the Enhanched Messaging Preferences on the Patron Profile.
          • -
        • Important: If you want Koha to trigger an action (send a letter or debar member), a delay value is required.
        +
      • Important: If you want Koha to trigger an action (send a letter or restrict a member), a delay value is required.
    • To send additional notices, click on the tabs for 'Second' and 'Third' notice
      • -
    • 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.
    +
  • 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.

    • 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.

    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 3c2db310bd..6d60917e90 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 %]
  • 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 275cea6b24..6287611d89 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) {
    - +
    • [% 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 75d4b79158..c3ad0c91cd 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() {

    Defining [% IF ( branch ) %]overdue actions for [% branch %][% ELSE %]default overdue actions[% END %]

    Delay is the number of days after an checkout is due before an action is triggered.

    -

    If you want Koha to trigger an action (send a letter or debar member), a delay value is required.

    +

    If you want Koha to trigger an action (send a letter or restrict a member), a delay value is required.

    Columns must be filled left to right: if the first column is blank, other columns will be ignored.

    @@ -56,7 +56,7 @@ $(document).ready(function() {
  • Delay [% ERRORDELAY %] for [% BORERR %] patron category has some unexpected characters. There should be only numerical characters.
    • [% END %] [% IF ( ERRORUSELESSDELAY ) %] -
  • 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.
    • +
  • 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.
    • [% END %] [% IF ( ERRORORDER ) %]
  • The first notice's delay should be less than the second, which should be less than the third for the [% BORERR %] patron category
    • @@ -79,7 +79,7 @@ $(document).ready(function() {
    - + [% FOREACH tabl IN table %] [% UNLESS ( loop.odd ) %] @@ -119,7 +119,7 @@ $(document).ready(function() {
     DelayFirst LetterDebar
     DelayFirst LetterRestrict
    - + [% FOREACH tabl IN table %] [% UNLESS ( loop.odd ) %] @@ -159,7 +159,7 @@ $(document).ready(function() {
     DelaySecond LetterDebar
     DelaySecond LetterRestrict
    - + [% FOREACH tabl IN table %] [% UNLESS ( loop.odd ) %] -- 2.39.5
     DelayThird LetterDebar
     DelayThird LetterRestrict