Bugzilla – Attachment 8853 Details for
Bug 2780
Capitalize strings consistently
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 2780 - Capitalize strings consistently (miscellaneous)
Bug-2780---Capitalize-strings-consistently-miscell.patch (text/plain), 13.60 KB, created by
Jared Camins-Esakov
on 2012-04-04 00:14:05 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 2780 - Capitalize strings consistently (miscellaneous)
Filename:
MIME Type:
Creator:
Jared Camins-Esakov
Created:
2012-04-04 00:14:05 UTC
Size:
13.60 KB
patch
obsolete
>From edc49786b08e281b97e1bab2b409e3507edb1efa Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 3 Apr 2012 11:49:16 -0400 >Subject: [PATCH] Bug 2780 - Capitalize strings consistently (miscellaneous) >Content-Type: text/plain; charset="UTF-8" > >Correcting all remaining includes > >Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> >--- > .../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 ) %]&sort_by=[% sort_by %][% END %]&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 ) %]&sort_by=[% sort_by %][% END %][% IF ( offset ) %]&offset=[% offset %][% END %]&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 ) %]&sort_by=[% sort_by %][% END %][% IF ( offset ) %]&offset=[% offset %][% END %]&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&modules=MEMBERS&action=MODIFY&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&modules=MEMBERS&action=MODIFY&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"> Author as Phrase</option> >- <option value="cpn"> Corporate Name</option> >- <option value="cfn"> Conference Name</option> >- <option value="cpn,phr"> Corporate Name as Phrase</option> >- <option value="cfn,phr"> Conference Name as Phrase</option> >- <option value="pn"> Personal Name</option> >- <option value="pn,phr"> Personal Name as Phrase</option> >+ <option value="au,phr"> Author as phrase</option> >+ <option value="cpn"> Corporate name</option> >+ <option value="cfn"> Conference name</option> >+ <option value="cpn,phr"> Corporate name as phrase</option> >+ <option value="cfn,phr"> Conference name as phrase</option> >+ <option value="pn"> Personal name</option> >+ <option value="pn,phr"> Personal name as phrase</option> > <option value="ti">Title</option> >- <option value="ti,phr"> Title as Phrase</option> >- <option value="se"> Series Title</option> >+ <option value="ti,phr"> Title as phrase</option> >+ <option value="se"> Series title</option> > <option value="su">Subject</option> >- <option value="su,phr"> Subject as Phrase</option> >+ <option value="su,phr"> 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"> ISBN</option> > <option value="ns"> ISSN</option> >- <option value="callnum"> Call Number</option> >+ <option value="callnum"> 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 %]&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 %]&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.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 2780
:
8804
|
8805
|
8807
|
8808
|
8810
|
8812
|
8813
|
8815
|
8817
|
8818
|
8819
|
8820
|
8821
|
8823
|
8829
|
8832
|
8840
|
8841
|
8842
|
8843
|
8844
|
8845
|
8846
|
8847
|
8848
|
8849
|
8850
|
8851
|
8852
|
8853
|
8854
|
8866
|
8870
|
8871
|
8875
|
8880
|
8882
|
8883
|
8884
|
8926
|
8928
|
8929
|
8930
|
8935
|
8954
|
8960
|
8977
|
8978
|
8979
|
8980
|
8981
|
8983
|
8984
|
8985
|
8986
|
8987
|
8988
|
8989
|
8990
|
8991
|
8992
|
8993
|
8994
|
8995
|
8996
|
9013
|
9014
|
9015
|
9016
|
9017
|
9018
|
9019
|
9020
|
9021
|
9022
|
9023
|
9024
|
9025
|
9026
|
9027
|
9028
|
9029
|
9047
|
9048
|
9052
|
9054
|
9055
|
9056
|
9057
|
9058
|
9068
|
9069
|
9070
|
9071
|
9072
|
9073
|
9089
|
9091
|
9092