From ff4647a6f115a1479e3131b89e31471201d33c14 Mon Sep 17 00:00:00 2001 From: Terran McCanna Date: Wed, 30 Nov 2016 18:01:36 -0500 Subject: [PATCH] OPAC Updates related to page text and translations. Also required are the en-PINES.po custom text file and the es-ES.po translation file. Language - here are three files I missed including in the prior collection of translation-related files. Language files - a few more corrections. Changing hard-coded string to allow locale to work. Signed-off-by: Terran McCanna Conflicts: Open-ILS/src/templates/opac/parts/advanced/search.tt2 Open-ILS/src/templates/opac/parts/pref_lib_display.tt2 --- Open-ILS/src/templates/opac/advanced.tt2 | 4 ++-- Open-ILS/src/templates/opac/browse.tt2 | 4 +--- Open-ILS/src/templates/opac/myopac/circs.tt2 | 8 +++----- Open-ILS/src/templates/opac/myopac/hold_history.tt2 | 3 ++- Open-ILS/src/templates/opac/myopac/holds.tt2 | 21 ++++++++++----------- Open-ILS/src/templates/opac/myopac/lists.tt2 | 7 +++---- Open-ILS/src/templates/opac/myopac/main.tt2 | 4 ++-- .../src/templates/opac/myopac/messages/list.tt2 | 3 +-- Open-ILS/src/templates/opac/myopac/prefs.tt2 | 13 ++++++------- .../src/templates/opac/myopac/prefs_my_lists.tt2 | 4 +--- .../src/templates/opac/parts/advanced/expert.tt2 | 4 ++-- .../src/templates/opac/parts/advanced/numeric.tt2 | 4 ++-- .../src/templates/opac/parts/advanced/search.tt2 | 8 ++++---- Open-ILS/src/templates/opac/parts/footer.tt2 | 14 ++++++-------- Open-ILS/src/templates/opac/parts/homesearch.tt2 | 10 +++++----- Open-ILS/src/templates/opac/parts/login/form.tt2 | 6 ++++-- Open-ILS/src/templates/opac/parts/login/help.tt2 | 4 ++-- .../templates/opac/parts/login/password_hint.tt2 | 2 +- .../src/templates/opac/parts/myopac/main_base.tt2 | 5 ++--- Open-ILS/src/templates/opac/parts/place_hold.tt2 | 4 ++-- .../src/templates/opac/parts/pref_lib_display.tt2 | 2 +- .../src/templates/opac/parts/record/cnbrowse.tt2 | 2 +- .../src/templates/opac/parts/record/contents.tt2 | 2 +- .../src/templates/opac/parts/record/copy_counts.tt2 | 2 +- .../src/templates/opac/parts/record/copy_table.tt2 | 4 ++-- Open-ILS/src/templates/opac/parts/record/extras.tt2 | 6 +++--- .../src/templates/opac/parts/record/navigation.tt2 | 8 ++++---- .../src/templates/opac/parts/record/subjects.tt2 | 2 +- .../src/templates/opac/parts/record/summary.tt2 | 17 +++++++++++------ .../src/templates/opac/parts/result/copy_counts.tt2 | 4 ++-- Open-ILS/src/templates/opac/parts/result/facets.tt2 | 2 +- .../src/templates/opac/parts/result/paginate.tt2 | 2 +- Open-ILS/src/templates/opac/parts/result/table.tt2 | 10 ++++++---- Open-ILS/src/templates/opac/parts/searchbar.tt2 | 10 +++++----- Open-ILS/src/templates/opac/parts/topnav_links.tt2 | 4 ++-- Open-ILS/src/templates/opac/register.tt2 | 7 +++---- Open-ILS/src/templates/opac/results.tt2 | 6 +++--- 37 files changed, 109 insertions(+), 113 deletions(-) diff --git a/Open-ILS/src/templates/opac/advanced.tt2 b/Open-ILS/src/templates/opac/advanced.tt2 index 9a183df8cf..1570e19284 100644 --- a/Open-ILS/src/templates/opac/advanced.tt2 +++ b/Open-ILS/src/templates/opac/advanced.tt2 @@ -11,7 +11,7 @@
diff --git a/Open-ILS/src/templates/opac/browse.tt2 b/Open-ILS/src/templates/opac/browse.tt2 index 256a65e2dd..305b7b3249 100644 --- a/Open-ILS/src/templates/opac/browse.tt2 +++ b/Open-ILS/src/templates/opac/browse.tt2 @@ -45,9 +45,7 @@
-

If you are having trouble renewing your items, please contact your - local library.

+

[% l("PINES Renewal Tip") %]

[% IF ctx.circs.size < 1 %] @@ -211,8 +210,7 @@ END %] -

* You will be unable to renew items if other patrons have holds on them, - if your account is expired, or if you have more than $10.00 in fines and fees.

+

[% l("PINES Renewal Note") %]

[% END %] diff --git a/Open-ILS/src/templates/opac/myopac/hold_history.tt2 b/Open-ILS/src/templates/opac/myopac/hold_history.tt2 index 8cfd1f1da5..6ba8df9421 100644 --- a/Open-ILS/src/templates/opac/myopac/hold_history.tt2 +++ b/Open-ILS/src/templates/opac/myopac/hold_history.tt2 @@ -29,7 +29,8 @@
- [% l("Previously Requested Items") %] + [% l("Previously Held Items") %] + - + @@ -98,10 +97,10 @@ [% IF CGI.param("available") -%] [% l('Show all holds') %] | - [% l("Holds that are ready to pick up") %] + [% l("Show only available holds") %] [% ELSE -%] - [% l("All holds") %] | - [% l("Show holds that are ready to pick up") %] + [% l("Show all holds") %] | + [% l("Show only available holds") %] [% END -%] @@ -123,9 +122,9 @@ [% l('Pickup Location') %] [% l('Activate') %] [% l('Cancel if not filled by') %] - [% l('Active?') %] + [% l('Active') %] [% l('Status') %] - [% l('Edit') %] + [% l('Notes') %] diff --git a/Open-ILS/src/templates/opac/myopac/lists.tt2 b/Open-ILS/src/templates/opac/myopac/lists.tt2 index 5ac0e8f222..417e87525d 100644 --- a/Open-ILS/src/templates/opac/myopac/lists.tt2 +++ b/Open-ILS/src/templates/opac/myopac/lists.tt2 @@ -14,11 +14,10 @@

[% l('My Lists') %]

+ -

Lists allow you to keep track of books you'd like to read in the future, recommendations you'd like - to share with other people, and more. Learn more about using lists.

- +

[% l("PINES List Tips") %]

+

[% l('Create New List') %]

diff --git a/Open-ILS/src/templates/opac/myopac/main.tt2 b/Open-ILS/src/templates/opac/myopac/main.tt2 index b37af03944..79d401cadb 100644 --- a/Open-ILS/src/templates/opac/myopac/main.tt2 +++ b/Open-ILS/src/templates/opac/myopac/main.tt2 @@ -126,8 +126,8 @@

-
[% l("Other Fees") %]
- +
[% l("Other Fines and Fees") %]
+
diff --git a/Open-ILS/src/templates/opac/myopac/messages/list.tt2 b/Open-ILS/src/templates/opac/myopac/messages/list.tt2 index 030138844c..f7ddb3a860 100644 --- a/Open-ILS/src/templates/opac/myopac/messages/list.tt2 +++ b/Open-ILS/src/templates/opac/myopac/messages/list.tt2 @@ -1,8 +1,7 @@
[% l("Messages") %]
-

If you require assistance, please contact your - local library.

+

[% l("PINES Account Tips") %]

limit, offset => (offset - limit)} ) %]' [% IF offset <= 0 %] class='invisible' [% END %]>◄[% l('Previous') %] diff --git a/Open-ILS/src/templates/opac/myopac/prefs.tt2 b/Open-ILS/src/templates/opac/myopac/prefs.tt2 index c8d62c9b19..74b9afb4d1 100644 --- a/Open-ILS/src/templates/opac/myopac/prefs.tt2 +++ b/Open-ILS/src/templates/opac/myopac/prefs.tt2 @@ -5,8 +5,7 @@

[% l('Account Preferences') %]

-

If you need to change your phone number or address, please visit your - local library.

+

[% l("PINES Account Info Tip") %]

[% l("Transaction Start Time") %]
@@ -44,7 +43,7 @@ [% END %] - + @@ -71,7 +70,7 @@ [%- ELSE %] + title="[% l('Change Username') %]">[% l("Change") %] [%- END %] @@ -81,7 +80,7 @@ [%- ELSE %] + title="[% l('Change Password') %]">[% l("Change") %] [%- END %] @@ -91,7 +90,7 @@ [%- ELSE %] + title="[% l('Update Email Address') %]">[% l('Change') %] [%- END %] @@ -213,7 +212,7 @@ {label => l("County"), name => 'county', value => update_addr.county}, {label => l("State"), name => 'state', value => update_addr.state}, {label => l("Country"), name => 'country', value => update_addr.country}, - {label => l("ZIP"), name => 'post_code', value => update_addr.post_code}, + {label => l("Zip"), name => 'post_code', value => update_addr.post_code}, ]; FOR field IN addr_fields %] diff --git a/Open-ILS/src/templates/opac/myopac/prefs_my_lists.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_my_lists.tt2 index 92516e00d2..7eb380ce11 100644 --- a/Open-ILS/src/templates/opac/myopac/prefs_my_lists.tt2 +++ b/Open-ILS/src/templates/opac/myopac/prefs_my_lists.tt2 @@ -6,9 +6,7 @@

[% l('List Preferences') %]

-

Lists allow you to keep track of books you'd like to read in the future, - recommendations you'd like to share with other people, and more. - Learn more about using lists.

+

[% l("PINES List Tips") %]

[% l("Day (Primary) Phone") %][% l("Day Phone") %] [% ctx.user.day_phone | html %]
[% l("Change User Name") %]
[% l("Change Password") %]
[% l('Change Email Address') %]
diff --git a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2 b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2 index 94018b8760..a424bc4114 100644 --- a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2 +++ b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2 @@ -1,5 +1,5 @@ -
[% l("MARC Record Search") %]
+
[% l("Expert Search") %]
@@ -37,7 +37,7 @@ [%- lib_select_id = "expert_search_library"; -%] @@ -30,10 +30,10 @@ -
-
Choose Search Limits:
-

Tip: Ctrl-Click to select multiple lines or to deselect lines (Shift-Click for Macs).

+
[% l('Search Filters') %]
+

[% l("PINES Advanced Search Note") %]

+ [% in_row = 0; FOR adv_chunk IN search.adv_config; diff --git a/Open-ILS/src/templates/opac/parts/footer.tt2 b/Open-ILS/src/templates/opac/parts/footer.tt2 index 1a7ddfc1c9..ac462ff295 100644 --- a/Open-ILS/src/templates/opac/parts/footer.tt2 +++ b/Open-ILS/src/templates/opac/parts/footer.tt2 @@ -6,11 +6,11 @@ [% IF ctx.get_org_setting( ctx.physical_loc || ctx.aou_tree.id, 'opac.allow_pending_user') %] - [% l('Apply for a Card') %] - [% l('Apply for a PINES Library Card') %]         + [% l('Request Library Card') %] + [% l('Request Library Card') %]         [% END %] - - + + [% l('About PINES') %][%- l('Learn More About PINES') %] @@ -27,7 +27,7 @@ [% IF ctx.get_org_setting( ctx.physical_loc || ctx.aou_tree.id, 'opac.allow_pending_user') %] - [% l('Apply for a PINES Library Card') %]
+ [% l('Request Library Card') %]
[% END %] [% l('GALILEO Research Databases') %]
@@ -59,9 +59,7 @@ alt="[% l('Evergreen') %]" /> -

This Web site and other Georgia Public Library Service programs are partially assisted with - funds from the Library Services and Technology Act through the - Institute of Museum and Library Services.

+

[% l('Funding Note') %]

diff --git a/Open-ILS/src/templates/opac/parts/homesearch.tt2 b/Open-ILS/src/templates/opac/parts/homesearch.tt2 index db8a44baa7..c02f6faba7 100644 --- a/Open-ILS/src/templates/opac/parts/homesearch.tt2 +++ b/Open-ILS/src/templates/opac/parts/homesearch.tt2 @@ -5,15 +5,15 @@
[% l('Library Locations') %]
- Find a PINES Library + [% l('Library Locations') %]
-

Your PINES card gives you access to
more than 275 libraries across Georgia!

+

[% l('PINES Library Locations Note') %]

- [% l('Help') %]
- PINES Catalog Help + [% l('PINES Catalog Help') %]
+ [% l('PINES Catalog Help') %]
-

Tips on searching the catalog, placing holds, and other frequently asked questions.

+

[% l('PINES Help Note') %]

diff --git a/Open-ILS/src/templates/opac/parts/login/form.tt2 b/Open-ILS/src/templates/opac/parts/login/form.tt2 index 052044f749..2e14668678 100644 --- a/Open-ILS/src/templates/opac/parts/login/form.tt2 +++ b/Open-ILS/src/templates/opac/parts/login/form.tt2 @@ -23,8 +23,10 @@ [% INCLUDE "opac/parts/login/username_hint.tt2" %] +
@@ -56,8 +58,8 @@ redirect = redirect | replace('^http:', 'https:'); %] - - + +
diff --git a/Open-ILS/src/templates/opac/parts/login/help.tt2 b/Open-ILS/src/templates/opac/parts/login/help.tt2 index df472bdfc8..49f4aa4512 100644 --- a/Open-ILS/src/templates/opac/parts/login/help.tt2 +++ b/Open-ILS/src/templates/opac/parts/login/help.tt2 @@ -1,9 +1,9 @@
-
- Enter Search Words: + [% l("Search Input") %]
diff --git a/Open-ILS/src/templates/opac/parts/place_hold.tt2 b/Open-ILS/src/templates/opac/parts/place_hold.tt2 index df35919a8b..67af2ead79 100644 --- a/Open-ILS/src/templates/opac/parts/place_hold.tt2 +++ b/Open-ILS/src/templates/opac/parts/place_hold.tt2 @@ -49,7 +49,7 @@ function maybeToggleNumCopies(obj) {
- [% l('Place Hold On:') %] + [% l('Place Hold') %]
[% some_holds_allowed = -1 %] @@ -246,7 +246,7 @@ function maybeToggleNumCopies(obj) { [% IF ctx.default_phone_notify %]checked="checked"[% END %]/>
-
diff --git a/Open-ILS/src/templates/opac/parts/pref_lib_display.tt2 b/Open-ILS/src/templates/opac/parts/pref_lib_display.tt2 index 08067c9cda..22c6a2f22c 100644 --- a/Open-ILS/src/templates/opac/parts/pref_lib_display.tt2 +++ b/Open-ILS/src/templates/opac/parts/pref_lib_display.tt2 @@ -1,5 +1,5 @@ [%- IF ctx.pref_ou && ctx.pref_ou != ctx.search_ou; %] - [% l('Preferred search location: [_1]', '' _ ctx.get_aou(ctx.pref_ou).name _ ''); %] + [% l('Preferred library: [_1]', '' _ ctx.get_aou(ctx.pref_ou).name _ ''); %] [%- END; %] diff --git a/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2 b/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2 index dc6cf0f3c7..8c0af53e9f 100644 --- a/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2 @@ -7,7 +7,7 @@

[% l("You are now browsing [_1]", ctx.browsing_ou.name) | html %]
- (Shelf browsing works best if you are browsing a single library location and not an entire library system.) + [% l("PINES Shelf Browse Tip") %]

diff --git a/Open-ILS/src/templates/opac/parts/record/contents.tt2 b/Open-ILS/src/templates/opac/parts/record/contents.tt2 index 3c4ef3e418..02d00665e2 100644 --- a/Open-ILS/src/templates/opac/parts/record/contents.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/contents.tt2 @@ -205,7 +205,7 @@ BLOCK render_all_contents; [%- content_html = PROCESS render_all_contents; IF content_html.length > 0; %] -

[% l('Contents / Notes') %]

+

[% l('Content descriptions') %]

[%- content_html %] diff --git a/Open-ILS/src/templates/opac/parts/record/copy_counts.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_counts.tt2 index 44fa9bb357..a0a783fe88 100644 --- a/Open-ILS/src/templates/opac/parts/record/copy_counts.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/copy_counts.tt2 @@ -1,5 +1,5 @@ -

[% l('Currently available copies') %]

+

[% l('Available copies') %]

    [%- depths = ctx.copy_summary.size; depth = 0; diff --git a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 index 40fdaa7a2d..5877bbbbad 100644 --- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 @@ -32,8 +32,8 @@ END; [% IF serial_holdings -%]
[%- ELSE -%] - [%- END %] diff --git a/Open-ILS/src/templates/opac/parts/record/extras.tt2 b/Open-ILS/src/templates/opac/parts/record/extras.tt2 index 1855dedfc9..da75116d39 100644 --- a/Open-ILS/src/templates/opac/parts/record/extras.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/extras.tt2 @@ -55,13 +55,13 @@ extras = [ {name => 'summaryplus', label => l('Summaries & More'), hide => hide_summary}, {name => 'annotation', label => l('Annotation'), hide => 1}, - {name => 'awards', label => l('Recommended Reads and Reviews')}, + {name => 'awards', label => l('Awards, Reviews, & Suggested Reads')}, {name => 'excerpt', label => l('Excerpt'), hide => 1}, {name => 'issues', label => l('Issues Held'), hide => !(ctx.have_holdings_to_show || ctx.have_mfhd_to_show)}, {name => 'preview', label => l('Preview'), hide => 1}, {name => 'addedcontent', label => l('Additional Content'), hide => hide_ac}, # hide if all content is known to not exist - {name => 'cnbrowse', label => l('Browse the Shelves')}, - {name => 'marchtml', label => l('View MARC Record')} + {name => 'cnbrowse', label => l('Shelf Browser')}, + {name => 'marchtml', label => l('MARC Record')} ]; FOREACH extra IN extras; diff --git a/Open-ILS/src/templates/opac/parts/record/navigation.tt2 b/Open-ILS/src/templates/opac/parts/record/navigation.tt2 index c0e489b458..a6b132173f 100644 --- a/Open-ILS/src/templates/opac/parts/record/navigation.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/navigation.tt2 @@ -1,14 +1,14 @@ [% IF ctx.search_result_index.defined && ctx.search_result_index >= 0 %]
- ◄ [% l('Return to Search Results') %] + ◄ [% l('Search Results') %] - [% l('Now showing item [_1] of about [_2]', ctx.search_result_index + 1, ctx.hit_count) %] + [% l('Showing Item [_1] of [_2]', ctx.search_result_index + 1, ctx.hit_count) %] [%- INCLUDE "opac/parts/pref_lib_display.tt2" %] @@ -23,7 +23,7 @@ ctx.prev_rec_url = mkurl(ctx.prev_search_record, prev_args, stop_parms); %] ◄ [% l('Previous Item') %]       + href='[% ctx.prev_rec_url %]' rel="nofollow" vocab="">◄ [% l('Previous') %]       [% END %] [% @@ -35,7 +35,7 @@ ctx.next_rec_url = mkurl(ctx.next_search_record, next_args, stop_parms); %] [% l('Next Item') %] ► + href='[% ctx.next_rec_url %]' rel="nofollow" vocab="">[% l('Next') %] ► [% END %]
diff --git a/Open-ILS/src/templates/opac/parts/record/subjects.tt2 b/Open-ILS/src/templates/opac/parts/record/subjects.tt2 index a4efc9670a..f987125c38 100644 --- a/Open-ILS/src/templates/opac/parts/record/subjects.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/subjects.tt2 @@ -139,6 +139,6 @@ [%- subject_html = PROCESS render_all_subjects; IF subject_html.length > 0; %] -

[% l('Find similar items by subject') %]

+

[% l('Search for related items by subject') %]

[%- subject_html %] [%- END %] diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2 index a2118cb6ae..4ca9334cde 100644 --- a/Open-ILS/src/templates/opac/parts/record/summary.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2 @@ -136,6 +136,15 @@ %] [% END %] +
+ [% IF ctx.mylist.size %] + [%- IF ctx.user; %] + [% l('View My Lists') %][% l(' View My Lists') %] + [%- ELSE %] + [% l('View My Temporary List') %][% l(' View My Temporary List') %] + [%- END %] + [% END %] +
[% l('Print / Email Actions Image') %] [% l('Print') %] / @@ -236,10 +245,6 @@ IF num_uris > 0; IF ebook_api.enabled == 'true'; INCLUDE "opac/parts/ebook_api/avail.tt2"; END; -[%- END %] - -[%- # Hold/copy summary - IF ctx.copy_summary.0.count %] [%- END %]
@@ -262,7 +267,7 @@ INCLUDE "opac/parts/record/copy_counts.tt2"; END; count_entry = count_entry + 1; END; - l("[quant,_1,current hold,current holds] on [quant,_2,total copy,total copies]", + l("[quant,_1,current hold,current holds] with [quant,_2,total copy,total copies].", ctx.record_hold_count, ctx.copy_summary.$count_entry.count) %]

@@ -355,7 +360,7 @@ END; %]
-

[% l("Item details") %]

+

[% l("Record details") %]

    [%- IF attrs.hl.isbn.size; FOR isbn IN attrs.hl.isbn %]
  • 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 @@ %]
    [% 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)) %]
    [% - 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/result/facets.tt2 b/Open-ILS/src/templates/opac/parts/result/facets.tt2 index 321f6a7cd1..98311ca8e5 100644 --- a/Open-ILS/src/templates/opac/parts/result/facets.tt2 +++ b/Open-ILS/src/templates/opac/parts/result/facets.tt2 @@ -4,7 +4,7 @@
    [% l('Narrow Your Search') %]
    - Tip: Click on the links below to narrow down your search results. To remove a search limit you've selected, click on the link again. + [% l('PINES Facet Tip') %]
    [% END %] [% diff --git a/Open-ILS/src/templates/opac/parts/result/paginate.tt2 b/Open-ILS/src/templates/opac/parts/result/paginate.tt2 index 0ffe6be63d..7f4f031c4d 100644 --- a/Open-ILS/src/templates/opac/parts/result/paginate.tt2 +++ b/Open-ILS/src/templates/opac/parts/result/paginate.tt2 @@ -6,7 +6,7 @@ [%~ |l('' _ ctx.result_start _'', '' _ ctx.result_stop _ '', '' _ ctx.hit_count _ '') ~%] - Now showing results [_1] - [_2] of about [_3] + Results [_1] - [_2] of about [_3] [%~ END %] [%~ |l('' _ (page + 1) _ '', diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2 index 2dc075c441..919d956a27 100644 --- a/Open-ILS/src/templates/opac/parts/result/table.tt2 +++ b/Open-ILS/src/templates/opac/parts/result/table.tt2 @@ -194,10 +194,12 @@ END; OR show_more_details.default == 'hide'); IF attrs.pubdate; pubdate_clean = attrs.pubdate | html; - l("Publication Date: ([_1])", pubdate_clean); + l("Publication Date:"); + l(" ([_1])", pubdate_clean); ELSIF attrs.copyright; copyright_clean = attrs.copyright | html; - l("Copyright Date: ([_1])", copyright_clean); + l("Copyright Date:"); + l(" ([_1])", copyright_clean); END; END -%] @@ -215,7 +217,7 @@ END; [% IF args.holdings.size > 0 %]
@@ -506,7 +508,7 @@ END; %] [% ELSE; operation = ctx.mylist.grep(rec.id).size ? "delete" : "add"; - label = (operation == "add") ? l("Add To My List") : l("Remove From List"); + label = (operation == "add") ? l("Add to my list") : l("Remove from my list"); title_label = (operation == "add") ? l("Add [_1] to my list", attrs.title) : l("Remove [_1] from my list", attrs.title); diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2 index 645eb3a7a2..09566219a0 100644 --- a/Open-ILS/src/templates/opac/parts/searchbar.tt2 +++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2 @@ -40,7 +40,7 @@ END; [% END %]
[%- - 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 @@ -94,7 +94,7 @@ END;
[%- - 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 diff --git a/Open-ILS/src/templates/opac/parts/topnav_links.tt2 b/Open-ILS/src/templates/opac/parts/topnav_links.tt2 index ad5a7ce450..3a77565774 100644 --- a/Open-ILS/src/templates/opac/parts/topnav_links.tt2 +++ b/Open-ILS/src/templates/opac/parts/topnav_links.tt2 @@ -16,11 +16,11 @@ [% l('Library Locations') %] [% l('Kids Catalog') %] - [% l("Kids' Catalog") %] + [% l("Kids Catalog") %] [% l('GALILEO') %] - [% l('GALILEO Research Databases') %] + [% l('GALILEO') %] [% l('Help') %] [% l('Help') %] diff --git a/Open-ILS/src/templates/opac/register.tt2 b/Open-ILS/src/templates/opac/register.tt2 index cc72ef56bd..30cc32271f 100644 --- a/Open-ILS/src/templates/opac/register.tt2 +++ b/Open-ILS/src/templates/opac/register.tt2 @@ -54,12 +54,12 @@ END;
-

[% l('Apply for a PINES Library Card')%]

+

[% l('Request a Library Card')%]

[% IF ctx.register.success %]

[% l('Registration successful!') %]

-

[% l('Please visit your Home Library within 14 days to complete your registration.') %]

+

[% l('Please see library staff to complete your registration.') %]

[% IF ctx.register.username_taken %]

@@ -112,8 +112,7 @@ END; valid_org_list=ctx.register.valid_orgs %]

[% l("Issue Label") %][% l("Library System: Library Branch Name") %]
- (Click library name for locations and hours) + 		[% l("PINES Location") %]
+ [% l("PINES Location Tip") %] 		[% l("Shelving Location") %]
- [% l('Call Number:') %] + [% l('Call number:') %] [% args.holdings.0.label | html %]
diff --git a/Open-ILS/src/templates/opac/results.tt2 b/Open-ILS/src/templates/opac/results.tt2 index b511c7dda6..9c93779d99 100644 --- a/Open-ILS/src/templates/opac/results.tt2 +++ b/Open-ILS/src/templates/opac/results.tt2 @@ -68,7 +68,7 @@ [% END %] - [% IF NOT metarecords.disabled %] [% END %] [% IF ctx.depth_sel_checkbox %] -- 2.11.0