Bug 15413: Adding colons where appropriate
authorAleisha <aleishaamohia@hotmail.com>
Tue, 22 Dec 2015 23:16:31 +0000 (23:16 +0000)
committerBrendan Gallagher <brendan@bywatersolutions.com>
Fri, 25 Mar 2016 21:50:56 +0000 (21:50 +0000)
To test:

Apply patch and go to pretty much every page on the Intranet - look out
for labels on forms etc where there should be colons but aren't. If you
see any that I've missed but I'm 99% sure I got all of them! Make sure
to click through some forms where creating a new thing involves
continuing the submission on multiple pages.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Rebased on current master and checked all changed pages.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com

21 files changed:
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt
koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt
koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt
koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt
koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt
koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt

index 9fedd03..c50629c 100644 (file)
             <input type="text" size="40" id="contact_email[% contact.id %]" name="contact_email" value="[% contact.email %]" /></li>
         <li><label for="contact_notes[% contact.id %]">Notes: </label>
             <textarea id="contact_notes[% contact.id %]" name="contact_notes" cols="40" rows="4">[% contact.notes %]</textarea></li>
-        <li><label for="contact_acqprimary[% contact.id %]">Primary acquisitions contact</label>
+        <li><label for="contact_acqprimary[% contact.id %]">Primary acquisitions contact:</label>
             [% IF contact.acqprimary %]
                 <input type="checkbox" id="contact_acqprimary[% contact.id %]" class="contact_acqprimary" checked="checked"></input>
             [% ELSE %]
                 <input type="checkbox" id="contact_acqprimary[% contact.id %]" class="contact_acqprimary"></input>
             [% END %]
             <input type="hidden" class="contact_acqprimary_hidden" name="contact_acqprimary" value="[% contact.acqprimary %]"></input>
-        <li><label for="contact_serialsprimary[% contact.id %]">Primary serials contact</label>
+        <li><label for="contact_serialsprimary[% contact.id %]">Primary serials contact:</label>
             [% IF contact.serialsprimary %]
                 <input type="checkbox" id="contact_serialsprimary[% contact.id %]" class="contact_serialsprimary" checked="checked"></input>
             [% ELSE %]
index 0e3db4f..fc22747 100644 (file)
@@ -664,7 +664,7 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
         </li>
         <li class="radio">
 
-        <label for="show_mine">Show my funds only</label>
+        <label for="show_mine">Show my funds only:</label>
             [% IF ( show_mine ) %]
                 <input type="checkbox" id="show_mine"  name="show_mine" value="1" checked="checked" />
             [% ELSE %]
index d4d0130..1c2bf23 100644 (file)
                     <span>Select <i>All branches</i> if this category type must to be displayed all the time. Otherwise select libraries you want to associate with this value.
                     </span>
                 </li>
-                <li><label for="block_expired">Block expired patrons</label>
+                <li><label for="block_expired">Block expired patrons:</label>
                     <select name="BlockExpiredPatronOpacActions" id="block_expired">
                         [% IF not category or category.BlockExpiredPatronOpacActions == -1%]
                             <option value="-1" selected="selected"> Follow system preference BlockExpiredPatronOpacActions </option>
index 6ca70fa..e2bd3cc 100644 (file)
@@ -76,7 +76,7 @@
                     <a href="JavaScript:add_field();" id="ButtonPlus" title="Add another field">[+]</a>
                                [% END %]
               [% IF ( search_box.scan_index ) %]
-                <label for="scan">Scan indexes</label> <input type="checkbox" name="scan" id="scan" value="1" />
+                <label for="scan">Scan indexes:</label> <input type="checkbox" name="scan" id="scan" value="1" />
               [% END %]
             [% END %]
                </div>
 <!-- AVAILABILITY LIMITS -->
     <fieldset id="availability"><legend>Location and availability</legend>
 <fieldset id="currently-avail">
-        <p><label for="available-items">Only items currently available</label> <input type="checkbox" id="available-items" name="limit" value="available" /></p>
+        <p><label for="available-items">Only items currently available:</label> <input type="checkbox" id="available-items" name="limit" value="available" /></p>
 </fieldset>
 
 <fieldset id="select-libs">
index 355cfa4..53e5854 100644 (file)
                                     </li>
                                     <li>
                                         <input type="radio" name="number_type" id="barcode_enter" value="barcode" checked />
-                                        <label for="barcode_enter">Enter by barcode</label><br/>
+                                        <label for="barcode_enter">Enter by barcode:</label><br/>
                                         <input type="radio" name="number_type" id="itemnum_enter" value="itemnumber" />
-                                        <label for="itemnum_enter">Enter by itemnumber</label>
+                                        <label for="itemnum_enter">Enter by itemnumber:</label>
                                     </li>
                                     <li>
                                         <label for="number_list">Add by barcode(s) or itemnumbers(s):
index cfb1c1b..e6caf43 100644 (file)
@@ -770,7 +770,7 @@ function select_user(borrowernumber, borrower) {
                        [% ELSE %]
             <label for="to">
                        [% END %]
-                       Expiry date (leave blank for auto calc) </label>
+                       Expiry date (leave blank for auto calc): </label>
             [% IF ( dateformat == "metric" ) %]
                                [% UNLESS ( opadd ) %]
                     <input type="text" id="to" name="dateexpiry" maxlength="10"  size="10" onchange="CheckDate(document.form.dateexpiry);check_manip_date('verify');" value="[% UNLESS opduplicate %][% dateexpiry %][% END %]" class="datepickerto" />
index a03b058..04c09e8 100644 (file)
     <legend> Cell value </legend>
     <ol>
         <li>
-            <label for="cellvalue1">Count items</label><input type="radio" name="Cellvalue" id="cellvalue1" value="1" checked="checked" />
+            <label for="cellvalue1">Count items:</label><input type="radio" name="Cellvalue" id="cellvalue1" value="1" checked="checked" />
         </li>
         <li>
-            <label for="cellvalue2">Count unique biblios</label><input type="radio" name="Cellvalue" id="cellvalue2" value="2" />
+            <label for="cellvalue2">Count unique biblios:</label><input type="radio" name="Cellvalue" id="cellvalue2" value="2" />
         </li>
         <li>
-            <label for="cellvalue3">Amount</label><input type="radio" name="Cellvalue" id="cellvalue3" value="3" />
+            <label for="cellvalue3">Amount:</label><input type="radio" name="Cellvalue" id="cellvalue3" value="3" />
         </li>
         <li>
-            <label for="cellvalue4">Ordered amount</label><input type="radio" name="Cellvalue" id="cellvalue4" value="4" />
+            <label for="cellvalue4">Ordered amount:</label><input type="radio" name="Cellvalue" id="cellvalue4" value="4" />
         </li>
         <li>
-            <label for="cellvalue5">Spent amount</label><input type="radio" name="Cellvalue" id="cellvalue5" value="5" />
+            <label for="cellvalue5">Spent amount:</label><input type="radio" name="Cellvalue" id="cellvalue5" value="5" />
         </li>
     </ol>
 </fieldset>
         <li>
             <label for="outputfile">To a file:</label> <input type="radio" name="output" value="file" id="outputfile" />
             <label class="inline" for="basename">Named: </label> <input type="text" name="basename" id="basename" value="Export" />
-            <label class="inline" for="MIME">Into an application</label>
+            <label class="inline" for="MIME">Into an application:</label>
             <select name="MIME" id="MIME" size="1">
                 <option value="CSV">CSV</option>
             </select>
index 5f7f701..f9c5aa0 100644 (file)
@@ -97,7 +97,7 @@ $(document).ready(function(){
         <li>
             <label for="outputfile">To a file:</label> <input type="radio" name="output" value="file" id="outputfile" />
             <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" />
-            <label class="inline" for="MIME">Into an application </label>
+            <label class="inline" for="MIME">Into an application:</label>
             <select name="MIME" id="MIME" size="1">
             [% FOREACH value IN CGIextChoice %]
                 <option value="[% value %]">[% value %]</option>
index 4c659d4..bc93aa4 100644 (file)
         <li>
             <label for="outputfile">To a file:</label> <input type="radio" name="output" value="file" id="outputfile" />
             <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" />
-            <label class="inline" for="MIME">Into an application</label>
+            <label class="inline" for="MIME">Into an application:</label>
             <select name="MIME" id="MIME" size="1">
             [% FOREACH value IN CGIextChoice %]
                 <option value="[% value %]">[% value %]</option>
index 2c64f59..27d2d28 100644 (file)
         <li>
             <label for="outputfile">To a file:</label> <input type="radio" name="output" value="file" id="outputfile" />
             <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" />
-            <label class="inline" for="MIME">Into an application </label>
+            <label class="inline" for="MIME">Into an application:</label>
             <select name="MIME" id="MIME" size="1">
             [% FOREACH value IN CGIextChoice %]
                 <option value="[% value %]">[% value %]</option>
index 63aa5d7..30be1ed 100644 (file)
         <input type="hidden" name="phase" value="New Term step 3" />
         <input type="hidden" name="definition_name" value="[% definition_name %]" />
         <input type="hidden" name="definition_description" value="[% definition_description %]" />
-        <label for="area">Select table </label><select name="area" id="area">
+        <label for="area">Select table:</label><select name="area" id="area">
       [%- FOREACH area IN areas -%]
         <option value="[%- area.id -%]">[%- PROCESS area_name area=area.id -%]</option>
       [%- END -%]
index 0a7d80f..dee52ed 100644 (file)
@@ -414,7 +414,7 @@ canned reports and writing custom SQL reports.</p>
 <h1>Build a report</h1>
 <form action="/cgi-bin/koha/reports/guided_reports.pl">
 <fieldset class="rows">
-<legend>Step 1 of 6: Choose a module to report on,[% IF (usecache) %] Set cache expiry, [% END %] and Choose report visibility </legend>
+<legend>Step 1 of 6: Choose a module to report on,[% IF (usecache) %] Set cache expiry, [% END %] and choose report visibility </legend>
 <ol>
   <li>
     <label for="area">Choose: </label>
@@ -1086,7 +1086,7 @@ $("#column_submit").submit(function() {
             [% END %]
         </select>
         <input type="radio" name="select_or_create_group" id="create_group" />
-        <label for="create_group" style="float:none">or create</label>
+        <label for="create_group" style="float:none">or create:</label>
         <input type="text" name="group" id="group_input" title="Group code" placeholder="Code" />
         <input type="text" name="groupdesc" id="groupdesc_input" title="Group name" placeholder="Name" />
     </li>
index 789ae51..1bc8c23 100644 (file)
         </tbody>
     </table><br /></fieldset>
 
-<fieldset class="rows"><legend>Cell value </legend><ol><li><label for="cellvalue1">Count total items</label> <input type="radio" name="Cellvalue" value="1" id="cellvalue1" checked="checked" /> </li>
-            <li><label for="cellvalue3">Count unique items</label> <input type="radio" name="Cellvalue" id="cellvalue3" value="3" /> </li></ol></fieldset>
+<fieldset class="rows"><legend>Cell value </legend><ol><li><label for="cellvalue1">Count total items:</label> <input type="radio" name="Cellvalue" value="1" id="cellvalue1" checked="checked" /> </li>
+            <li><label for="cellvalue3">Count unique items:</label> <input type="radio" name="Cellvalue" id="cellvalue3" value="3" /> </li></ol></fieldset>
                        
        <fieldset class="rows">
        <legend>Output</legend>
         <li>
             <label for="outputfile">To a file:</label> <input type="radio" name="output" value="file" id="outputfile" />
             <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" />
-            <label class="inline" for="MIME">Into an application</label>
+            <label class="inline" for="MIME">Into an application:</label>
             <select name="MIME" id="MIME" size="1">
             [% FOREACH value IN CGIextChoice %]
                 <option value="[% value %]">[% value %]</option>
index 014d5aa..1ba8478 100644 (file)
@@ -61,7 +61,7 @@ $(document).ready(function(){
           <fieldset class="rows">
             <ol>
               <li>
-                <label for="value">Select a library</label>
+                <label for="value">Select a library:</label>
                 <select name="value" size="1" id="value">
                   <option value=""></option>
                 [%- FOREACH branchloo IN branchloop %]
index ac19ed7..8ef7b22 100644 (file)
         </tbody>
     </table><br /></fieldset>
 
-<fieldset class="rows"><legend>Cell value </legend><ol><li><label for="cellvalue1">Count holds</label> <input type="radio" name="Cellvalue" value="1" id="cellvalue1" checked="checked" /> </li>
-            <li><label for="cellvalue2">Count unique borrowers</label> <input type="radio" name="Cellvalue" value="2" id="cellvalue2" /> </li><li><label for="cellvalue3">Count unique items</label> <input type="radio" name="Cellvalue" id="cellvalue3" value="3" /> </li><li><label for="cellvalue4">Count unique biblios</label> <input type="radio" name="Cellvalue" id="cellvalue4" value="4" /> </li></ol></fieldset>
+<fieldset class="rows"><legend>Cell value </legend><ol><li><label for="cellvalue1">Count holds:</label> <input type="radio" name="Cellvalue" value="1" id="cellvalue1" checked="checked" /> </li>
+            <li><label for="cellvalue2">Count unique borrowers:</label> <input type="radio" name="Cellvalue" value="2" id="cellvalue2" /> </li><li><label for="cellvalue3">Count unique items:</label> <input type="radio" name="Cellvalue" id="cellvalue3" value="3" /> </li><li><label for="cellvalue4">Count unique biblios:</label> <input type="radio" name="Cellvalue" id="cellvalue4" value="4" /> </li></ol></fieldset>
                        
        <fieldset class="rows">
        <legend>Output</legend>
         <li>
             <label for="outputfile">To a file:</label> <input type="radio" name="output" value="file" id="outputfile" />
             <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" />
-            <label class="inline" for="MIME">Into an application</label>
+            <label class="inline" for="MIME">Into an application:</label>
             <select name="MIME" id="MIME" size="1">
             [% FOREACH value IN CGIextChoice %]
                 <option value="[% value %]">[% value %]</option>
index 6e7b8ab..d465a96 100644 (file)
         <li>
             <label for="outputfile">To a file:</label> <input type="radio" name="output" value="file" id="outputfile" />
             <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" />
-            <label class="inline" for="MIME">Into an application</label>
+            <label class="inline" for="MIME">Into an application:</label>
             <select name="MIME" id="MIME" size="1">
             [% FOREACH value IN CGIextChoice %]
                 <option value="[% value %]">[% value %]</option>
index 1d47739..a3ea8ef 100644 (file)
@@ -542,7 +542,7 @@ $(document).ready(function() {
                                   [% END %]
                                 </li>
                                 <li>
-                                    <label for="manualhistory">Manual history</label>
+                                    <label for="manualhistory">Manual history:</label>
                                     [% IF (manualhistory) %]
                                         <input type="checkbox" id="manualhistory" name="manualhist" checked="checked" />
                                     [% ELSE %]
@@ -550,7 +550,7 @@ $(document).ready(function() {
                                     [% END %]
                                 </li>
                                 <li>
-                                    <label for="callnumber">Call number</label>
+                                    <label for="callnumber">Call number:</label>
                                     <input type="text" name="callnumber" id="callnumber" value="[% callnumber %]" size="20" />
                                 </li>
                                 <li>
@@ -722,7 +722,7 @@ $(document).ready(function() {
                                         </select>
                                     </li>
                                     <li>
-                                        <label for="locale">Locale</label>
+                                        <label for="locale">Locale:</label>
                                         <select id="locale" name="locale">
                                             <option value=""></option>
                                             [% FOREACH l IN locales %]
index ab4712c..ba1908e 100644 (file)
@@ -334,9 +334,9 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
 <fieldset class="brief">
   <h4>Filters</h4>
        <ol>
-           <li><label for="tag">Term</label> <input type="text" name="tag" id="tag" value="[% filter_tag %]" />
+           <li><label for="tag">Term:</label> <input type="text" name="tag" id="tag" value="[% filter_tag %]" />
            </li>
-           <li><label for="approved">Status</label> 
+           <li><label for="approved">Status:</label>
             <select name="approved" id="approved">
             [% IF ( filter_approved_all ) %]<option selected="selected" value="all">all</option>
             [% ELSE %]<option value="all">all</option>[% END %]
@@ -348,7 +348,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
             [% ELSE %]<option value="-1">rejected</option>[% END %]
                        </select>
            </li>
-           <li><label for="approver">Reviewer</label> <input type="text" name="approver" id="approver" value="[% filter_approver %]" />
+           <li><label for="approver">Reviewer:</label> <input type="text" name="approver" id="approver" value="[% filter_approver %]" />
            </li>
            <li>
                        <label for="from">Date: from </label>
index 785d853..35b7b46 100644 (file)
@@ -373,7 +373,7 @@ function reloadPage(p) {
                               <textarea cols="50" rows="2" name="profile_sql_content" id="modify_profile_sql_content">[% selected_profile_content %]</textarea>
                             </li>
 
-                                                  <li class="radio"> <label for="delete">Delete selected profile ?</label>
+                                                  <li class="radio"> <label for="delete">Delete selected profile?</label>
                                                    <input type="checkbox" name="delete" id="delete" /></li>
                                                    </ol>
 
index 83bc50a..5362fa9 100644 (file)
@@ -106,21 +106,21 @@ $(document).ready(function() {
     </legend>
         <ol>
         <li>File containing a list of biblio numbers with one biblio number per line. This list works as a filter: it is compatible with other parameters.</li>
-        <li><label for="id_list_file">File : </label> <input type="file" id="id_list_file" name="id_list_file" /></li>
+        <li><label for="id_list_file">File: </label> <input type="file" id="id_list_file" name="id_list_file" /></li>
         </ol>
     </fieldset>
     <fieldset class="rows">
     <legend> Options</legend>
 <ol>        <li>
-        <label for="dont_export_item">Don't export items</label>
+        <label for="dont_export_item">Don't export items:</label>
         <input id="dont_export_item" type="checkbox" name="dont_export_item" />
         </li>
         <li>
-        <label for="strip_nonlocal_items">Remove non-local items</label>
+        <label for="strip_nonlocal_items">Remove non-local items:</label>
         <input id="strip_nonlocal_items" type="checkbox" name="strip_nonlocal_items" />
         </li>
         <li>
-        <label for="export_remove_fields">Don't export fields</label>
+        <label for="export_remove_fields">Don't export fields:</label>
         <input id="export_remove_fields" type="text" name="export_remove_fields" value="[% export_remove_fields %]" />
         separate by a blank. (e.g., 100a 200 606)
         </li></ol>
@@ -185,14 +185,14 @@ $(document).ready(function() {
     </legend>
         <ol>
         <li>File containing a list of authids with one authid per line. This list works as a filter: it is compatible with other parameters.</li>
-        <li><label for="id_list_file">File : </label> <input type="file" id="id_list_file" name="id_list_file" /></li>
+        <li><label for="id_list_file">File:</label> <input type="file" id="id_list_file" name="id_list_file" /></li>
         </ol>
     </fieldset>
     <fieldset class="rows">
     <legend>Options</legend>
         <ol>
         <li>
-            <label for="export_remove_fields">Don't export fields</label>
+            <label for="export_remove_fields">Don't export fields:</label>
             <input id="export_remove_fields" type="text" name="export_remove_fields" />
             separate by a blank. (e.g., 100a 200 606)
         </li></ol>
index 38a3598..ca4588a 100644 (file)
@@ -79,7 +79,7 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div>
                        <fieldset class="rows">
             <legend>OPAC and Koha news</legend>
            <ol> <li>
-            <label for="lang">Display location</label>
+            <label for="lang">Display location:</label>
             <select id="lang" name="lang">
                 [% IF ( default_lang == "" ) %]
                 <option value="" selected="selected">All</option>