From 9126e13419d57848471875ec0b734ee579fa8bbf Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Thu, 1 Dec 2016 10:53:17 -0500
Subject: [PATCH] Language - here are three files I missed including in the
 prior collection of translation-related files.

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
---
 .../src/templates/opac/myopac/prefs_notify.tt2     | 25 ++++++++++------------
 .../templates/opac/parts/result/copy_counts.tt2    |  4 ++--
 Open-ILS/src/templates/opac/parts/searchbar.tt2    | 10 ++++-----
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
index 2422d69320..47b7f72677 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
@@ -10,7 +10,7 @@
         [% IF ctx.user_setting_map.$setting; %] value='[% ctx.user_setting_map.$setting | html %]' [% END %]/>
 
     <table class="full-width data_grid" id="acct_search_main" 
-        title="[% l('Notification Preferences') %]" style="width:100%;max-width:900px;">
+        title="[% l('Notification Preferences') %]">
         <tbody>
 
             [% IF ctx.updated_user_settings %]
@@ -28,7 +28,7 @@
                     with the rest of the table.  As an alternative, we can
                     repeat the label as a title attr.
                     http://www.w3.org/TR/WCAG20-TECHS/H44.html %]
-                [% email_label = l('Notify by Email when a hold is ready for pickup?') %]
+                [% email_label = l('Notify by Email by default when a hold is ready for pickup?') %]
 
                 <td><label for='[% setting %].email'>[% email_label %]</label></td>
                 <td>
@@ -41,7 +41,7 @@
                 setting = 'opac.hold_notify'; 
             -%]
             <tr>
-                [% phone_label = l('Notify by Phone when a hold is ready for pickup?') %]
+                [% phone_label = l('Notify by Phone by default when a hold is ready for pickup?') %]
                 <td><label for='[% setting %].phone'>[% phone_label %]</label></td>
                 <td>
                     <input id='[% setting %].phone' name='[% setting %].phone' 
@@ -51,7 +51,7 @@
             </tr>
             [% setting = 'opac.default_phone' %]
             <tr>
-                <td><label for='[% setting %]'> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; [% l('Phone Number') %]</label></td>
+                <td><label for='[% setting %]'>[% l('Default Phone Number') %]</label></td>
                 <td>
                     <input id='[% setting %]' name='[% setting %]' type="text"
                         [% IF ctx.user_setting_map.$setting; %] value='[% ctx.user_setting_map.$setting | html %]' [% END %]/>
@@ -62,7 +62,7 @@
                setting = 'opac.hold_notify';
             -%]
             <tr>
-                [% sms_label = l('Notify by Text when a hold is ready for pickup?') %]
+                [% sms_label = l('Notify by Text by default when a hold is ready for pickup?') %]
                 <td><label for='[% setting %].sms'>[% sms_label %]</label></td>
                 <td>
                     <input id='[% setting %].sms' name='[% setting %].sms' 
@@ -71,16 +71,16 @@
                 </td>
             </tr>
             <tr>
-                <td> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; [% l('Mobile Carrier') %]</td>
+                <td>[% l('Default Mobile Carrier') %]</td>
                 <td>[% INCLUDE "opac/parts/sms_carrier_selector.tt2" sms_carrier_hide_label="true" %]</td>
             </tr>
             [% setting = 'opac.default_sms_notify' %]
             <tr>
-                <td><label for='[% setting %]'> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; [% l('Mobile Number') %]</label></td>
+                <td><label for='[% setting %]'>[% l('Default Mobile Number') %]</label></td>
                 <td>
                     <input id='[% setting %]' name='[% setting %]' type="text"
                         [% IF ctx.user_setting_map.$setting; %] value='[% ctx.user_setting_map.$setting | html %]' [% END %]/>
-                    <br/><i>[% l('Hint: Use the full 10 digits of your phone #, no spaces, no dashes'); %]</i>
+                    [% l('Hint: use the full 10 digits of your phone #, no spaces, no dashes'); %]
                 </td>
             </tr>
             [% END %]
@@ -97,12 +97,9 @@
             </tr>
             [% END %]
         </tbody>
-      </table>
-    </div>
-    [% END %]
-    <div style="width:100%;max-width:900px;text-align:right;">
-	    <input type='submit' value="[% l('Save') %]" alt="[% l('Save') %]" class="opac-button" style="padding-left:20px;padding-right:20px;" />
-    </div>
+    </table>
+
+    <input type='submit' value="[% l('Save') %]" class="opac-button" />
 </form>
 [% END %]
 
diff --git a/Open-ILS/src/templates/opac/parts/result/copy_counts.tt2 b/Open-ILS/src/templates/opac/parts/result/copy_counts.tt2
index 7824f01445..dc8aab797c 100644
--- a/Open-ILS/src/templates/opac/parts/result/copy_counts.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/copy_counts.tt2
@@ -11,7 +11,7 @@
 %]
 <div class="result_count">
 [% IF ctx.get_aou(attrs.copy_counts.$depth.org_unit).opac_visible == 't' %]
-    [% l('[_1] out of [quant,_2,copy,copies] are currently available at [_3]',
+    [% l('[_1] of [quant,_2,copy,copies] available at [_3].',
         attrs.copy_counts.$depth.available,
         attrs.copy_counts.$depth.count,
         ou_name) | html
@@ -31,7 +31,7 @@
 [%- IF attrs.plib_copy_counts.$depth.count > 0 AND (
         hiding_disabled OR ctx.org_within_hiding_scope(org_unit.id)) %]
 <div class="result_count preferred">[%
-     l('[_1] out of [quant,_2,copy,copies] are currently available at [_3].',
+     l('[_1] of [quant,_2,copy,copies] available at [_3].',
         attrs.plib_copy_counts.$depth.available,
         attrs.plib_copy_counts.$depth.count,
         ou_name) | html
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index cdabb34a0f..d656ced6fe 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -5,7 +5,7 @@
     <form action="[% ctx.opac_root %]/results" method="get">
     [%- END %]
     <div id="search-box">
-        <span class="search_catalog_lbl mobile_hide">[% l('Basic Search') %]</span>
+        <span class="search_catalog_lbl mobile_hide">[% l('Search the Catalog') %]</span>
         <span class="adv_search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/advanced', {},  expert_search_parms.merge(browse_search_parms, facet_search_parms)) %]"
             id="home_adv_search_link">[% l('Advanced Search') %]</a></span>
         <span class="browse_the_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/browse', {}, expert_search_parms.merge(general_search_parms, facet_search_parms, ['fi:has_browse_entry'])) %]">[% l('Browse the Catalog') %]</a></span>
@@ -15,7 +15,7 @@
         <span class='search_box_wrapper'>
             [%- # autosuggest breaks accessibility, as the aria-label
                 # attribute is removed when the Dijit is created. :(  %]
-            <label id="search_box_label" for="search_box">[% l('Search for: ') %]</label>
+            <label id="search_box_label" for="search_box">[% l('Search: ') %]</label>
             <input type="text" id="search_box" name="query" aria-label="[%
                     l('Enter search query:');
                 %]" value="[% is_advanced ? ctx.naive_query_scrub(ctx.processed_search_query) : CGI.param('query') | html %]"
@@ -33,14 +33,14 @@
         <div  style="padding:10px 10px 10px 0px;float:left;">
         <label id="search_qtype_label" for="qtype"></label>
         [%- 
-            l('Search by:&nbsp;');
+            l('Type: ');
             INCLUDE "opac/parts/qtype_selector.tt2" id="qtype";
         -%]
         </div>
         <div  style="padding:10px 10px 10px 0px;float:left;">
         <label id="search_itype_label" for="search_itype_selector"></label>
         [%-
-            l('Limit to: ');
+            l('Format: ');
             IF search.basic_config.type == 'attr';
                 INCLUDE "opac/parts/coded_value_selector.tt2"
                     attr=search.basic_config.group none_ok=1 
@@ -57,7 +57,7 @@
         <div  style="padding:10px 10px 10px 0px;float:left;">
         <label id="search_locg_label" for="search_org_selector"></label>
         [%- 
-            l('Search within: ');
+            l('Library: ');
             select_lib_label = l("Select search library");
             INCLUDE build_org_selector arialabel=select_lib_label 
               id='search_org_selector' show_loc_groups=1
-- 
2.11.0