From 06dd3972f5b06700fc017a652882e3fc000b26dc Mon Sep 17 00:00:00 2001 From: Garry Collum Date: Tue, 11 Oct 2022 17:47:14 +0000 Subject: [PATCH] LP1992490-Bootstrap Opac: sr-only, aria-label, and title localization. Corrects some instances of non-localization of sr-only fields, aria-labels, and title attributes. Also corrects some stray display strings that were not localized. To test: Apply the patch, and view each page to see if it renders. View the page source of each page to see if the sr-only fields, aria-labels, and title attributes are rendered correctly. Signed-off-by: Garry Collum Signed-off-by: Stephanie Leary Signed-off-by: Jane Sandberg --- .../src/templates-bootstrap/opac/myopac/charges.tt2 | 16 ++++++++-------- Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 | 16 ++++++++-------- .../templates-bootstrap/opac/myopac/hold_history.tt2 | 10 +++++----- Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 | 18 +++++++++--------- Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2 | 4 ++-- .../templates-bootstrap/opac/myopac/messages/list.tt2 | 12 ++++++------ Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2 | 2 +- .../templates-bootstrap/opac/myopac/prefs_my_lists.tt2 | 4 ++-- .../templates-bootstrap/opac/myopac/prefs_settings.tt2 | 2 +- .../opac/parts/login/login_modal.tt2 | 4 ++-- .../templates-bootstrap/opac/parts/result/table.tt2 | 12 ++++++------ .../templates-bootstrap/opac/parts/topnav_links.tt2 | 10 +++++----- Open-ILS/src/templates-bootstrap/opac/register.tt2 | 4 ++-- 13 files changed, 57 insertions(+), 57 deletions(-) diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 index 323a417a1d..7108f72d02 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 @@ -135,7 +135,7 @@ - *Items may have been renewed. + *[% l('Items may have been renewed.') %] [% END %] @@ -188,13 +188,13 @@ [% c = c + 1; %] [% IF myopac_cc_allowed %] - - + + [% END %] - Amount Owed + [% l('Amount Owed') %] [% money(f.xact.balance_owed) %] @@ -202,19 +202,19 @@ - Billing For + [% l('Billing For') %] [% f.xact.last_billing_type %] [% IF f.xact.last_billing_note; %] - Note + [% l('Note') %] [% f.xact.last_billing_note %] [% END %] - Date of Billing + [% l('Date of Billing') %] [% date.format(ctx.parse_datetime(f.xact.xact_start),DATE_FORMAT) %] @@ -251,7 +251,7 @@ $( document ).ready(function() { amount += item; }); $("#total").val(amount); - $("#selectPay").html(' Pay Selected Charges - $' + amount.toFixed(2)); + $("#selectPay").html(' [% l('Pay Selected Charges') %] - $' + amount.toFixed(2)); }); }); diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 index 6d68fd8dde..64aa9555ad 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 @@ -27,7 +27,7 @@
- +
@@ -147,7 +147,7 @@ PROCESS show_cover; %] - Title + [% l('Title') %] [% IF circ.circ.target_copy.call_number.id == -1 %] [% circ.circ.target_copy.dummy_title | html %] [% ELSIF circ.ATTRS.title %] @@ -159,10 +159,10 @@ [% IF circ.circ.target_copy.call_number.id == -1 %] - Author + [% l('Author') %] [% circ.circ.target_copy.dummy_author | html %] [% ELSIF circ.ATTRS.author %] - Author + [% l('Author') %] Renewals Remaining + [% l('Renewals Remaining') %] [% circ.circ.renewal_remaining %] [% @@ -180,15 +180,15 @@ due_class = (date.now > date.format(due_date, '%s')) ? 'error' : ''; %] - Due Date + [% l('Due Date') %] [% date.format(due_date, DATE_FORMAT) %] - Barcode + [% l('Barcode') %] [% circ.circ.target_copy.barcode | html %] - Call Number + [% l('Call Number') %] [%- cnlist = []; FOREACH element IN [circ.circ.target_copy.call_number.prefix.label diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2 index fdd6947429..46d761a250 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2 @@ -82,14 +82,14 @@ PROCESS show_cover; %] - Title + [% l('Title') %] [% IF attrs.author; %] - Author + [% l('Author') %]
Format [% attrs.format_label | html %] + [% l('Format') %] [% attrs.format_label | html %] - Pickup Location + [% l('Pickup Location') %] [% ctx.get_aou(ahr.pickup_lib).name | html %] - Hold Status + [% l('Hold Status') %]
[% PROCESS get_hold_status hold=hold; %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 index 0c540390b9..e6c38fdaa2 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 @@ -153,7 +153,7 @@ - Hold Number [% cnt; %] + [% l('Hold Number') %] [% cnt; %] @@ -169,7 +169,7 @@ PROCESS show_cover; %] - Title + [% l('Title') %]
[% title = hold.ATTRS.title; IF ahr.hold_type == 'P'; @@ -183,7 +183,7 @@
- Author + [% l('Author') %]
Format + [% l('Format') %]
[% formats = hold.ATTRS.all_formats; @@ -216,29 +216,29 @@
- Pickup Location + [% l('Pickup Location') %] [% ctx.get_aou(ahr.pickup_lib).name | html %] - Cancel if not filled by + [% l('Cancel if not filled by') %] [% IF ahr.expire_time; date.format(ctx.parse_datetime(ahr.expire_time), DATE_FORMAT); END %] - Status + [% l('Status') %]
[% PROCESS get_hold_status hold=hold; %]
- Notify Method + [% l('Notify Method') %]
[% PROCESS get_hold_notify h=ahr; %]
- Notes + [% l('Notes') %] [%- FOREACH pubnote IN ahr.notes; IF pubnote.pub == 't'; %] diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2 index 45bba81db1..6d96aea880 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2 @@ -44,7 +44,7 @@ +
@@ -140,7 +140,7 @@ ltitle = l("Hide items in list"); END %]

[% bbag.name | html %][% IF bbag.pub == 't'; %] - + [% END %]

diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/messages/list.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/messages/list.tt2 index 8da00a9605..902dda922d 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/messages/list.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/messages/list.tt2 @@ -95,25 +95,25 @@ [% FOR message IN ctx.patron_messages; %] - Message Number [% count; %] + [% l('Message Number') count; %] - Date of Message + [% l('Date of Message') %] [% date.format(ctx.parse_datetime(message.create_date), DATE_FORMAT); %] - Library + [% l('Library') %] [% message.library | html %] - Title of Message + [% l('Title of Message') %] [% message.title | html %] - Message Options - Read + [% l('Message Options') %] + [% l('Read') %] [% END %] diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2 index e21a757574..684fcbb05c 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2 @@ -196,7 +196,7 @@
- Addresses + [% l('Addresses') %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_my_lists.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_my_lists.tt2 index ab6cfb4e1a..71ff71c5be 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_my_lists.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_my_lists.tt2 @@ -34,7 +34,7 @@ selected='selected'[% END %]>[% val | html %] [% END %] - + @@ -53,7 +53,7 @@ selected='selected'[% END %]>[% val | html %] [% END %] - + diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2 index 5dafea6f10..dfc08e537b 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2 @@ -47,7 +47,7 @@ selected='selected'[% END %]>[% val | html %] [% END %] - + diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/login/login_modal.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/login/login_modal.tt2 index 44c4544d0a..a778b7ccd7 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/login/login_modal.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/login/login_modal.tt2 @@ -3,8 +3,8 @@
-

Login To Evergreen

-
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2 index d01c1722d4..ce8ab1921f 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2 @@ -316,13 +316,13 @@ [% FOR copy IN args.holdings %] - Library [%- copy_info = copy; INCLUDE "opac/parts/library_name_link.tt2"; %] - Shelving Location [% copy.location | html %] - Call Number [% copy.label | html %] + [% l('Library') %] [%- copy_info = copy; INCLUDE "opac/parts/library_name_link.tt2"; %] + [% l('Shelving Location') %] [% copy.location | html %] + [% l('Call Number') %] [% copy.label | html %] [%- IF has_parts == 'true'; %] - Part [% copy.part_label %] + [% l('Part') %] [% copy.part_label %] [%- END %] - Status [% copy.status | html %] + [% l('Status') %] [% copy.status | html %] [% END %] @@ -487,7 +487,7 @@

[% l('Saved Searches') %]

[% INCLUDE "opac/parts/staff_saved_searches.tt2" %] [%- END %] -

[% l('Search Results facets') %]

+

[% l('Search Results Facets') %]

[% l('Search Results List') %]

diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2 index 7d6d510180..63b22915b1 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2 @@ -11,19 +11,19 @@ @@ -41,7 +41,7 @@
  • - Hello, [% l('[_1] [_2]', ctx.user.pref_first_given_name || ctx.user.first_given_name, ctx.user.pref_family_name || ctx.user.family_name) | html %] + [% l('Hello, [_1] [_2]', ctx.user.pref_first_given_name || ctx.user.first_given_name, ctx.user.pref_family_name || ctx.user.family_name) | html %]
  • diff --git a/Open-ILS/src/templates-bootstrap/opac/register.tt2 b/Open-ILS/src/templates-bootstrap/opac/register.tt2 index c6dbec3796..9b0c3f5a24 100755 --- a/Open-ILS/src/templates-bootstrap/opac/register.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/register.tt2 @@ -50,7 +50,7 @@ register_fields = [

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

    - ★ = Required Field + [% l('★ indicates Required Field') %]
    [% IF ctx.register.success %] @@ -172,7 +172,7 @@ FOR field_def IN register_fields; value='[% value || CGI.param(field_path) | html %]' [% IF require %]required[% END %]/> [% END %]
    - Please enter a [% field_def.label | html %] + [% l('Please enter a') %] [% field_def.label | html %]
    [% IF example %] -- 2.11.0