Bug 17290 - Standardize on "Patron Categories"

We need to standardize on terminology, this changes all instances of
patron types to be patron categories.  To text, just view the patch

Signed-off-by: Cédric Vita <cedric.vita@dracenie.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
index 746d0c8..286b12d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -130,16 +130,16 @@ $(document).ready(function() {
     <div class="help">
         <p>The rules are applied from most specific to less specific, using the first found in this order:</p>
         <ul>
-            <li>same library, same patron type, same item type</li>
-            <li>same library, same patron type, all item types</li>
-            <li>same library, all patron types, same item type</li>
-            <li>same library, all patron types, all item types</li>
-            <li>default (all libraries), same patron type, same item type</li>
-            <li>default (all libraries), same patron type, all item types</li>
-            <li>default (all libraries), all patron types, same item type</li>
-            <li>default (all libraries), all patron types, all item types</li>
+            <li>same library, same patron category, same item type</li>
+            <li>same library, same patron category, all item types</li>
+            <li>same library, all patron categories, same item type</li>
+            <li>same library, all patron categories, all item types</li>
+            <li>default (all libraries), same patron category, same item type</li>
+            <li>default (all libraries), same patron category, all item types</li>
+            <li>default (all libraries), all patron categories, same item type</li>
+            <li>default (all libraries), all patron categories, all item types</li>
         </ul>
-        <p>To modify a rule, create a new one with the same patron type and item type.</p>
+        <p>To modify a rule, create a new one with the same patron category and item type.</p>
     </div>
     <div>
         <form method="get" action="/cgi-bin/koha/admin/smart-rules.pl" id="selectlibrary">

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt
index 2cb29b0..7105e42 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt
@@ -2,14 +2,14 @@
 
 <h1>Patron Categories</h1>
 
-<p>Patron categories allow you to organize your patrons into different roles, age groups, and patron types.</p>
+<p>Patron categories allow you to organize your patrons into different roles, age groups, and patron categories.</p>
 
 <p>Patrons are assigned to one of six main categories:</p>
 
 <ul>
     <li>Adult
 <ul>
-    <li>Most common patron type, usually used for a general 'Patron' category.</li>
+    <li>Most common patron category, usually used for a general 'Patron' category.</li>
 </ul>
 </li>
     <li>Child
@@ -34,7 +34,7 @@
 </li>
     <li>Statistical
 <ul>
-    <li>This patron type is used strictly for statistical purposes, such as in house use of items.</li>
+    <li>This patron category is used strictly for statistical purposes, such as in house use of items.</li>
 </ul>
 </li>
 </ul>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt
index ac33024..40e43eb 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt
@@ -4,7 +4,7 @@
 
 <p>Libraries can decide if they want to have patrons automatically notified of circulation events (check ins and check outs).</p>
 
-<p>These preferences are set based on patron types and item types.</p>
+<p>These preferences are set based on patron categories and item types.</p>
 
 <p style="color: #990000;">Important: These preference can be overwritten by changes in the individual patron's messaging preferences.</p>
 
@@ -16,9 +16,9 @@
        <li>To set preferences for all libraries, keep the menu set to 'Default'</li>
 </ul>
 </li>
-    <li>By default all item types and all patrons are notified of check ins and check outs. To change this, click on the item/patron type combination that you would like to stop notices for.</li>
+    <li>By default all item types and all patrons are notified of check ins and check outs. To change this, click on the item type/patron category combination that you would like to stop notices for.</li>
 </ul>
 
 <p><strong>See the full documentation for Item Circulation Alerts in the <a href="http://manual.koha-community.org/[% helpVersion %]/en/patscirc.html#itemcircalerts">manual</a> (online).</strong></p>
 
-[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
+[% INCLUDE 'help-bottom.inc' %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
index 8852c27..f1428d0 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
@@ -7,14 +7,14 @@
 <p>The rules are applied from most specific to less specific, using the first found in this order:</p>
 
 <ul>
-       <li>same library, same patron type, same item type</li>
-       <li>same library, same patron type, all item type</li>
-       <li>same library, all patron types, same item type</li>
-       <li>same library, all patron types, all item types</li>
-       <li>all libraries, same patron type, same item type</li>
-       <li>all libraries, same patron type, all item types</li>
-       <li>all libraries, all patron types, same item type</li>
-       <li>all libraries, all patron types, all item types</li>
+       <li>same library, same patron category, same item type</li>
+       <li>same library, same patron category, all item type</li>
+       <li>same library, all patron categories, same item type</li>
+       <li>same library, all patron categories, all item types</li>
+       <li>all libraries, same patron category, same item type</li>
+       <li>all libraries, same patron category, all item types</li>
+       <li>all libraries, all patron categories, same item type</li>
+       <li>all libraries, all patron categories, all item types</li>
 </ul>
 
 <p>The CircControl and HomeOrHoldingBranch also come in to play when figuring out which circulation rule to follow.</p>
@@ -28,7 +28,7 @@
 
 <p>If you are a single library system choose your branch name before creating rules (sometimes having only rules for the 'all libraries' option can cause issues with holds)</p>
 
-<p style="color: #990000;">Important: At the very least you will need to set a default circulation rule. This rule should be set for all item types, all libraries and all patron categories. That will catch all instances that do not match a specific rule. When checking out if you do not have a rule for all libraries, all item types and all patron types then you may see patrons getting blocked from placing holds. You will also want a rule for your specific library set for all item types and all patron types to avoid this holds issue. Koha needs to know what rule to fall back on.</p>
+<p style="color: #990000;">Important: At the very least you will need to set a default circulation rule. This rule should be set for all item types, all libraries and all patron categories. That will catch all instances that do not match a specific rule. When checking out if you do not have a rule for all libraries, all item types and all patron categories then you may see patrons getting blocked from placing holds. You will also want a rule for your specific library set for all item types and all patron categories to avoid this holds issue. Koha needs to know what rule to fall back on.</p>
 
 <h4>Default Circulation Rules</h4>
 
@@ -83,10 +83,10 @@
     <li>Don't allow: Will only allow patrons to choose next available</li>
     <li>Force: Will only allow patrons to choose an specific item</li>
     </ul></li>
-    <li>Finally, if you charge a rental fee for the item type and want to give a specific patron type a discount on that fee, enter the percentage discount (without the % symbol) in the 'Rental Discount' field</li>
+    <li>Finally, if you charge a rental fee for the item type and want to give a specific patron category a discount on that fee, enter the percentage discount (without the % symbol) in the 'Rental Discount' field</li>
 </ul>
 
-<p>When finished, click 'Add' to save your changes. To modify a rule, create a new one with the same patron type and item type. If you would like to delete your rule, simply click the 'Delete' link to the right of the rule.</p>
+<p>When finished, click 'Add' to save your changes. To modify a rule, create a new one with the same patron category and item type. If you would like to delete your rule, simply click the 'Delete' link to the right of the rule.</p>
 
 <p>To save time you can clone rules from one library to another by choosing the clone option above the rules matrix.</p>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt
index c94187a..2b7df6c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt
@@ -10,7 +10,7 @@
 
 <ul>
        <li>Fines will be charged based on your Circulation &amp; Fines Rules</li>
-       <li>Hold fees will be charged based on the rules you set in the Patron Types &amp; Categories administration area</li>
+       <li>Hold fees will be charged based on the rules you set for the patron category in administration</li>
        <li>Rental fees will be charged based on the settings in your Item Types administration area</li>
        <li>Marking an item 'Lost' via the cataloging module will automatically charge the patron the replacement cost for that item</li>
 </ul>
@@ -21,4 +21,4 @@
 
 <p><strong>See the full documentation for Patron Fines in the <a href="http://manual.koha-community.org/[% helpVersion %]/en/patroninformation.html#patronfines">manual</a> (online).</strong></p>
 
-[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
+[% INCLUDE 'help-bottom.inc' %]