[open-ils-commits] [GIT] Evergreen ILS branch master updated. 82d65eccd0c40ab9e832a6a196b11608aa9520a4
Evergreen Git
git at git.evergreen-ils.org
Wed Aug 21 10:24:43 EDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via 82d65eccd0c40ab9e832a6a196b11608aa9520a4 (commit)
from 53c35f70231bb661b1f38e451ae91bf116789e70 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 82d65eccd0c40ab9e832a6a196b11608aa9520a4
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date: Mon Jun 10 08:42:18 2013 +0300
Move HTML tags out of translatable strings in toolkit templates.
Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/templates/acq/common/claim_dialog.tt2 b/Open-ILS/src/templates/acq/common/claim_dialog.tt2
index e3c2d2e..e886edb 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">
</script>
<div><big>[% l('Claims') %]</big></div>
- <div>[% l('Against item: [_1] ([_2]',
+ <div>[% l('Against item: [_1] ([_2])',
'<span id="acq-lit-li-claim-dia-li-title"></span>',
'<span id="acq-lit-li-claim-dia-li-id"></span>') %]
</div>
diff --git a/Open-ILS/src/templates/acq/common/li_table.tt2 b/Open-ILS/src/templates/acq/common/li_table.tt2
index d6a478e..0a2151a 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 @@
</div>
<div dojoType="dijit.Dialog" jsId="batchFundUpdateDialog" title="[% l('Batch Update Funds') %]">
<div>
- [% |l %]This will update the fund for all copies attached to these lineitems.<br/>
- This will also update any existing encumbered or spent debits.[% END %]
+ [% l('This will update the fund for all copies attached to these lineitems.') %]<br/>
+ [% l('This will also update any existing encumbered or spent debits.') %]
</div>
<br/>
<table class='oils-generic-table'>
diff --git a/Open-ILS/src/templates/acq/financial/claim_eligible.tt2 b/Open-ILS/src/templates/acq/financial/claim_eligible.tt2
index 2bb3a8a..c798504 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 @@
<div name="description"></div>
<div name="lid_link_holder" class="hidden">
[ <a href="javascript:void(0);"
- name="lid_link">[% l('Consider individual copies
- for claiming') %]</a> ]
+ name="lid_link">[% l('Consider individual copies for claiming') %]</a> ]
</div>
</td>
</tr>
diff --git a/Open-ILS/src/templates/acq/fund/list.tt2 b/Open-ILS/src/templates/acq/fund/list.tt2
index 110c08e..ab6de7b 100644
--- a/Open-ILS/src/templates/acq/fund/list.tt2
+++ b/Open-ILS/src/templates/acq/fund/list.tt2
@@ -48,10 +48,10 @@
<tr>
<td colspan='2'>
<div style='width:400px;'>
- [% |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.') %]
</div>
</td>
</tr>
@@ -64,11 +64,11 @@
<tr>
<td colspan='2'>
<div style='width:400px;'>
- [% |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.') %]
</div>
</td>
</tr>
@@ -81,9 +81,9 @@
<tr class="encumb_only hidden">
<td colspan='2'>
<div style='width:400px;'>
- [% |l %]This modifies the above described Close-out Operation, causing funds to be
- transfered into the void (that is, entirely removed) instead of being transfered
- to the analogous funds in the subsequent fiscal year.[% END %]
+ [% l('This modifies the above described Close-out Operation, causing funds to be ' _
+ 'transfered into the void (that is, entirely removed) instead of being transfered ' _
+ 'to the analogous funds in the subsequent fiscal year.') %]
</div>
</td>
</tr>
@@ -104,9 +104,9 @@
<tr>
<td colspan='2'>
<div style='width:400px;'>
- [% |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.') %]
</div>
</td>
</tr>
@@ -146,7 +146,7 @@
<div id='acq-fund-list-rollover-summary' class='hidden'>
<div id='acq-fund-list-rollover-summary-header'> </div>
<ul>
- <li id='acq-fund-list-rollover-summary-dry-run'>[% l('These changes have <span class="oils-notify-text">not</span> been committed yet.') %]</li>
+ <li id='acq-fund-list-rollover-summary-dry-run'>[% l('These changes have [_1]not[_2] been committed yet.', '<span class="oils-notify-text">', '</span>') %]</li>
<li id='acq-fund-list-rollover-summary-funds'></li>
<li id='acq-fund-list-rollover-summary-rollover-amount'></li>
</ul>
diff --git a/Open-ILS/src/templates/acq/picklist/from_bib.tt2 b/Open-ILS/src/templates/acq/picklist/from_bib.tt2
index f098589..41a60a4 100644
--- a/Open-ILS/src/templates/acq/picklist/from_bib.tt2
+++ b/Open-ILS/src/templates/acq/picklist/from_bib.tt2
@@ -2,8 +2,7 @@
[% ctx.page_title = l("Items by Bibliographic ID") %]
<div id="acq-frombib-upload-box">
<div class="oils-acq-basic-roomy">
- [% |l %]Provide one or more CSV files whose first columns
- contain Evergreen bibliographic record IDs.[% END %]
+ [% |l %]Provide one or more CSV files whose first columns contain Evergreen bibliographic record IDs.[% END %]
</div>
<div class="oils-acq-basic-roomy">
<span id="acq-frombib-upload"></span>
diff --git a/Open-ILS/src/templates/acq/search/unified.tt2 b/Open-ILS/src/templates/acq/search/unified.tt2
index 4d04d16..55837ad 100644
--- a/Open-ILS/src/templates/acq/search/unified.tt2
+++ b/Open-ILS/src/templates/acq/search/unified.tt2
@@ -168,8 +168,7 @@
</script>
<table class="dijitTooltipTable">
<tr>
- <td><label for="name">[% l('Choose the Lead
- Selection List:') %]</label></td>
+ <td><label for="name">[% l('Choose the Lead Selection List:') %]</label></td>
<td><input jsId="plMergeLeadSelector"
dojoType="dijit.form.FilteringSelect"
name="lead" /></td>
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 4b5099f..d18f128 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 @@
</table>
</div>
<div class="footer_notes">
- [% |l %]
- <b>Host</b> is the full FTP/SSH hostname, including the protocol, e.g. ftp://ftp1.somevendor.com<br />
- <b>Username</b>, <b>Password</b> and <b>Account</b> are (s)FTP/SSH parameters.<br />
- <b>Account</b> is unlikely to be used by modern systems and should typically be empty.<br />
- <b>Vendor Account Number</b> (VAN) is vendor-assigned, only needed if different than the org_unit SAN.<br />
- <b>Vendor Assigned Code</b> (VAC) is essentially a sub-account designation, e.g. '0001'. It can be used with or without VAN.<br />
- The location of codes in the EDI message itself may vary according to vendor-specific semantics.
- [% END %]
+ [% i18n_host = '<b>' _ l('Host') _ '</b>';
+ i18n_username = '<b>' _ l('Username') _ '</b>';
+ i18n_password = '<b>' _ l('Password') _ '</b>';
+ i18n_account = '<b>' _ l('Account') _ '</b>';
+ i18n_van = '<b>' _ l('Vendor Account Number') _ '</b>';
+ i18n_vac = '<b>' _ l('Vendor Assigned Code') _ '</b>';
+ l('[_1] is the full FTP/SSH hostname, including the protocol, e.g. ftp://ftp1.somevendor.com', i18n_host) %]<br />
+ [% l('[_1], [_2] and [_3] are (s)FTP/SSH parameters.', i18n_username, i18n_password, i18n_account) %]<br />
+ [% l('[_1] is unlikely to be used by modern systems and should typically be empty.', i18n_account) %]<br />
+ [% l('[_1] (VAN) is vendor-assigned, only needed if different than the org_unit SAN.', i18n_van) %]<br />
+ [% l("[_1] (VAC) is essentially a sub-account designation, e.g. '0001'. It can be used with or without VAN.", i18n_vac) %]<br />
+ [% l('The location of codes in the EDI message itself may vary according to vendor-specific semantics.') %]
</div>
</div>
diff --git a/Open-ILS/src/templates/kpac/getit.tt2 b/Open-ILS/src/templates/kpac/getit.tt2
index 061e23c..a807b0d 100644
--- a/Open-ILS/src/templates/kpac/getit.tt2
+++ b/Open-ILS/src/templates/kpac/getit.tt2
@@ -26,8 +26,8 @@
<div class="top_side">
<h2>[% l('get it!') %]</h2>
- <p>[% |l %]If you would like to place a hold on this item, please enter the
- following information and click<br />Submit below:[% END %]</p>
+ <p>[% l('If you would like to place a hold on this item, please enter the ' _
+ 'following information and click Submit below:') %]</p>
</div>
<form method='POST'><!-- login + place hold form -->
diff --git a/Open-ILS/src/templates/kpac/getit_results.tt2 b/Open-ILS/src/templates/kpac/getit_results.tt2
index ace6ce5..18b12ea 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 %]
<h2 class="sub_header2">[% l('You Saved It!') %]</h2>
<p>
- [% |l(title_html) %]
- You successfully saved [_1]. <br/>
- To manage your lists, go to <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {}, 1) %]">My Lists</a>
- [% END %]
+ [% l('You successfully saved [_1].', title_html) %]<br/>
+ [% l('To manage your lists, go to [_1]My Lists[_2]', '<a href="' _ mkurl(ctx.opac_root _ '/myopac/lists', {}, 1) _ '">', '</a>') %]
<p>
[% ELSIF ctx.added_to_list %]
[% list_html = ctx.list.name | html %]
<h2 class="sub_header2">[% l('You Saved It!') %]</h2>
<p>
- [% |l(title_html, list_html) %]
- You successfully saved [_1] to [_2]. <br/>
- To manage your lists, go to <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {}, 1) %]">My Lists</a>
- [% END %]
+ [% l('You successfully saved [_1] to [_2].', title_html, list_html) %]<br/>
+ [% l('To manage your lists, go to [_1]My Lists[_2]', '<a href="' _ mkurl(ctx.opac_root _ '/myopac/lists', {}, 1) _ '">', '</a>') %]
<p>
[% ELSIF CGI.param('hold') %]
[% lib_html = ctx.get_aou(ctx.hold.pickup_lib).name | html %]
<h2 class="sub_header2">[% l('Hold Successful!') %]</h2>
<p>
- [% |l(title_html, lib_html) %]
- Your request for <a href="[% mkurl(ctx.kpac_root _ '/record/' _ ctx.bre_id, {}, kill_params) %]">[_1]</a> was successful.<br/>
- 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.', '<a href="' _ mkurl(ctx.kpac_root _ '/record/' _ ctx.bre_id, {}, kill_params) _ '">' _ title_html _ '</a>') %]<br/>
+ [% 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) %]
<p>
[% ELSE %]
<p>
- [% |l(title_html) %]
- Unable to request <a href="[% mkurl(ctx.kpac_root _ '/record/' _ ctx.bre_id, {}, kill_params) %]">[_1]</a>.<br/>
- Please see a librarian.
- [% END %]
+ [% l('Unable to request [_1].', '<a href="' _ mkurl(ctx.kpac_root _ '/record/' _ ctx.bre_id, {}, kill_params) _ '">' _ title_html _ '</a>') %]<br/>
+ [% l('Please see a librarian.') %]
[% END %]
</div>
diff --git a/Open-ILS/src/templates/kpac/parts/paginate.tt2 b/Open-ILS/src/templates/kpac/parts/paginate.tt2
index 225b74e..f5b875b 100644
--- a/Open-ILS/src/templates/kpac/parts/paginate.tt2
+++ b/Open-ILS/src/templates/kpac/parts/paginate.tt2
@@ -24,9 +24,7 @@
<td width="100%" class="nav_mid_bg">
<table cellpadding="0" cellspacing="0" border="0" align="center">
<tr>
- [% |l(page + 1, page_count) %]
- <td>Page </td><td class="current_page">[_1]</td><td> of </td><td class="total_pages">[_2]</td>
- [% END %]
+ <td>[% l('Page [_1] of [_2]', '</td><td class="current_page">' _ (page + 1) _ '</td><td>', '</td><td class="total_pages">' _ page_count _ '</td>') %]</td>
</tr>
</table>
</td>
diff --git a/Open-ILS/src/templates/opac/myopac/lists.tt2 b/Open-ILS/src/templates/opac/myopac/lists.tt2
index da1926f..ec729e7 100644
--- a/Open-ILS/src/templates/opac/myopac/lists.tt2
+++ b/Open-ILS/src/templates/opac/myopac/lists.tt2
@@ -366,10 +366,10 @@
[% END %]
<span id='bb_publish_text' class='hide_me'>
-[% |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.") %]
</span>
</div>
[% END %]
diff --git a/Open-ILS/src/templates/opac/myopac/update_email.tt2 b/Open-ILS/src/templates/opac/myopac/update_email.tt2
index d3f5626..74b99a4 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 %]
<div id='account-update-email-error'>
[% bad_email = ctx.invalid_email | html %]
- [% l('The email address "<b>[_1]</b>" is invalid. Please try a different email address.', bad_email) %]
+ [% l('The email address "[_1]" is invalid. Please try a different email address.', '<b>' _ bad_email _ '</b>') %]
</div>
[% ELSIF ctx.password_incorrect %]
<div id='account-update-email-error'>
- [% |l %] Your current password was not correct. [% END %]
+ [% |l %]Your current password was not correct.[% END %]
</div>
[% END %]
diff --git a/Open-ILS/src/templates/opac/myopac/update_password.tt2 b/Open-ILS/src/templates/opac/myopac/update_password.tt2
index a728217..7d7fc62 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 %]
<div id='account-update-email-error'> <!-- borrow css from update-email page -->
- [% |l %] New password is invalid. Please try a different password. [% END %]
+ [% |l %]New password is invalid. Please try a different password.[% END %]
</div>
[% ELSIF ctx.password_nomatch %]
<div id='account-update-email-error'>
- [% |l %] Passwords do not match. [% END %]
+ [% |l %]Passwords do not match.[% END %]
</div>
[% ELSIF ctx.password_incorrect %]
<div id='account-update-email-error'>
- [% |l %] Your current password was not correct. [% END %]
+ [% |l %]Your current password was not correct.[% END %]
</div>
[% END %]
diff --git a/Open-ILS/src/templates/opac/myopac/update_username.tt2 b/Open-ILS/src/templates/opac/myopac/update_username.tt2
index a7c592e..8beee1a 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 %]
<div id='account-update-email-error'> <!-- borrow css from update-email page -->
[% bad_user = ctx.invalid_username | html %]
- [% l('"<b>[_1]</b>" 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.', '<b>' _ bad_user _ '</b>') %]
</div>
[% ELSIF ctx.username_exists %]
<div id='account-update-email-error'>
- [% bad_user = ctx.username_exists | html %]
- [% | l(bad_user) %]
- The username "<b>[_1]</b>" is taken. Please try a different username.
- [% END %]
+ [% l('The username "[_1]" is taken. Please try a different username.', '<b>' _ bad_user _ '</b>') %]
</div>
[% ELSIF ctx.password_incorrect %]
<div id='account-update-email-error'>
- [% |l %] Your current password was not correct. [% END %]
+ [% |l %]Your current password was not correct.[% END %]
</div>
[% END %]
diff --git a/Open-ILS/src/templates/opac/parts/login/form.tt2 b/Open-ILS/src/templates/opac/parts/login/form.tt2
index 0bdebc0..4c96014 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;
%]
</div>
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 0a41658..d020722 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 @@
<tr>
<td colspan="3">
<br />
- [% 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).')
%]
<br />
<strong>
- [% 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.')
%]
</strong>
</td>
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 e2fbc6b..dc90c92 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 @@
<p>
- [% 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!') %]
</p>
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 d8c9856..0ad6e56 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; %]
<span class="preflib">[%
- l('Preferred library: [_1][_2][_3]', '<b>', ctx.get_aou(ctx.pref_ou).name, '</b>');
+ l('Preferred library: [_1]', '<b>' _ ctx.get_aou(ctx.pref_ou).name _ '</b>');
IF NOT ctx.is_staff %]<a href="[% mkurl(ctx.opac_root _ '/myopac/prefs_settings')
%]" class="preflib_change" title="[% l("Change preferred library"); %]">[% l('?') %]</a>[% END; %]
</span>
diff --git a/Open-ILS/src/templates/opac/parts/result/lowhits.tt2 b/Open-ILS/src/templates/opac/parts/result/lowhits.tt2
index 238a1c8..2f7c8f8 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].', '<q>', qhtml, '</q>', fmt_bookbag);
+ l('Sorry, no entries were found for [_1] within [_2].', '<q>' _ qhtml _ '</q>', 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].', '<q>', qhtml, '</q>');
+ l('Sorry, no entries were found for [_1].', '<q>' _ qhtml _ '</q>');
END;
END %]
</p>
@@ -26,29 +26,35 @@
[% INCLUDE "opac/parts/result/lowhits_purchase.tt2" %]
<p>
<strong>[% l('Keyword Search Tips') %]</strong><br />
- [% l('Try changing to [_1]Advanced Search[_2].', '<strong>', '</strong>') %]
+ [% i18n_advsearch = l('Advanced Search');
+ l('Try changing to [_1].', '<strong>' _ i18n_advsearch _ '</strong>') %]
</p>
<p>
<strong>[% l('Adjacency') %]</strong><br />
- [% 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.') %]<br />
- [% l('(example: [_1]"garcia marquez"[_2])', '<strong>', '</strong>') %]
+ [% 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.') %]<br />
+ [% i18n_searchphrase = l('garcia marquez');
+ l('(example: [_1])', '<strong>"' _ i18n_searchphrase _ '"</strong>') %]
</p>
<p>
<strong>[% l('Truncation') %]</strong><br />
- [% l('Words may be right-hand truncated using an asterisk. Use a single asterisk *
- to truncate any number of characters.') %]<br />
- [% l('(example: [_1]environment* agency[_2])', '<strong>', '</strong>') %]
+ [% l('Words may be right-hand truncated using an asterisk. Use a single asterisk * ' _
+ 'to truncate any number of characters.') %]<br />
+ [% i18n_searchtrunc = l('environment* agency');
+ l('(example: [_1])', '<strong>' _ i18n_searchtrunc _ '</strong>') %]
</p>
<p>
<strong>[% l('Anchored Searching') %]</strong><br />
- [% l('You may use ^ and $ to indicate "phrase begins with" and
- "phrase ends with," respectively, within a search phrase
- enclosed in quotation marks.') %]<br />
- [% 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].)', '<strong>', '</strong>', '<em>', '</em>') %]
+ [% l('You may use ^ and $ to indicate "phrase begins with" and ' _
+ '"phrase ends with," respectively, within a search phrase ' _
+ 'enclosed in quotation marks.') %]<br />
+ [% 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].)',
+ '<strong>"^' _ i18n_searchbegins _ '"</strong>', '<em>' _ i18n_searchbegins _ '</em>',
+ '<strong>"' _ i18n_searchends _ '$"</strong>', '<em>' _ i18n_searchends _ '</em>') %]
</p>
</div>
</div>
diff --git a/Open-ILS/src/templates/opac/parts/result/paginate.tt2 b/Open-ILS/src/templates/opac/parts/result/paginate.tt2
index 34c092b..066cd8c 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 @@
<div class="results_header_nav1">
<span class="h1">[% ctx.bookbag ? l('List Contents') : l('Search Results') %]</span>
<span nowrap="nowrap" class="result_number">
- [% |l('<span class="result_count_number">' _ ctx.result_start _'</span>',
+ [%~ |l('<span class="result_count_number">' _ ctx.result_start _'</span>',
'<span class="result_count_number">' _ ctx.result_stop _ '</span>',
- '<span class="result_count_number">' _ ctx.hit_count _ '</span>') -%]
+ '<span class="result_count_number">' _ ctx.hit_count _ '</span>') ~%]
Results [_1] - [_2] of about [_3]
- [%- END %]
+ [%~ END %]
<span style='padding-left: 6px;'>
- [% |l('<span class="result_count_number">' _ (page + 1) _ '</span>',
- '<span class="result_count_number">' _ page_count _ '</span>') -%]
+ [%~ |l('<span class="result_count_number">' _ (page + 1) _ '</span>',
+ '<span class="result_count_number">' _ page_count _ '</span>') ~%]
(page [_1] of [_2])
- [%- END %]
+ [%~ END %]
</span>
</span>
[%- 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 bc92be5..be540de 100644
--- a/Open-ILS/src/templates/serial/subscription.tt2
+++ b/Open-ILS/src/templates/serial/subscription.tt2
@@ -261,16 +261,15 @@
<div dojoType="dijit.Dialog" jsId="clone_dialog" title="[% l('Clone Subscription') %]"
style="width: 460px;" execute="clone_subscription(arguments[0]);">
<div style="margin-bottom: 0.5em;">
- [% |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 %]</div>
+ [% l('This feature will clone a subscription and all of its subscription ' _
+ 'notes, distributions, distribution notes, captions and patterns, ' _
+ 'streams, and routing list users.') %]</div>
<div style="margin-bottom: 0.5em;">
- [% |l %]Holdings-related objects, like issuances, items, units, and
- summaries will <em>not</em> be cloned.[% END %]
+ [% l('Holdings-related objects, like issuances, items, units, and ' _
+ 'summaries will <em>not</em> be cloned.') %]
</div>
<div style="margin-bottom: 0.5em;">
- [% |l %]To what bibliographic record should the new subscription be
- attached?[% END %]
+ [% l('To what bibliographic record should the new subscription be attached?') %]
</div>
<table width="100%">
<tr>
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 dd7e854..a202039 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" : "<b>${1}</b> 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" : "<b>$${1}</b> 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 951907b..eefeb94 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" : "<div>Replaces address <b>${0}</b><br/> ${1} ${2}<br/> ${3}, ${4} ${5}</div>",
+ "REPLACED_ADDRESS" : "Replaces address ${0}<br/> ${1} ${2}<br/> ${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 395a6a1..438d556 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: <b>${0}</b>.",
- "TOTAL_ITEMS_ACCOUNT" : "Total items on account: <b>${0}</b>.",
- "HOLDS_READY_FOR_PICKUP" : "You have <b>${0}</b> item(s) ready for pickup.",
- "TOTAL_HOLDS" : "You have <b>${0}</b> total holds.",
- "TOTAL_FINES_ACCOUNT" : "Total fines on account: <b>$${0}</b>.",
+ "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 334de95..fbf1a74 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, '<b>' + count + '</b>']
);
dojo.byId('acq-fund-list-rollover-summary-rollover-amount').innerHTML =
dojo.string.substitute(
localeStrings.FUND_LIST_ROLLOVER_SUMMARY_ROLLOVER_AMOUNT,
- [nextYear, amount_rolled]
+ [nextYear, '<b>' + amount_rolled + '</b>']
);
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 32330a3..7280a10 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 = '<div>' + dojo.string.substitute(localeStrings.REPLACED_ADDRESS, [
+ '<b>' + replaced.address_type() + '</b>' || '',
replaced.street1() || '',
replaced.street2() || '',
replaced.city() || '',
replaced.state() || '',
replaced.post_code() || ''
- ]);
+ ]) + '</div>';
} 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 1f2448a..04360cd 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()]
+ ['<b>' + summary.balance_owed() + '</b>']
);
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]
+ ['<b>' + this.holdsSummary.total + '</b>']
);
dojo.byId('oils-selfck-holds-ready').innerHTML =
dojo.string.substitute(
localeStrings.HOLDS_READY_FOR_PICKUP,
- [this.holdsSummary.ready]
+ ['<b>' + this.holdsSummary.ready + '</b>']
);
}
@@ -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]
+ ['<b>' + this.circSummary.total + '</b>']
);
dojo.byId('oils-selfck-circ-session-total').innerHTML =
dojo.string.substitute(
localeStrings.TOTAL_ITEMS_SESSION,
- [this.circSummary.session]
+ ['<b>' + this.circSummary.session + '</b>']
);
}
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 cee408d..4ab2f9f 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"<br/><br/>
-staff.patron.display.init.network_request.inactive_card=Patron account retrieved with an INACTIVE card.<br/><br/>
-staff.patron.display.init.network_request.account_barred=Patron account is BARRED.<br/><br/>
-staff.patron.display.init.network_request.account_inactive=Patron account is INACTIVE.<br/><br/>
-staff.patron.display.init.network_request.account_expire_soon=Patron account will expire soon. Please renew.<br/><br/>
-staff.patron.display.init.network_request.account_expired=Patron account is EXPIRED.<br/><br/>
+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 dab77bf..5c10bab 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()]) + '<br/><br/>';
//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') + '<br/><br/>';
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') + '<br/><br/>';
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') + '<br/><br/>';
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') + '<br/><br/>';
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') + '<br/><br/>';
}
}
var penalties = patron.standing_penalties();
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/acq/common/claim_dialog.tt2 | 2 +-
Open-ILS/src/templates/acq/common/li_table.tt2 | 4 +-
.../src/templates/acq/financial/claim_eligible.tt2 | 3 +-
Open-ILS/src/templates/acq/fund/list.tt2 | 32 ++++++++--------
Open-ILS/src/templates/acq/picklist/from_bib.tt2 | 3 +-
Open-ILS/src/templates/acq/search/unified.tt2 | 3 +-
.../templates/conify/global/acq/edi_account.tt2 | 20 ++++++----
Open-ILS/src/templates/kpac/getit.tt2 | 4 +-
Open-ILS/src/templates/kpac/getit_results.tt2 | 24 ++++--------
Open-ILS/src/templates/kpac/parts/paginate.tt2 | 4 +--
Open-ILS/src/templates/opac/myopac/lists.tt2 | 8 ++--
.../src/templates/opac/myopac/update_email.tt2 | 4 +-
.../src/templates/opac/myopac/update_password.tt2 | 6 ++--
.../src/templates/opac/myopac/update_username.tt2 | 9 ++---
Open-ILS/src/templates/opac/parts/login/form.tt2 | 4 +-
.../opac/parts/myopac/main_refund_policy.tt2 | 16 ++++----
.../templates/opac/parts/myopac/prefs_hints.tt2 | 6 ++--
.../src/templates/opac/parts/pref_lib_display.tt2 | 2 +-
.../src/templates/opac/parts/result/lowhits.tt2 | 38 +++++++++++--------
.../src/templates/opac/parts/result/paginate.tt2 | 12 +++---
Open-ILS/src/templates/serial/subscription.tt2 | 13 +++----
Open-ILS/web/js/dojo/openils/acq/nls/acq.js | 2 +-
Open-ILS/web/js/dojo/openils/actor/nls/register.js | 2 +-
Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js | 10 +++---
.../web/js/ui/default/acq/financial/list_funds.js | 4 +-
Open-ILS/web/js/ui/default/actor/user/register.js | 6 ++--
.../web/js/ui/default/circ/selfcheck/selfcheck.js | 10 +++---
.../server/locale/en-US/patron.properties | 12 +++---
Open-ILS/xul/staff_client/server/patron/display.js | 12 +++---
29 files changed, 134 insertions(+), 141 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list