From 5050ba6c8971021adc1d68ed599180e8ed378d5e Mon Sep 17 00:00:00 2001 From: Owen Leonard <oleonard@myacpl.org> Date: Tue, 3 Apr 2012 09:20:45 -0400 Subject: [PATCH] Bug 2780 - Capitalize strings consistently Content-Type: text/plain; charset="utf-8" Corrections to Acquisitions include files. Patch also includes some corrections to unescaped ampersands. --- .../en/includes/acquisitions-add-to-basket.inc | 4 ++-- .../prog/en/includes/acquisitions-menu.inc | 2 +- .../prog/en/includes/acquisitions-search.inc | 8 ++++---- .../prog/en/includes/acquisitions-toolbar.inc | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc index 6082637..c36698d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc @@ -1,12 +1,12 @@ <fieldset id="acqui_basket_add"> - <legend>Add Order To Basket</legend> + <legend>Add order to basket</legend> [% IF has_budgets %] <form action="/cgi-bin/koha/acqui/neworderbiblio.pl" method="post"> <input type="hidden" name="booksellerid" value="[% booksellerid %]" /> <input type="hidden" name="basketno" value="[% basketno %]" /> <ul><li><label for="q">From an existing record: </label><input id="q" type="text" size="25" name="q" /> <input type="submit" class="submit" value="Search" /></li> - <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]">From a Suggestion</a></li> + <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]">From a suggestion</a></li> <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]">From a new (empty) record</a></li> <li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]">From an external source</a></li> <li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]"> From a staged file</a></li> diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc index a0f094c..66701d8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc @@ -2,7 +2,7 @@ <li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li> [% IF ( suggestion ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% ELSE %][% END %] [% IF ( CAN_user_acquisition_budget_manage ) %] - <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets & Funds</a></li> + <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets & funds</a></li> [% END %] [% IF ( CAN_user_parameters ) %] <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></li> diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc index 6c928ef..7951a92 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc @@ -14,16 +14,16 @@ <label for="title">Title: </label><input type="text" id="title" name="title" size="15" value="[% title %]" /> <label for="searchsupplier">Vendor:</label> <input type="text" id="searchsupplier" name="name" size="15" value="[% name|html %]" /> <span class="filteraction" id="filteraction_off" style="display:none"> <a href="#" onclick="$('#filters').toggle();$('.filteraction').hide();">[-]</a></span> <span class="filteraction" id="filteraction_on"> <a href="#" onclick="$('#filters').show();$('.filteraction').toggle();">[+]</a></span> - <input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced Search</a> + <input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced search</a> <p id="filters" style="display:none"> <label for="basket">Basket: </label><input type="text" name="basket" id="basket" /> - <label for="booksellerinvoicenumber">Invoice No.: </label><input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" /> + <label for="booksellerinvoicenumber">Invoice no.: </label><input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" /> </p> </form> </div> <ul id="tabtriggers"> - <li><a href="/cgi-bin/koha/acqui/booksellers.pl#supplier_search">Vendor Search</a></li> - <li><a href="/cgi-bin/koha/acqui/histsearch.pl#orders_search">Orders Search</a></li> + <li><a href="/cgi-bin/koha/acqui/booksellers.pl#supplier_search">Vendor search</a></li> + <li><a href="/cgi-bin/koha/acqui/histsearch.pl#orders_search">Orders search</a></li> </ul> </div> <!-- End Acquisitions Resident Search Box --> diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc index d8e2c1e..11d7b39 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc @@ -50,14 +50,14 @@ [% UNLESS ( basketcount OR subscriptioncount ) %] <li><a id="deletesupplier" href="javascript:confirm_deletion()">Delete</a></li> [% END %] - <li><a id="newcontract" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid %]">New Contract</a></li> + <li><a id="newcontract" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid %]">New contract</a></li> <li><a id="editcontracts" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a></li> [% UNLESS ( basketcount ) %] - <li><a id="newbasket" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&op=add_form">New Basket</a></li> + <li><a id="newbasket" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&op=add_form">New basket</a></li> [% END %] [% END %] [% ELSE %] - <li><a id="newbudget" href="/cgi-bin/koha/acqui/supplier.pl?op=enter">New Vendor</a></li> + <li><a id="newbudget" href="/cgi-bin/koha/acqui/supplier.pl?op=enter">New vendor</a></li> [% END %] </ul> </div> -- 1.7.5.4