Bug 2780 - Capitalize strings consistently (Patrons)

Correcting Patron-related includes

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
index cadd1cb..cf89f58 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
@@ -1,12 +1,12 @@
 [% IF ( borrowernumber ) %]
 <div id="menu">
-<ul>   [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]">Check Out</a></li>
+<ul>   [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]">Check out</a></li>
        [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Details</a></li>
        [% IF ( CAN_user_updatecharges ) %]
        [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Fines</a></li>
        [% END %]
-       [% IF ( intranetreadinghistory ) %][% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]">Circulation History</a></li>[% END %]
-       [% IF ( CAN_user_parameters ) %][% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;action=MODIFY&amp;object=[% borrowernumber %]">Modification Log</a></li>[% END %]
+    [% IF ( intranetreadinghistory ) %][% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]">Circulation history</a></li>[% END %]
+    [% IF ( CAN_user_parameters ) %][% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;action=MODIFY&amp;object=[% borrowernumber %]">Modification log</a></li>[% END %]
     [% IF ( EnhancedMessagingPreferences ) %]
     [% END %]
        [% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrowernumber %]">Notices</a></li>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
index bad8502..99590d3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
@@ -52,16 +52,16 @@ function update_child() {
        }
        function yuiToolbar() {
            var printmenu = [
-               { text: _("Print Page"), onclick: {fn: function(){printx_window("page")}} },
-               { text: _("Print Slip"), onclick: {fn: function(){printx_window("slip")}} },
-               { text: _("Quick Slip"), onclick: {fn: function(){printx_window("qslip")}} }
+            { text: _("Print page"), onclick: {fn: function(){printx_window("page")}} },
+            { text: _("Print slip"), onclick: {fn: function(){printx_window("slip")}} },
+            { text: _("Quick slip"), onclick: {fn: function(){printx_window("qslip")}} }
            ];
 
                var moremenu = [
-                       { text: _("Renew Patron"),  onclick: { fn: confirm_reregistration } },
-                       { text: _("Set Permissions"), url: "/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]"[% UNLESS ( CAN_user_permissions ) %], disabled: true[% END %]},
+            { text: _("Renew patron"),  onclick: { fn: confirm_reregistration } },
+            { text: _("Set permissions"), url: "/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]"[% UNLESS ( CAN_user_permissions ) %], disabled: true[% END %]},
                        { text: _("Delete"), onclick: { fn: confirm_deletion}[% UNLESS ( CANDELETEUSER ) %], disabled: true[% END %] },
-                       { text: _("Update Child to Adult Patron") , onclick: { fn: update_child }[% UNLESS ( is_child ) %], disabled: true[% END %]}
+            { text: _("Update child to adult patron") , onclick: { fn: update_child }[% UNLESS ( is_child ) %], disabled: true[% END %]}
                ];
 
            new YAHOO.widget.Button({
@@ -115,10 +115,10 @@ function update_child() {
             [% END %]
         [% END %]
        [% IF ( adultborrower AND activeBorrowerRelationship ) %]<li><a id="addchild" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% borrowernumber %]&amp;category_type=C">Add child</a></li>[% END %]
-       [% IF CAN_user_staffaccess %]<li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]">Change Password</a></li> [% END %]
+    [% IF CAN_user_staffaccess %]<li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]">Change password</a></li> [% END %]
        <li><a id="duplicate" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% borrowernumber %]&amp;category_type=[% category_type %]">Duplicate</a></li>
-    <li id="printmenuc"><a id="printpage" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=page">Print Page</a></li>
-       <li><a id="printslip" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=slip">Print Slip</a></li>
+    <li id="printmenuc"><a id="printpage" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=page">Print page</a></li>
+    <li><a id="printslip" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=slip">Print slip</a></li>
        <li id="searchtoholdc"><a id="searchtohold" href="#">Search to hold</a></li>
-       <li id="moremenuc"><a id="renewpatron" href="/cgi-bin/koha/members/moremember.pl?reregistration=y&amp;borrowernumber=[% borrowernumber %]">Renew Account</a></li>[% IF ( CAN_user_permissions ) %]<li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set Permissions</a></li>[% END %]<li><a id="deletepatron" href="javascript:confirm_deletion();">Delete</a></li>
+    <li id="moremenuc"><a id="renewpatron" href="/cgi-bin/koha/members/moremember.pl?reregistration=y&amp;borrowernumber=[% borrowernumber %]">Renew account</a></li>[% IF ( CAN_user_permissions ) %]<li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set permissions</a></li>[% END %]<li><a id="deletepatron" href="javascript:confirm_deletion();">Delete</a></li>
 </ul></div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
index 577f19a..2ff131b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
@@ -27,12 +27,12 @@
     </tr>
     [% FOREACH messaging_preference IN messaging_preferences %]
     <tr>
-      <td>[% IF ( messaging_preference.Item_Due ) %]Item Due
-          [% ELSIF ( messaging_preference.Advance_Notice ) %]Advance Notice
-          [% ELSIF ( messaging_preference.Upcoming_Events ) %]Upcoming Events
-          [% ELSIF ( messaging_preference.Hold_Filled ) %]Hold Filled
-          [% ELSIF ( messaging_preference.Item_Check_in ) %]Item Check-in
-          [% ELSIF ( messaging_preference.Item_Checkout ) %]Item Checkout
+      <td>[% IF ( messaging_preference.Item_Due ) %]Item due
+          [% ELSIF ( messaging_preference.Advance_Notice ) %]Advance notice
+          [% ELSIF ( messaging_preference.Upcoming_Events ) %]Upcoming events
+          [% ELSIF ( messaging_preference.Hold_Filled ) %]Hold filled
+          [% ELSIF ( messaging_preference.Item_Check_in ) %]Item check-in
+          [% ELSIF ( messaging_preference.Item_Checkout ) %]Item checkout
           [% ELSE %]Unknown [% END %]</td>
       [% IF ( messaging_preference.takes_days ) %]
       <td>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 17a212f..9f30bfe 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -125,10 +125,10 @@ YAHOO.util.Event.onContentReady("header_search", function() {
     </div>
     [% END %]
                        <ul>
-                       <li><a href="/cgi-bin/koha/members/members-home.pl#patron_search">Search Patrons</a></li>
-                       [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>[% END %]
-    [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/returns.pl#checkin_search">Check In</a></li>[% END %]
-                       [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>[% END %]
+            <li><a href="/cgi-bin/koha/members/members-home.pl#patron_search">Search patrons</a></li>
+            [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
+    [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/returns.pl#checkin_search">Check in</a></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
                        </ul>
 </div>
 <script type="text/javascript">//<![CDATA[

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
index 36bb08f..4a9b715 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
@@ -28,9 +28,9 @@
 { text: "[% categorie.description %]",  url: "/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% categorie.categorycode %]" },
 [% END %]
 [% ELSE %]
-                       { text: _("Adult Patron"),  url: "/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A" },
-                       { text: _("Child Patron"),  url: "/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C" },
-                       { text: _("Professional Patron"),  url: "/cgi-bin/koha/members/memberentry.pl?op=add&category_type=P" },
+            { text: _("Adult patron"),  url: "/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A" },
+            { text: _("Child patron"),  url: "/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C" },
+            { text: _("Professional patron"),  url: "/cgi-bin/koha/members/memberentry.pl?op=add&category_type=P" },
                        { text: _("Organization"),  url: "/cgi-bin/koha/members/memberentry.pl?op=add&category_type=I" },
                        { text: _("Staff"),  url: "/cgi-bin/koha/members/memberentry.pl?op=add&category_type=S" },
                        { text: _("Statistical"),  url: "/cgi-bin/koha/members/memberentry.pl?op=add&category_type=X" },
@@ -53,13 +53,13 @@
        <li id="newmenuc">
                <form action="/cgi-bin/koha/members/memberentry.pl" method="get">
                        <input type="hidden" name="op" value="add" />
-                       <label for="newcategorycode">New Patron: </label><select name="categorycode" id="newcategorycode">
+            <label for="newcategorycode">New patron: </label><select name="categorycode" id="newcategorycode">
                        [% IF ( AddPatronLists_categorycode ) %]
                                [% FOREACH categorie IN categories %]<option value="[% categorie.categorycode %]">[% categorie.description %]</option>[% END %]
                        [% ELSE %]
-                               <option value="A">Adult Patron</option>
-                               <option value="C">Child Patron</option>
-                               <option value="P">Professional Patron</option>
+                <option value="A">Adult patron</option>
+                <option value="C">Child patron</option>
+                <option value="P">Professional patron</option>
                                <option value="I">Organization</option>
                                <option value="S">Staff</option>
                                <option value="X">Statistical</option>