From 82d65eccd0c40ab9e832a6a196b11608aa9520a4 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Mon, 10 Jun 2013 08:42:18 +0300 Subject: [PATCH] Move HTML tags out of translatable strings in toolkit templates. Signed-off-by: Pasi Kallinen Signed-off-by: Remington Steed Signed-off-by: Dan Scott --- .../src/templates/acq/common/claim_dialog.tt2 | 2 +- .../src/templates/acq/common/li_table.tt2 | 4 +- .../acq/financial/claim_eligible.tt2 | 3 +- Open-ILS/src/templates/acq/fund/list.tt2 | 32 ++++++++-------- .../src/templates/acq/picklist/from_bib.tt2 | 3 +- Open-ILS/src/templates/acq/search/unified.tt2 | 3 +- .../conify/global/acq/edi_account.tt2 | 20 ++++++---- Open-ILS/src/templates/kpac/getit.tt2 | 4 +- Open-ILS/src/templates/kpac/getit_results.tt2 | 24 ++++-------- .../src/templates/kpac/parts/paginate.tt2 | 4 +- Open-ILS/src/templates/opac/myopac/lists.tt2 | 8 ++-- .../templates/opac/myopac/update_email.tt2 | 4 +- .../templates/opac/myopac/update_password.tt2 | 6 +-- .../templates/opac/myopac/update_username.tt2 | 9 ++--- .../src/templates/opac/parts/login/form.tt2 | 4 +- .../opac/parts/myopac/main_refund_policy.tt2 | 16 ++++---- .../opac/parts/myopac/prefs_hints.tt2 | 6 +-- .../templates/opac/parts/pref_lib_display.tt2 | 2 +- .../templates/opac/parts/result/lowhits.tt2 | 38 +++++++++++-------- .../templates/opac/parts/result/paginate.tt2 | 12 +++--- .../src/templates/serial/subscription.tt2 | 13 +++---- Open-ILS/web/js/dojo/openils/acq/nls/acq.js | 2 +- .../web/js/dojo/openils/actor/nls/register.js | 2 +- .../web/js/dojo/openils/circ/nls/selfcheck.js | 10 ++--- .../js/ui/default/acq/financial/list_funds.js | 4 +- .../web/js/ui/default/actor/user/register.js | 6 +-- .../js/ui/default/circ/selfcheck/selfcheck.js | 10 ++--- .../server/locale/en-US/patron.properties | 12 +++--- .../xul/staff_client/server/patron/display.js | 12 +++--- 29 files changed, 134 insertions(+), 141 deletions(-) diff --git a/Open-ILS/src/templates/acq/common/claim_dialog.tt2 b/Open-ILS/src/templates/acq/common/claim_dialog.tt2 index e3c2d2e23b..e886edb766 100644 --- a/Open-ILS/src/templates/acq/common/claim_dialog.tt2 +++ b/Open-ILS/src/templates/acq/common/claim_dialog.tt2 @@ -3,7 +3,7 @@ src="[% ctx.media_prefix %]/js/ui/default/acq/common/claim_dialog.js">
[% l('Claims') %]
-
[% l('Against item: [_1] ([_2]', +
[% l('Against item: [_1] ([_2])', '', '') %]
diff --git a/Open-ILS/src/templates/acq/common/li_table.tt2 b/Open-ILS/src/templates/acq/common/li_table.tt2 index d6a478ea3f..0a2151afd8 100644 --- a/Open-ILS/src/templates/acq/common/li_table.tt2 +++ b/Open-ILS/src/templates/acq/common/li_table.tt2 @@ -531,8 +531,8 @@
- [% |l %]This will update the fund for all copies attached to these lineitems.
- This will also update any existing encumbered or spent debits.[% END %] + [% l('This will update the fund for all copies attached to these lineitems.') %]
+ [% l('This will also update any existing encumbered or spent debits.') %]

diff --git a/Open-ILS/src/templates/acq/financial/claim_eligible.tt2 b/Open-ILS/src/templates/acq/financial/claim_eligible.tt2 index 2bb3a8a69b..c798504f05 100644 --- a/Open-ILS/src/templates/acq/financial/claim_eligible.tt2 +++ b/Open-ILS/src/templates/acq/financial/claim_eligible.tt2 @@ -31,8 +31,7 @@
diff --git a/Open-ILS/src/templates/acq/fund/list.tt2 b/Open-ILS/src/templates/acq/fund/list.tt2 index 110c08eac6..ab6de7b539 100644 --- a/Open-ILS/src/templates/acq/fund/list.tt2 +++ b/Open-ILS/src/templates/acq/fund/list.tt2 @@ -48,10 +48,10 @@ @@ -64,11 +64,11 @@ @@ -81,9 +81,9 @@ @@ -104,9 +104,9 @@ @@ -146,7 +146,7 @@
- [% |l %]Propagation creates new funds for the subsequent fiscal year based on the - funds for the selected fiscal year. Only funds with the propagate setting - enabled will be affected. No money or encumbrances are altered - during this process.[% END %] + [% l('Propagation creates new funds for the subsequent fiscal year based on the ' _ + 'funds for the selected fiscal year. Only funds with the propagate setting ' _ + 'enabled will be affected. No money or encumbrances are altered ' _ + 'during this process.') %]
- [% |l %]The year end close out operation moves encumbrances from the selected fiscal - year to the analogous funds in the subsequent fiscal year and it deactivates - funds for the selected fiscal year. Additionally, for all funds that have - the "Rollover" setting enabled, this process will move all unspent money to - the analogous fund in the subsequent fiscal year.[% END %] + [% l('The year end close out operation moves encumbrances from the selected fiscal ' _ + 'year to the analogous funds in the subsequent fiscal year and it deactivates ' _ + 'funds for the selected fiscal year. Additionally, for all funds that have ' _ + 'the "Rollover" setting enabled, this process will move all unspent money to ' _ + 'the analogous fund in the subsequent fiscal year.') %]
- [% |l %]When Dry Run is selected, the system will generate a summary of - the changes that would occur during the selected operation(s). - No data will be changed.[% END %] + [% l('When Dry Run is selected, the system will generate a summary of ' _ + 'the changes that would occur during the selected operation(s). ' _ + 'No data will be changed.') %]
- + diff --git a/Open-ILS/src/templates/conify/global/acq/edi_account.tt2 b/Open-ILS/src/templates/conify/global/acq/edi_account.tt2 index 4b5099f644..d18f128fda 100644 --- a/Open-ILS/src/templates/conify/global/acq/edi_account.tt2 +++ b/Open-ILS/src/templates/conify/global/acq/edi_account.tt2 @@ -41,14 +41,18 @@
- [% |l %] - Host is the full FTP/SSH hostname, including the protocol, e.g. ftp://ftp1.somevendor.com
- Username, Password and Account are (s)FTP/SSH parameters.
- Account is unlikely to be used by modern systems and should typically be empty.
- Vendor Account Number (VAN) is vendor-assigned, only needed if different than the org_unit SAN.
- Vendor Assigned Code (VAC) is essentially a sub-account designation, e.g. '0001'. It can be used with or without VAN.
- The location of codes in the EDI message itself may vary according to vendor-specific semantics. - [% END %] + [% i18n_host = '' _ l('Host') _ ''; + i18n_username = '' _ l('Username') _ ''; + i18n_password = '' _ l('Password') _ ''; + i18n_account = '' _ l('Account') _ ''; + i18n_van = '' _ l('Vendor Account Number') _ ''; + i18n_vac = '' _ l('Vendor Assigned Code') _ ''; + l('[_1] is the full FTP/SSH hostname, including the protocol, e.g. ftp://ftp1.somevendor.com', i18n_host) %]
+ [% l('[_1], [_2] and [_3] are (s)FTP/SSH parameters.', i18n_username, i18n_password, i18n_account) %]
+ [% l('[_1] is unlikely to be used by modern systems and should typically be empty.', i18n_account) %]
+ [% l('[_1] (VAN) is vendor-assigned, only needed if different than the org_unit SAN.', i18n_van) %]
+ [% l("[_1] (VAC) is essentially a sub-account designation, e.g. '0001'. It can be used with or without VAN.", i18n_vac) %]
+ [% l('The location of codes in the EDI message itself may vary according to vendor-specific semantics.') %]
diff --git a/Open-ILS/src/templates/kpac/getit.tt2 b/Open-ILS/src/templates/kpac/getit.tt2 index 061e23cf60..a807b0d233 100644 --- a/Open-ILS/src/templates/kpac/getit.tt2 +++ b/Open-ILS/src/templates/kpac/getit.tt2 @@ -26,8 +26,8 @@

[% l('get it!') %]

-

[% |l %]If you would like to place a hold on this item, please enter the - following information and click
Submit below:[% END %]

+

[% l('If you would like to place a hold on this item, please enter the ' _ + 'following information and click Submit below:') %]

diff --git a/Open-ILS/src/templates/kpac/getit_results.tt2 b/Open-ILS/src/templates/kpac/getit_results.tt2 index ace6ce5bfb..18b12ea2cd 100644 --- a/Open-ILS/src/templates/kpac/getit_results.tt2 +++ b/Open-ILS/src/templates/kpac/getit_results.tt2 @@ -14,35 +14,27 @@ [% IF ctx.added_to_anon %]

[% l('You Saved It!') %]

- [% |l(title_html) %] - You successfully saved [_1].
- To manage your lists, go to My Lists - [% END %] + [% l('You successfully saved [_1].', title_html) %]
+ [% l('To manage your lists, go to [_1]My Lists[_2]', '', '') %]

[% ELSIF ctx.added_to_list %] [% list_html = ctx.list.name | html %]

[% l('You Saved It!') %]

- [% |l(title_html, list_html) %] - You successfully saved [_1] to [_2].
- To manage your lists, go to My Lists - [% END %] + [% l('You successfully saved [_1] to [_2].', title_html, list_html) %]
+ [% l('To manage your lists, go to [_1]My Lists[_2]', '', '') %]

[% ELSIF CGI.param('hold') %] [% lib_html = ctx.get_aou(ctx.hold.pickup_lib).name | html %]

[% l('Hold Successful!') %]

- [% |l(title_html, lib_html) %] - Your request for [_1] was successful.
- You will be notified when your item is ready for pickup. You will be able to pick your item up at [_2]. - [% END %] + [% l('Your request for [_1] was successful.', '' _ title_html _ '') %]
+ [% l('You will be notified when your item is ready for pickup. You will be able to pick your item up at [_1].', lib_html) %]

[% ELSE %]

- [% |l(title_html) %] - Unable to request [_1].
- Please see a librarian. - [% END %] + [% l('Unable to request [_1].', '' _ title_html _ '') %]
+ [% l('Please see a librarian.') %] [% END %] diff --git a/Open-ILS/src/templates/kpac/parts/paginate.tt2 b/Open-ILS/src/templates/kpac/parts/paginate.tt2 index 225b74ebba..f5b875bde3 100644 --- a/Open-ILS/src/templates/kpac/parts/paginate.tt2 +++ b/Open-ILS/src/templates/kpac/parts/paginate.tt2 @@ -24,9 +24,7 @@ - [% |l(page + 1, page_count) %] - - [% END %] + ') %]
Page [_1] of [_2][% l('Page [_1] of [_2]', '' _ (page + 1) _ '', '' _ page_count _ '
diff --git a/Open-ILS/src/templates/opac/myopac/lists.tt2 b/Open-ILS/src/templates/opac/myopac/lists.tt2 index da1926f7f1..ec729e7052 100644 --- a/Open-ILS/src/templates/opac/myopac/lists.tt2 +++ b/Open-ILS/src/templates/opac/myopac/lists.tt2 @@ -366,10 +366,10 @@ [% END %] -[% |l %]Sharing a Bookbag means that the contents -of the Bookbag will be visible to others. -To see the public view of a shared Bookbag, -click on the Bookbag's name in the Bookbag list.[% END %] +[% l("Sharing a Bookbag means that the contents " _ +"of the Bookbag will be visible to others. " _ +"To see the public view of a shared Bookbag, " _ +"click on the Bookbag's name in the Bookbag list.") %] [% END %] diff --git a/Open-ILS/src/templates/opac/myopac/update_email.tt2 b/Open-ILS/src/templates/opac/myopac/update_email.tt2 index d3f5626cd3..74b99a41c3 100644 --- a/Open-ILS/src/templates/opac/myopac/update_email.tt2 +++ b/Open-ILS/src/templates/opac/myopac/update_email.tt2 @@ -11,12 +11,12 @@ [% IF ctx.invalid_email %]

[% bad_email = ctx.invalid_email | html %] - [% l('The email address "[_1]" is invalid. Please try a different email address.', bad_email) %] + [% l('The email address "[_1]" is invalid. Please try a different email address.', '' _ bad_email _ '') %]
[% ELSIF ctx.password_incorrect %]
- [% |l %] Your current password was not correct. [% END %] + [% |l %]Your current password was not correct.[% END %]
[% END %] diff --git a/Open-ILS/src/templates/opac/myopac/update_password.tt2 b/Open-ILS/src/templates/opac/myopac/update_password.tt2 index a728217e21..7d7fc62989 100644 --- a/Open-ILS/src/templates/opac/myopac/update_password.tt2 +++ b/Open-ILS/src/templates/opac/myopac/update_password.tt2 @@ -13,17 +13,17 @@ [% IF ctx.password_invalid %]
- [% |l %] New password is invalid. Please try a different password. [% END %] + [% |l %]New password is invalid. Please try a different password.[% END %]
[% ELSIF ctx.password_nomatch %]
- [% |l %] Passwords do not match. [% END %] + [% |l %]Passwords do not match.[% END %]
[% ELSIF ctx.password_incorrect %]
- [% |l %] Your current password was not correct. [% END %] + [% |l %]Your current password was not correct.[% END %]
[% END %] diff --git a/Open-ILS/src/templates/opac/myopac/update_username.tt2 b/Open-ILS/src/templates/opac/myopac/update_username.tt2 index a7c592e924..8beee1aeb4 100644 --- a/Open-ILS/src/templates/opac/myopac/update_username.tt2 +++ b/Open-ILS/src/templates/opac/myopac/update_username.tt2 @@ -11,20 +11,17 @@ [% IF ctx.invalid_username %]
[% bad_user = ctx.invalid_username | html %] - [% l('"[_1]" is not a valid username. Usernames cannot have any spaces or look like a barcode, and may be restricted by policy. Please try a different username.', bad_user) %] + [% l('"[_1]" is not a valid username. Usernames cannot have any spaces or look like a barcode, and may be restricted by policy. Please try a different username.', '' _ bad_user _ '') %]
[% ELSIF ctx.username_exists %]
- [% bad_user = ctx.username_exists | html %] - [% | l(bad_user) %] - The username "[_1]" is taken. Please try a different username. - [% END %] + [% l('The username "[_1]" is taken. Please try a different username.', '' _ bad_user _ '') %]
[% ELSIF ctx.password_incorrect %]
- [% |l %] Your current password was not correct. [% END %] + [% |l %]Your current password was not correct.[% END %]
[% END %] diff --git a/Open-ILS/src/templates/opac/parts/login/form.tt2 b/Open-ILS/src/templates/opac/parts/login/form.tt2 index 0bdebc0a33..4c96014cad 100644 --- a/Open-ILS/src/templates/opac/parts/login/form.tt2 +++ b/Open-ILS/src/templates/opac/parts/login/form.tt2 @@ -6,8 +6,8 @@ ELSIF ctx.login_failed_event.textcode == 'PATRON_INACTIVE'; l("This account has been deactivated. Please contact your local library."); ELSE; - l("Login failed. The username or password provided was not valid. - Passwords are case-sensitive. Check your Caps-Lock key and try again or contact your local library."); + l("Login failed. The username or password provided was not valid. " _ + "Passwords are case-sensitive. Check your Caps-Lock key and try again or contact your local library."); END; %] diff --git a/Open-ILS/src/templates/opac/parts/myopac/main_refund_policy.tt2 b/Open-ILS/src/templates/opac/parts/myopac/main_refund_policy.tt2 index 0a41658892..d0207224ac 100644 --- a/Open-ILS/src/templates/opac/parts/myopac/main_refund_policy.tt2 +++ b/Open-ILS/src/templates/opac/parts/myopac/main_refund_policy.tt2 @@ -1,17 +1,17 @@
- [% l('Important! You must have a printed receipt - to be eligible for a refund on lost items - (regulations allow for no exceptions).') + [% l('Important! You must have a printed receipt ' _ + 'to be eligible for a refund on lost items ' _ + '(regulations allow for no exceptions).') %]
- [% l('To ensure your necessary receipt information - is not lost, enter your email address above - and a receipt will be emailed to you. Otherwise, - make certain you have a printed receipt in hand - before closing the payment receipt screen.') + [% l('To ensure your necessary receipt information ' _ + 'is not lost, enter your email address above ' _ + 'and a receipt will be emailed to you. Otherwise, ' _ + 'make certain you have a printed receipt in hand ' _ + 'before closing the payment receipt screen.') %] diff --git a/Open-ILS/src/templates/opac/parts/myopac/prefs_hints.tt2 b/Open-ILS/src/templates/opac/parts/myopac/prefs_hints.tt2 index e2fbc6b76e..dc90c92895 100644 --- a/Open-ILS/src/templates/opac/parts/myopac/prefs_hints.tt2 +++ b/Open-ILS/src/templates/opac/parts/myopac/prefs_hints.tt2 @@ -1,5 +1,5 @@

- [% l('Ensure your account has a valid email address so that we can notify - you about available holds, items that are about to be overdue, and - overdue items!') %] + [% l('Ensure your account has a valid email address so that we can notify ' _ + 'you about available holds, items that are about to be overdue, and ' _ + 'overdue items!') %]

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 d8c9856416..0ad6e5670d 100644 --- a/Open-ILS/src/templates/opac/parts/pref_lib_display.tt2 +++ b/Open-ILS/src/templates/opac/parts/pref_lib_display.tt2 @@ -1,6 +1,6 @@ [%- IF ctx.pref_ou && ctx.pref_ou != ctx.search_ou; %] [% - l('Preferred library: [_1][_2][_3]', '', ctx.get_aou(ctx.pref_ou).name, ''); + l('Preferred library: [_1]', '' _ ctx.get_aou(ctx.pref_ou).name _ ''); IF NOT ctx.is_staff %][% l('?') %][% END; %] diff --git a/Open-ILS/src/templates/opac/parts/result/lowhits.tt2 b/Open-ILS/src/templates/opac/parts/result/lowhits.tt2 index 238a1c8ab8..2f7c8f89df 100644 --- a/Open-ILS/src/templates/opac/parts/result/lowhits.tt2 +++ b/Open-ILS/src/templates/opac/parts/result/lowhits.tt2 @@ -11,13 +11,13 @@ IF is_advanced OR is_special; l('Sorry, no entries were found for your search within [_1].', fmt_bookbag); ELSE; - l('Sorry, no entries were found for [_1][_2][_3] within [_4].', '', qhtml, '', fmt_bookbag); + l('Sorry, no entries were found for [_1] within [_2].', '' _ qhtml _ '', fmt_bookbag); END; ELSE; IF is_advanced OR is_special; l('Sorry, no entries were found for your search.'); ELSE; - l('Sorry, no entries were found for [_1][_2][_3].', '', qhtml, ''); + l('Sorry, no entries were found for [_1].', '' _ qhtml _ ''); END; END %]

@@ -26,29 +26,35 @@ [% INCLUDE "opac/parts/result/lowhits_purchase.tt2" %]

[% l('Keyword Search Tips') %]
- [% l('Try changing to [_1]Advanced Search[_2].', '', '') %] + [% i18n_advsearch = l('Advanced Search'); + l('Try changing to [_1].', '' _ i18n_advsearch _ '') %]

[% l('Adjacency') %]
- [% l('Multiple words are not searched together as a phrase. They will - be found in various parts of the record. To search for a phrase, enclose your - search terms in quotation marks.') %]
- [% l('(example: [_1]"garcia marquez"[_2])', '', '') %] + [% l('Multiple words are not searched together as a phrase. They will ' _ + 'be found in various parts of the record. To search for a phrase, enclose your ' _ + 'search terms in quotation marks.') %]
+ [% i18n_searchphrase = l('garcia marquez'); + l('(example: [_1])', '"' _ i18n_searchphrase _ '"') %]

[% l('Truncation') %]
- [% l('Words may be right-hand truncated using an asterisk. Use a single asterisk * - to truncate any number of characters.') %]
- [% l('(example: [_1]environment* agency[_2])', '', '') %] + [% l('Words may be right-hand truncated using an asterisk. Use a single asterisk * ' _ + 'to truncate any number of characters.') %]
+ [% i18n_searchtrunc = l('environment* agency'); + l('(example: [_1])', '' _ i18n_searchtrunc _ '') %]

[% l('Anchored Searching') %]
- [% l('You may use ^ and $ to indicate "phrase begins with" and - "phrase ends with," respectively, within a search phrase - enclosed in quotation marks.') %]
- [% l('(examples: [_1]"^harry"[_2] for phrases that begin with - the term [_3]harry[_4]. - [_1]"stone$"[_2] for phrases that end in [_3]stone[_4].)', '', '', '', '') %] + [% l('You may use ^ and $ to indicate "phrase begins with" and ' _ + '"phrase ends with," respectively, within a search phrase ' _ + 'enclosed in quotation marks.') %]
+ [% i18n_searchbegins = l('harry'); + i18n_searchends = l('stone'); + l('(examples: [_1] for phrases that begin with the term [_2]. ' _ + '[_3] for phrases that end in [_4].)', + '"^' _ i18n_searchbegins _ '"', '' _ i18n_searchbegins _ '', + '"' _ i18n_searchends _ '$"', '' _ i18n_searchends _ '') %]

diff --git a/Open-ILS/src/templates/opac/parts/result/paginate.tt2 b/Open-ILS/src/templates/opac/parts/result/paginate.tt2 index 34c092b9ed..066cd8c3e7 100644 --- a/Open-ILS/src/templates/opac/parts/result/paginate.tt2 +++ b/Open-ILS/src/templates/opac/parts/result/paginate.tt2 @@ -2,16 +2,16 @@
[% ctx.bookbag ? l('List Contents') : l('Search Results') %] - [% |l('' _ ctx.result_start _'', + [%~ |l('' _ ctx.result_start _'', '' _ ctx.result_stop _ '', - '' _ ctx.hit_count _ '') -%] + '' _ ctx.hit_count _ '') ~%] Results [_1] - [_2] of about [_3] - [%- END %] + [%~ END %] - [% |l('' _ (page + 1) _ '', - '' _ page_count _ '') -%] + [%~ |l('' _ (page + 1) _ '', + '' _ page_count _ '') ~%] (page [_1] of [_2]) - [%- END %] + [%~ END %] [%- INCLUDE "opac/parts/pref_lib_display.tt2" %] diff --git a/Open-ILS/src/templates/serial/subscription.tt2 b/Open-ILS/src/templates/serial/subscription.tt2 index bc92be55c2..be540de84b 100644 --- a/Open-ILS/src/templates/serial/subscription.tt2 +++ b/Open-ILS/src/templates/serial/subscription.tt2 @@ -261,16 +261,15 @@
- [% |l %]This feature will clone a subscription and all of its subscription - notes, distributions, distribution notes, captions and patterns, - streams, and routing list users.[% END %]
+ [% l('This feature will clone a subscription and all of its subscription ' _ + 'notes, distributions, distribution notes, captions and patterns, ' _ + 'streams, and routing list users.') %]
- [% |l %]Holdings-related objects, like issuances, items, units, and - summaries will not be cloned.[% END %] + [% l('Holdings-related objects, like issuances, items, units, and ' _ + 'summaries will not be cloned.') %]
- [% |l %]To what bibliographic record should the new subscription be - attached?[% END %] + [% l('To what bibliographic record should the new subscription be attached?') %]
diff --git a/Open-ILS/web/js/dojo/openils/acq/nls/acq.js b/Open-ILS/web/js/dojo/openils/acq/nls/acq.js index dd7e8544b4..a2020395f3 100644 --- a/Open-ILS/web/js/dojo/openils/acq/nls/acq.js +++ b/Open-ILS/web/js/dojo/openils/acq/nls/acq.js @@ -48,7 +48,7 @@ "COULD_NOT_CREATE_MAPPING" : "Error tagging fund.", "COULD_NOT_DELETE_MAPPING" : "Error removing tag from fund.", "FUND_LIST_ROLLOVER_SUMMARY" : "Fund Propagation & Rollover Summary for Fiscal Year ${0}", - "FUND_LIST_ROLLOVER_SUMMARY_FUNDS" : "${1} funds propagated for fiscal year ${0} for the selected locations", + "FUND_LIST_ROLLOVER_SUMMARY_FUNDS" : "${1} funds propagated for fiscal year ${0} for the selected locations", "FUND_LIST_ROLLOVER_SUMMARY_ROLLOVER_AMOUNT" : "$${1} unspent money rolled over to fiscal year ${0} for the selected locations", "FUND_XFER_SAME_SOURCE_AND_DEST" : "Cannot transfer. The source and destination funds are the same.", "FUND_XFER_CONFIRM" : "Are you sure you're ready to commit this transfer?", diff --git a/Open-ILS/web/js/dojo/openils/actor/nls/register.js b/Open-ILS/web/js/dojo/openils/actor/nls/register.js index 951907ba1d..eefeb9412a 100644 --- a/Open-ILS/web/js/dojo/openils/actor/nls/register.js +++ b/Open-ILS/web/js/dojo/openils/actor/nls/register.js @@ -7,7 +7,7 @@ "DUPE_PATRON_IDENT" : "Found ${0} patron(s) with the same identification", "DUPE_PATRON_PHONE" : "Found ${0} patron(s) with the same phone number", "DUPE_PATRON_ADDR" : "Found ${0} patron(s) with the same address", - "REPLACED_ADDRESS" : "
Replaces address ${0}
${1} ${2}
${3}, ${4} ${5}
", + "REPLACED_ADDRESS" : "Replaces address ${0}
${1} ${2}
${3}, ${4} ${5}", "INVALID_FORM" : "Form is invalid. Please edit and try again.", "EXAMPLE" : "Example: ", "REPLACE_BARCODE" : "Replace Barcode", diff --git a/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js b/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js index 395a6a1276..438d55678b 100644 --- a/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js +++ b/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js @@ -1,9 +1,9 @@ { - "TOTAL_ITEMS_SESSION" : "Total items this session: ${0}.", - "TOTAL_ITEMS_ACCOUNT" : "Total items on account: ${0}.", - "HOLDS_READY_FOR_PICKUP" : "You have ${0} item(s) ready for pickup.", - "TOTAL_HOLDS" : "You have ${0} total holds.", - "TOTAL_FINES_ACCOUNT" : "Total fines on account: $${0}.", + "TOTAL_ITEMS_SESSION" : "Total items this session: ${0}.", + "TOTAL_ITEMS_ACCOUNT" : "Total items on account: ${0}.", + "HOLDS_READY_FOR_PICKUP" : "You have ${0} item(s) ready for pickup.", + "TOTAL_HOLDS" : "You have ${0} total holds.", + "TOTAL_FINES_ACCOUNT" : "Total fines on account: $${0}.", "HOLD_STATUS_READY" : "Ready for pickup", "HOLD_STATUS_WAITING" : "#${0} in line with ${1} copies", "CHECKOUT_SUCCESS" : "Checkout of item ${0} succeeded", diff --git a/Open-ILS/web/js/ui/default/acq/financial/list_funds.js b/Open-ILS/web/js/ui/default/acq/financial/list_funds.js index 334de95c3a..fbf1a744ff 100644 --- a/Open-ILS/web/js/ui/default/acq/financial/list_funds.js +++ b/Open-ILS/web/js/ui/default/acq/financial/list_funds.js @@ -239,13 +239,13 @@ function performRollover(args) { dojo.byId('acq-fund-list-rollover-summary-funds').innerHTML = dojo.string.substitute( localeStrings.FUND_LIST_ROLLOVER_SUMMARY_FUNDS, - [nextYear, count] + [nextYear, '' + count + ''] ); dojo.byId('acq-fund-list-rollover-summary-rollover-amount').innerHTML = dojo.string.substitute( localeStrings.FUND_LIST_ROLLOVER_SUMMARY_ROLLOVER_AMOUNT, - [nextYear, amount_rolled] + [nextYear, '' + amount_rolled + ''] ); if(!dryRun) { diff --git a/Open-ILS/web/js/ui/default/actor/user/register.js b/Open-ILS/web/js/ui/default/actor/user/register.js index 32330a39ef..7280a10364 100644 --- a/Open-ILS/web/js/ui/default/actor/user/register.js +++ b/Open-ILS/web/js/ui/default/actor/user/register.js @@ -2014,14 +2014,14 @@ function uEditNewAddr(evt, id, mkLinks) { var replaced = patron.addresses().filter( function(i) { return (i.id() == addr.replaces()) })[0]; - div.innerHTML = dojo.string.substitute(localeStrings.REPLACED_ADDRESS, [ - replaced.address_type() || '', + div.innerHTML = '
' + dojo.string.substitute(localeStrings.REPLACED_ADDRESS, [ + '' + replaced.address_type() + '' || '', replaced.street1() || '', replaced.street2() || '', replaced.city() || '', replaced.state() || '', replaced.post_code() || '' - ]); + ]) + '
'; } else { openils.Util.hide(dojo.query('[name=replaced-addr-div]', row)[0]); diff --git a/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js b/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js index 1f2448a804..04360cd033 100644 --- a/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js +++ b/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js @@ -518,7 +518,7 @@ SelfCheckManager.prototype.updateFinesSummary = function() { dojo.byId('oils-selfck-fines-total').innerHTML = dojo.string.substitute( localeStrings.TOTAL_FINES_ACCOUNT, - [summary.balance_owed()] + ['' + summary.balance_owed() + ''] ); self.creditPayableBalance = summary.balance_owed(); @@ -640,13 +640,13 @@ SelfCheckManager.prototype.updateHoldsSummary = function() { dojo.byId('oils-selfck-holds-total').innerHTML = dojo.string.substitute( localeStrings.TOTAL_HOLDS, - [this.holdsSummary.total] + ['' + this.holdsSummary.total + ''] ); dojo.byId('oils-selfck-holds-ready').innerHTML = dojo.string.substitute( localeStrings.HOLDS_READY_FOR_PICKUP, - [this.holdsSummary.ready] + ['' + this.holdsSummary.ready + ''] ); } @@ -676,13 +676,13 @@ SelfCheckManager.prototype.updateCircSummary = function(increment) { dojo.byId('oils-selfck-circ-account-total').innerHTML = dojo.string.substitute( localeStrings.TOTAL_ITEMS_ACCOUNT, - [this.circSummary.total] + ['' + this.circSummary.total + ''] ); dojo.byId('oils-selfck-circ-session-total').innerHTML = dojo.string.substitute( localeStrings.TOTAL_ITEMS_SESSION, - [this.circSummary.session] + ['' + this.circSummary.session + ''] ); } diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties b/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties index cee408d123..4ab2f9f07a 100644 --- a/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties +++ b/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties @@ -99,12 +99,12 @@ staff.patron.display.cmd_patron_delete.override_prompt=Override patron deletion staff.patron.display.spawn_editor.editing_related_patron=Editing Related Patron staff.patron.display.init.retrieving_patron=Retrieving Patron... staff.patron.display.init.retrieving=Retrieving... -staff.patron.display.init.network_request.alert_message=Alert message: "%1$s"

-staff.patron.display.init.network_request.inactive_card=Patron account retrieved with an INACTIVE card.

-staff.patron.display.init.network_request.account_barred=Patron account is BARRED.

-staff.patron.display.init.network_request.account_inactive=Patron account is INACTIVE.

-staff.patron.display.init.network_request.account_expire_soon=Patron account will expire soon. Please renew.

-staff.patron.display.init.network_request.account_expired=Patron account is EXPIRED.

+staff.patron.display.init.network_request.alert_message=Alert message: "%1$s" +staff.patron.display.init.network_request.inactive_card=Patron account retrieved with an INACTIVE card. +staff.patron.display.init.network_request.account_barred=Patron account is BARRED. +staff.patron.display.init.network_request.account_inactive=Patron account is INACTIVE. +staff.patron.display.init.network_request.account_expire_soon=Patron account will expire soon. Please renew. +staff.patron.display.init.network_request.account_expired=Patron account is EXPIRED. staff.patron.display.init.holds_ready=Holds available: %1$s staff.patron.display.init.network_request.window_title=Alert staff.patron.display.init.network_request.window_message=Press a navigation button above (for example, Check Out) to clear this alert. diff --git a/Open-ILS/xul/staff_client/server/patron/display.js b/Open-ILS/xul/staff_client/server/patron/display.js index dab77bfc81..5c10babcef 100644 --- a/Open-ILS/xul/staff_client/server/patron/display.js +++ b/Open-ILS/xul/staff_client/server/patron/display.js @@ -972,23 +972,23 @@ patron.display.prototype = { obj._already_defaulted_once = true; var msg = ''; obj.stop_checkouts = false; if (patron.alert_message()) - msg += $("patronStrings").getFormattedString('staff.patron.display.init.network_request.alert_message', [patron.alert_message()]); + msg += $("patronStrings").getFormattedString('staff.patron.display.init.network_request.alert_message', [patron.alert_message()]) + '

'; //alert('obj.barcode = ' + obj.barcode); if (obj.barcode) { if (patron.cards()) for (var i = 0; i < patron.cards().length; i++) { //alert('card #'+i+' == ' + js2JSON(patron.cards()[i])); if ( (patron.cards()[i].barcode()==obj.barcode) && ( ! get_bool(patron.cards()[i].active()) ) ) { - msg += $("patronStrings").getString('staff.patron.display.init.network_request.inactive_card'); + msg += $("patronStrings").getString('staff.patron.display.init.network_request.inactive_card') + '

'; obj.stop_checkouts = true; } } } if (get_bool(patron.barred())) { - msg += $("patronStrings").getString('staff.patron.display.init.network_request.account_barred'); + msg += $("patronStrings").getString('staff.patron.display.init.network_request.account_barred') + '

'; obj.stop_checkouts = true; } if (!get_bool(patron.active())) { - msg += $("patronStrings").getString('staff.patron.display.init.network_request.account_inactive'); + msg += $("patronStrings").getString('staff.patron.display.init.network_request.account_inactive') + '

'; obj.stop_checkouts = true; } if (patron.expire_date()) { @@ -1016,10 +1016,10 @@ patron.display.prototype = { preexpire = preexpire.getTime()/1000; if (expire < now) { - msg += $("patronStrings").getString('staff.patron.display.init.network_request.account_expired'); + msg += $("patronStrings").getString('staff.patron.display.init.network_request.account_expired') + '

'; obj.stop_checkouts = true; } else if (expire < preexpire && preexpire_setting) { - msg += $("patronStrings").getString('staff.patron.display.init.network_request.account_expire_soon'); + msg += $("patronStrings").getString('staff.patron.display.init.network_request.account_expire_soon') + '

'; } } var penalties = patron.standing_penalties(); -- 2.43.2