[Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently (miscellaneous)

Owen Leonard oleonard at myacpl.org
Tue Apr 3 17:50:44 CEST 2012


Correcting all remaining includes
---
 .../intranet-tmpl/prog/en/includes/facets.inc      |    2 +-
 .../intranet-tmpl/prog/en/includes/header.inc      |    4 +-
 .../intranet-tmpl/prog/en/includes/hold-menu.inc   |    4 +-
 .../intranet-tmpl/prog/en/includes/mainmenu.inc    |    2 +-
 .../intranet-tmpl/prog/en/includes/resort_form.inc |   30 +++++++++---------
 .../prog/en/includes/search_indexes.inc            |   32 ++++++++++----------
 .../prog/en/includes/suggestions-add-search.inc    |    8 ++--
 7 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
index a72b586..e74bced 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
@@ -18,7 +18,7 @@
 [% IF ( facets_loo.type_label_Libraries ) %]Libraries[% END %]
 <ul>
         [% FOREACH facet IN facets_loo.facets %]<li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by %][% END %]&amp;limit=[% facet.type_link_value %]:[% facet.facet_link_value %]" title="[% facet.facet_title_value %]">[% facet.facet_label_value %]</a> [% IF ( displayFacetCount ) %]([% facet.facet_count %])[% END %]</li>[% END %][% IF ( facets_loo.expandable ) %]
-        <li class="showmore"><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by %][% END %][% IF ( offset ) %]&amp;offset=[% offset %][% END %]&amp;expand=[% facets_loo.expand %]#[% facets_loo.type_id %]">Show More</a></li>
+        <li class="showmore"><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by %][% END %][% IF ( offset ) %]&amp;offset=[% offset %][% END %]&amp;expand=[% facets_loo.expand %]#[% facets_loo.type_id %]">Show more</a></li>
 [% END %]
 </ul></li>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 5da4991..539c466 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -71,9 +71,9 @@
                 [% loggedinusername %]
             </span>
             [% IF ( intranetbookbag ) %]
-            (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor(); delBasket('main', true);">Log Out</a>) |
+            (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor(); delBasket('main', true);">Log out</a>) |
             [% ELSE %]
-            (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor();">Log Out</a>) |
+            (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor();">Log out</a>) |
             [% END %]
         [% ELSE %]
             You are not logged in |
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc
index 29af164..ffb78e3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc
@@ -29,7 +29,7 @@
 <div class="patronviews">
 <ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Details</a></li>
 	<li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Fines</a></li>
-	[% IF ( intranetreadinghistory ) %]<li><a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]">Reading Record</a></li>[% END %]
-	[% IF ( CAN_user_parameters ) %]<li><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 %]</ul>
+	[% IF ( intranetreadinghistory ) %]<li><a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]">Reading record</a></li>[% END %]
+	[% IF ( CAN_user_parameters ) %]<li><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 %]</ul>
 </div>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc
index beb5d48..46a412d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc
@@ -45,7 +45,7 @@
                 [% END %]
     [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
     <li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a><ul>
-        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC Record</a></li>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC record</a></li>
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
     [% END %]
     [% IF ( CAN_user_serials ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc
index 0cfd9c9..a101c5d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc
@@ -3,14 +3,14 @@
 <optgroup label="Popularity">
 	
 	[% IF ( sort_by == "popularity_dsc" ) %]
-<option value="popularity_dsc" selected="selected">Popularity (Most to Least)</option>
+<option value="popularity_dsc" selected="selected">Popularity (most to least)</option>
 [% ELSE %]
-	<option value="popularity_dsc">Popularity (Most to Least)</option>
+	<option value="popularity_dsc">Popularity (most to least)</option>
  [% END %]
 [% IF ( sort_by == "popularity_asc" ) %]
-<option value="popularity_asc" selected="selected">Popularity (Least to Most)</option>
+<option value="popularity_asc" selected="selected">Popularity (least to most)</option>
 [% ELSE %]
-	<option value="popularity_asc">Popularity (Least to Most)</option>
+	<option value="popularity_asc">Popularity (least to most)</option>
  [% END %]
 
 </optgroup>
@@ -35,40 +35,40 @@
 	[% IF ( sort_by == "call_number_asc" ) %]
 <option value="call_number_asc" selected="selected">Call Number (0-9 to A-Z)</option>
 [% ELSE %]
-	<option value="call_number_asc">Call Number (0-9 to A-Z)</option>
+	<option value="call_number_asc">Call number (0-9 to A-Z)</option>
 [% END %]
 
 [% IF ( sort_by == "call_number_dsc" ) %]
-<option value="call_number_dsc" selected="selected">Call Number (Z-A to 9-0)</option>
+<option value="call_number_dsc" selected="selected">Call number (Z-A to 9-0)</option>
 [% ELSE %]
-	<option value="call_number_dsc">Call Number (Z-A to 9-0)</option>
+	<option value="call_number_dsc">Call number (Z-A to 9-0)</option>
 [% END %]
 
 </optgroup>
 
 <optgroup label="Dates">
 	[% IF ( sort_by == "pubdate_dsc" ) %]
-<option value="pubdate_dsc" selected="selected" >Publication/Copyright Date: Newest to Oldest</option>
+<option value="pubdate_dsc" selected="selected" >Publication/Copyright date: newest to oldest</option>
 	[% ELSE %]
-<option value="pubdate_dsc">Publication/Copyright Date: Newest to Oldest</option>
+<option value="pubdate_dsc">Publication/Copyright date: newest to oldest</option>
 [% END %]
 
 [% IF ( sort_by == "pubdate_asc" ) %]
-<option value="pubdate_asc" selected="selected" >Publication/Copyright Date: Oldest to Newest</option>
+<option value="pubdate_asc" selected="selected" >Publication/Copyright date: oldest to newest</option>
 [% ELSE %]
-<option value="pubdate_asc">Publication/Copyright Date: Oldest to Newest</option>
+<option value="pubdate_asc">Publication/Copyright date: oldest to newest</option>
 [% END %]
 
 [% IF ( sort_by == "acqdate_dsc" ) %]
-<option value="acqdate_dsc" selected="selected">Acquisition Date: Newest to Oldest</option>
+<option value="acqdate_dsc" selected="selected">Acquisition date: newest to oldest</option>
 [% ELSE %]
-<option value="acqdate_dsc">Acquisition Date: Newest to Oldest</option>
+<option value="acqdate_dsc">Acquisition date: newest to oldest</option>
  [% END %]
 
  [% IF ( sort_by == "acqdate_asc" ) %]
-<option value="acqdate_asc" selected="selected">Acquisition Date: Oldest to Newest</option>
+<option value="acqdate_asc" selected="selected">Acquisition date: oldest to newest</option>
 [% ELSE %]
-<option value="acqdate_asc">Acquisition Date: Oldest to Newest</option>
+<option value="acqdate_asc">Acquisition date: oldest to newest</option>
  [% END %]
 </optgroup>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
index 83bbda2..2413216 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
@@ -1,29 +1,29 @@
 <select class="advsearch" name="idx">
     <option value="kw">Keyword</option>
     <option value="au">Author</option>
-    <option value="au,phr">&nbsp;&nbsp;&nbsp;&nbsp; Author as Phrase</option>
-    <option value="cpn">&nbsp;&nbsp;&nbsp;&nbsp; Corporate Name</option>
-    <option value="cfn">&nbsp;&nbsp;&nbsp;&nbsp; Conference Name</option>
-    <option value="cpn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Corporate Name as Phrase</option>
-    <option value="cfn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Conference Name as Phrase</option>
-    <option value="pn">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name</option>
-    <option value="pn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name as Phrase</option>
+    <option value="au,phr">&nbsp;&nbsp;&nbsp;&nbsp; Author as phrase</option>
+    <option value="cpn">&nbsp;&nbsp;&nbsp;&nbsp; Corporate name</option>
+    <option value="cfn">&nbsp;&nbsp;&nbsp;&nbsp; Conference name</option>
+    <option value="cpn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Corporate name as phrase</option>
+    <option value="cfn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Conference name as phrase</option>
+    <option value="pn">&nbsp;&nbsp;&nbsp;&nbsp; Personal name</option>
+    <option value="pn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Personal name as phrase</option>
     <option value="ti">Title</option>
-    <option value="ti,phr">&nbsp;&nbsp;&nbsp;&nbsp; Title as Phrase</option>
-    <option value="se">&nbsp;&nbsp;&nbsp;&nbsp; Series Title</option>
+    <option value="ti,phr">&nbsp;&nbsp;&nbsp;&nbsp; Title as phrase</option>
+    <option value="se">&nbsp;&nbsp;&nbsp;&nbsp; Series title</option>
     <option value="su">Subject</option>
-    <option value="su,phr">&nbsp;&nbsp;&nbsp;&nbsp; Subject as Phrase</option>
+    <option value="su,phr">&nbsp;&nbsp;&nbsp;&nbsp; Subject as phrase</option>
     <option value="bc">Barcode</option>
-    <option value="location">Shelving Location</option>
-    <option value="sn">Standard Number</option>
+    <option value="location">Shelving location</option>
+    <option value="sn">Standard number</option>
     <option value="nb">&nbsp;&nbsp;&nbsp;&nbsp; ISBN</option>
     <option value="ns">&nbsp;&nbsp;&nbsp;&nbsp; ISSN</option>
-    <option value="callnum">&nbsp;&nbsp;&nbsp;&nbsp; Call Number</option>
+    <option value="callnum">&nbsp;&nbsp;&nbsp;&nbsp; Call number</option>
     <option value="ln,rtrn">Language</option>
     <option value="nt">Notes/Comments</option>
     <option value="curriculum">Curriculum</option>
     <option value="pb">Publisher</option>
-    <option value="pl">Publisher Location</option>
-    <option value="yr">Publication Date (yyyy)</option>
-    <option value="acqdate">Acquisition Date (yyyy-mm-dd)</option>
+    <option value="pl">Publisher location</option>
+    <option value="yr">Publication date (yyyy)</option>
+    <option value="acqdate">Acquisition date (yyyy-mm-dd)</option>
 </select>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
index 204e5e0..550fd8f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
@@ -46,7 +46,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
  </script>  [% END %][% END %]
 <div id="header_search">
 	<div id="suggestions_search" class="residentsearch">
-	<p class="tip">Suggestions Search:</p>
+	<p class="tip">Suggestions search:</p>
 	<form action="/cgi-bin/koha/acqui/newordersuggestion.pl" method="get">
     <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
 	<label for="searchtitle">Title:</label> <input type="text" id="searchtitle" name="title" size="10" value="[% title %]" />
@@ -88,9 +88,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	</div>
 	[% END %]
 			<ul>
-			<li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]#suggestions_search">Search Suggestions</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_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>[% END %]
+			<li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]#suggestions_search">Search suggestions</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_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>	
 </div>
 <!-- End Suggestions Resident Search Box -->
-- 
1.7.5.4



More information about the Koha-patches mailing list