[OPEN-ILS-DEV] SPAM: PATCH: i18n support for OPAC
Dan Scott
denials at gmail.com
Tue Jun 5 01:09:11 EDT 2007
The strings for the default skin in the OPAC were halfway between
entities defined in DTDs (good!) and hardcoded into the OPAC files
(not so good).
This patch moves the remaining strings from the default skin in the
OPAC into the locale/en-US/opac.dtd file. Tested with CVS HEAD.
For the most part, the strings were okay; I noticed a few cases where
punctuation had been hardcoded directly following entities, like:
<b>&common.title;:</b>
This was an attempt to reuse &common.title; as both a label (thus the
following colon) and as a standalone string. Unfortunately, in many
languages it is necessary to put a space between the label and the
following punctuation. It's better to introduce slight duplication and
define two separate entities than to try to save some space, so I
ended up creating entities like the following that leave the control
up to the translator:
<!ENTITY common.title "Title">
<!ENTITY common.title.label "Title:">
I also noticed that there is a fair amount of duplication of entities
defined in lang.dtd and opac.dtd. In some cases, the text for an
entity with the same name is different. There are also some DTD files
that look like they could be removed now. At some point, we'll
probably want to rationalize these a little further. But for now, I
think it's possible to go ahead and test translation of the OPAC in a
fairly clean way.
Developer's Certificate of Origin 1.1
By making a contribution to this project, I certify that:
(a) The contribution was created in whole or in part by me and I have
the right to submit it under the open source license indicated in the
file; or
(b) The contribution is based upon previous work that, to the best of
my knowledge, is covered under an appropriate open source license and
I have the right under that license to submit that work with
modifications, whether created in whole or in part by me, under the
same open source license (unless I am permitted to submit under a
different license), as indicated in the file; or
(c) The contribution was provided directly to me by some other person
who certified (a), (b) or (c) and I have not modified it; and
(d) In the case of each of (a), (b), or (c), I understand and agree
that this project and the contribution are public and that a record of
the contribution (including all personal information I submit with it,
including my sign-off) is maintained indefinitely and may be
redistributed consistent with this project or the open source license
indicated in the file.
--
Dan Scott
Laurentian University
-------------- next part --------------
Index: Open-ILS/web/opac/locale/en-US/opac.dtd
===================================================================
RCS file: /cvs/ILS/Open-ILS/web/opac/locale/en-US/opac.dtd,v
retrieving revision 1.6
diff -c -r1.6 opac.dtd
*** Open-ILS/web/opac/locale/en-US/opac.dtd 16 Jun 2006 20:39:04 -0000 1.6
--- Open-ILS/web/opac/locale/en-US/opac.dtd 5 Jun 2007 05:05:27 -0000
***************
*** 21,26 ****
--- 21,27 ----
<!ENTITY common.username "Username">
<!ENTITY common.password "Password">
<!ENTITY common.submit "Submit">
+ <!ENTITY common.close "close">
<!ENTITY common.and "and">
<!ENTITY common.user_not_found "User not found"><!ENTITY opac.advanced.wizard.title "Advanced Search">
<!ENTITY common.nowSearching "Now searching ">
***************
*** 96,102 ****
--- 97,127 ----
<!ENTITY opac.advanced.quick.title "Quick Search">
<!ENTITY opac.advanced.quick.isbn "ISBN">
<!ENTITY opac.advanced.quick.issn "ISSN">
+ <!ENTITY opac.advanced.quick.lccn "LCCN">
+ <!ENTITY opac.advanced.quick.tcn "TCN"> <!-- title control number -->
+ <!ENTITY opac.advanced.quick.barcode "Item Barcode">
+ <!ENTITY opac.advanced.quick.cn "Call Number">
+
+ <!-- ==========================================================
+ MARC expert search
+ ========================================================== -->
+ <!ENTITY search.marc "MARC Expert Search">
+ <!ENTITY search.marc.tag "Tag:">
+ <!ENTITY search.marc.subfield "Subfield:">
+ <!ENTITY search.marc.value "Value:">
+ <!ENTITY search.marc.add.row "Add Row">
+
+ <!-- ==========================================================
+ Status bar
+ ========================================================== -->
+
+ <!ENTITY status.results "Including results for">
+
+ <!-- ==========================================================
+ Tips
+ ========================================================== -->
+ <!ENTITY tips.label "Tip:">
<!-- =================================================================
More generic stuff
***************
*** 120,125 ****
--- 145,152 ----
<!ENTITY navigate.loggedinas.title "Logged in as...">
<!ENTITY navigate.titleGroupResults "My Search Results">
<!ENTITY navigate.titleResults "My Title Results">
+ <!ENTITY navigate.title.details "My Title Details">
+ <!ENTITY navigate.record.details "Record Details">
<!-- =================================================================
***************
*** 129,134 ****
--- 156,163 ----
<!ENTITY sidebar.relevantAuthors.headerLabel "Relevant Authors">
<!ENTITY sidebar.relevantSeries.headerLabel "Relevant Series">
<!ENTITY sidebar.relevantReviews.headerLabel "Reviews">
+ <!ENTITY sidebar.quick.search "Quick Search">
+ <!ENTITY sidebar.copy.not.found "No copy with the requested barcode was found">
<!-- =================================================================
Search formats
***************
*** 161,167 ****
<!ENTITY opac.holds.recipient "Recipient">
<!ENTITY opac.holds.placeHold "Place Hold">
<!ENTITY opac.holds.contactPhone "Contact telephone number">
! <!ENTITY opac.holds.concactEmail "Contact email address">
<!ENTITY opac.holds.pickupLocation "Pickup location">
<!ENTITY opac.holds.placeHold "Place Hold">
<!ENTITY opac.holds.success "Hold was successfully placed">
--- 190,196 ----
<!ENTITY opac.holds.recipient "Recipient">
<!ENTITY opac.holds.placeHold "Place Hold">
<!ENTITY opac.holds.contactPhone "Contact telephone number">
! <!ENTITY opac.holds.contactEmail "Contact email address">
<!ENTITY opac.holds.pickupLocation "Pickup location">
<!ENTITY opac.holds.placeHold "Place Hold">
<!ENTITY opac.holds.success "Hold was successfully placed">
***************
*** 186,188 ****
--- 215,274 ----
<!ENTITY rdetail.noneAvailable " * There are no copies in this location">
<!ENTITY rdetail.detailMain.viewMarc "View MARC">
<!ENTITY rdetail.detailMain.hideMarc "Return to title details">
+
+ <!ENTITY common.call.number.label "Call Number:">
+ <!ENTITY common.copy.barcode.label "Copy Barcode:">
+ <!ENTITY common.hold.place "Place hold for me">
+ <!ENTITY common.hold.check "Checking for possibility of hold fulfillment...">
+ <!ENTITY common.hold.create "Create / Edit a Hold">
+ <!ENTITY common.hold.update "Update Hold">
+ <!ENTITY common.hold.type.label "Hold Type:">
+ <!ENTITY common.hold.volume "Volume Hold">
+ <!ENTITY common.hold.copy "Copy Hold">
+ <!ENTITY common.hold.advanced "Advanced Hold Options">
+ <!ENTITY common.hold.delivery "Please select a physical location where your hold can be delivered.">
+ <!ENTITY common.hold.exists "A hold already exists on the requested item.">
+ <!ENTITY common.hold.exists.override "A hold already exists on the requested
+ item. Would you like to create the hold anyway?">
+ <!ENTITY common.hold.barred 'PATRON BARRED. Please see any notes in the
+ "Staff Notes" section of your "My Account" page or contact your local library.'>
+ <!ENTITY common.hold.item.invalid "This hold is no longer valid. It's likely that the
+ target for the hold was deleted from the system. Please cancel this hold and
+ place a new one.">
+ <!ENTITY common.hold.patron.invalid "The patron barcode entered as the hold recipient is invalid.">
+ <!ENTITY common.help "(Help)"> <!-- Was (??), perhaps change to a button or icon? -->
+ <!ENTITY common.phone.format.help "The phone number does not have the correct format. The expected format is XXX-YYY-ZZZZ">
+ <!ENTITY common.hold.failed "No items were found that could fulfill the requested holds.
+ It's possible that choosing a different format will result in a successful hold.
+ It is also possible that you have exceeded the number of allowable holds.
+ For further information, please consult your local librarian.">
+ <!ENTITY common.control.click "(control-click to select multiple formats)">
+ <!ENTITY common.format.alternatives "Acceptable Alternative Formats:">
+ <!ENTITY common.phone.format "(XXX-YYY-ZZZZ)">
+ <!ENTITY common.phone.enable "Enable phone notifications for this hold?">
+ <!ENTITY common.email.enable "Enable email notifications for this hold?">
+ <!ENTITY common.email.none "(Patron has no configured email address)">
+ <!ENTITY common.email.set "(See <a class='classic_link' id='holds.no_email.my_account'>My Account</a> for setting your email address)">
+ <!ENTITY common.physical.label "Physical Description:">
+ <!ENTITY common.title.label "Title:">
+ <!ENTITY common.author.label "Author:">
+ <!ENTITY common.format.label "Format:">
+ <!ENTITY library.select "Find results in">
+ <!ENTITY library.select.label "Choose a different library...">
+ <!ENTITY library.select.help "Choose a library to search">
+ <!ENTITY login.username "Enter your username or library barcode">
+ <!ENTITY login.password.change "Change Password">
+ <!ENTITY login.first.time "This appears to be the first time you have logged in.
+ You will need to change your password.">
+ <!ENTITY login.password.current.enter "Enter your current password">
+ <!ENTITY login.password.new.enter "Enter the new password">
+ <!ENTITY login.password.new.reenter "Re-type the new password for verifiication">
+ <!ENTITY login.password.update "Update Password">
+ <!ENTITY login.password.nomatch "Passwords do not match">
+ <!ENTITY login.password.success "Password successfully updated">
+ <!ENTITY login.password.strength "The password provided is not strong enough.">
+ <!ENTITY login.barcode.inactive "The barcode used to login is marked as inactive. Please contact your local library.">
+ <!ENTITY login.account.inactive "This account has been deactivated. Please contact your local library.">
+ <!ENTITY login.failed "Login failed. The username or password provided was not valid.
+ Ensure Caps-Lock is off and try again or contact your local library.">
+ <!ENTITY button.go "Go!">
Index: Open-ILS/web/opac/locale/en-US/opac_holds.dtd
===================================================================
RCS file: /cvs/ILS/Open-ILS/web/opac/locale/en-US/opac_holds.dtd,v
retrieving revision 1.2
diff -c -r1.2 opac_holds.dtd
*** Open-ILS/web/opac/locale/en-US/opac_holds.dtd 13 Feb 2006 23:31:28 -0000 1.2
--- Open-ILS/web/opac/locale/en-US/opac_holds.dtd 5 Jun 2007 05:05:27 -0000
***************
*** 3,9 ****
<!ENTITY opac.holds.recipient "Recipient">
<!ENTITY opac.holds.placeHold "Place Hold">
<!ENTITY opac.holds.contactPhone "Contact telephone number">
! <!ENTITY opac.holds.concactEmail "Contact email address">
<!ENTITY opac.holds.pickupLocation "Pickup location">
<!ENTITY opac.holds.placeHold "Place Hold">
<!ENTITY opac.holds.success "Hold was successfully placed">
--- 3,9 ----
<!ENTITY opac.holds.recipient "Recipient">
<!ENTITY opac.holds.placeHold "Place Hold">
<!ENTITY opac.holds.contactPhone "Contact telephone number">
! <!ENTITY opac.holds.contactEmail "Contact email address">
<!ENTITY opac.holds.pickupLocation "Pickup location">
<!ENTITY opac.holds.placeHold "Place Hold">
<!ENTITY opac.holds.success "Hold was successfully placed">
Index: Open-ILS/web/opac/skin/default/xml/common/holds.xml
===================================================================
RCS file: /cvs/ILS/Open-ILS/web/opac/skin/default/xml/common/holds.xml,v
retrieving revision 1.26
diff -c -r1.26 holds.xml
*** Open-ILS/web/opac/skin/default/xml/common/holds.xml 7 May 2007 18:51:59 -0000 1.26
--- Open-ILS/web/opac/skin/default/xml/common/holds.xml 5 Jun 2007 05:05:27 -0000
***************
*** 9,17 ****
<td><input type='text' id='xul_recipient_barcode'> </input></td>
<td><input type='submit' value='&common.submit;'
id='xul_recipient_barcode_submit'> </input></td>
! <td><input type='submit' value='Place hold for me'
id='xul_recipient_me'> </input></td>
! <td><input type='submit' value='Cancel' onclick='showCanvas();'></input></td>
</tr>
</tbody>
--- 9,17 ----
<td><input type='text' id='xul_recipient_barcode'> </input></td>
<td><input type='submit' value='&common.submit;'
id='xul_recipient_barcode_submit'> </input></td>
! <td><input type='submit' value='&common.hold.place;'
id='xul_recipient_me'> </input></td>
! <td><input type='submit' value='&common.cancel;' onclick='showCanvas();'></input></td>
</tr>
</tbody>
***************
*** 22,28 ****
<div id='check_holds_box' class='hide_me non_canvas'
style='margin-top: 6px; width: 100%; text-align: center'>
<br/><br/><br/>
! <b>Checking for possibility of hold fulfillment...</b>
</div>
<div id='holds_box' class='hide_me non_canvas' style='margin-top: 6px;'>
--- 22,28 ----
<div id='check_holds_box' class='hide_me non_canvas'
style='margin-top: 6px; width: 100%; text-align: center'>
<br/><br/><br/>
! <b>&common.hold.check;</b>
</div>
<div id='holds_box' class='hide_me non_canvas' style='margin-top: 6px;'>
***************
*** 32,85 ****
<tbody>
<tr>
<td class='holds_cell color_1'
! align='center' colspan='2'>Create / Edit a Hold</td>
</tr>
<tr>
<td class='holds_cell'>&opac.holds.recipient;:</td>
<td class='holds_cell' id='holds_recipient'> </td>
</tr>
<tr>
! <td class='holds_cell'>&common.title;:</td>
<td class='holds_cell' id='holds_title'> </td>
</tr>
<tr>
! <td class='holds_cell'>&common.author;:</td>
<td class='holds_cell' id='holds_author'> </td>
</tr>
<tr>
! <td class='holds_cell'>&common.format;:</td>
<td class='holds_cell' id='holds_format'> </td>
</tr>
<tr id='hold_physical_desc_row'>
! <td class='holds_cell'>Physical Description:</td>
<td class='holds_cell' id='holds_physical_desc'> </td>
</tr>
<tr class='hide_me' id='holds_cn_row'>
! <td class='holds_cell'>Call Number:</td>
<td class='holds_cell'><b id='holds_cn'/> </td>
</tr>
<tr class='hide_me' id='holds_copy_row'>
! <td class='holds_cell'>Copy Barcode:</td>
<td class='holds_cell'><b id='holds_copy'/> </td>
</tr>
<tr class='hide_me' id='holds_type_row'>
! <td class='holds_cell'>Hold Type:</td>
! <td class='holds_cell hide_me' id='holds_is_cn'><b>Volume Hold</b></td>
! <td class='holds_cell hide_me' id='holds_is_copy'><b>Copy Hold</b></td>
</tr>
<tr>
<td class='holds_cell'>&opac.holds.contactPhone;:</td>
<td class='holds_cell'>
<input id='holds_phone' size='13' maxlength='12'/>
! <span style='margin-left: 4px; font-size: 7pt;'>(XXX-YYY-ZZZZ)</span>
</td>
</tr>
<tr>
! <td class='holds_cell'>Enable phone notifications for this hold?</td>
<td class='holds_cell'>
<input type='checkbox' id='holds_enable_phone' checked='checked'
onchange='
--- 32,85 ----
<tbody>
<tr>
<td class='holds_cell color_1'
! align='center' colspan='2'>&common.hold.create;</td>
</tr>
<tr>
<td class='holds_cell'>&opac.holds.recipient;:</td>
<td class='holds_cell' id='holds_recipient'> </td>
</tr>
<tr>
! <td class='holds_cell'>&common.title.label;</td>
<td class='holds_cell' id='holds_title'> </td>
</tr>
<tr>
! <td class='holds_cell'>&common.author;</td>
<td class='holds_cell' id='holds_author'> </td>
</tr>
<tr>
! <td class='holds_cell'>&common.format;</td>
<td class='holds_cell' id='holds_format'> </td>
</tr>
<tr id='hold_physical_desc_row'>
! <td class='holds_cell'>&common.physical.label;</td>
<td class='holds_cell' id='holds_physical_desc'> </td>
</tr>
<tr class='hide_me' id='holds_cn_row'>
! <td class='holds_cell'>&common.call.number.label;</td>
<td class='holds_cell'><b id='holds_cn'/> </td>
</tr>
<tr class='hide_me' id='holds_copy_row'>
! <td class='holds_cell'>&common.copy.barcode.label;</td>
<td class='holds_cell'><b id='holds_copy'/> </td>
</tr>
<tr class='hide_me' id='holds_type_row'>
! <td class='holds_cell'>&common.hold.type.label;</td>
! <td class='holds_cell hide_me' id='holds_is_cn'><b>&common.hold.volume;</b></td>
! <td class='holds_cell hide_me' id='holds_is_copy'><b>&common.hold.copy;</b></td>
</tr>
<tr>
<td class='holds_cell'>&opac.holds.contactPhone;:</td>
<td class='holds_cell'>
<input id='holds_phone' size='13' maxlength='12'/>
! <span style='margin-left: 4px; font-size: 7pt;'>&common.phone.format;</span>
</td>
</tr>
<tr>
! <td class='holds_cell'>&common.phone.enable;</td>
<td class='holds_cell'>
<input type='checkbox' id='holds_enable_phone' checked='checked'
onchange='
***************
*** 89,108 ****
</tr>
<tr>
! <td class='holds_cell'>&opac.holds.concactEmail;:</td>
<td class='holds_cell' id='holds_email'>
<span class='hide_me' id='holds.no_email'>
! (See <a class='classic_link'
! id='holds.no_email.my_account'>My Account</a> for setting your email address)
</span>
<span class='hide_me' id='holds.no_email.xul'>
! (Patron has no configured email address)
</span>
</td>
</tr>
<tr>
! <td class='holds_cell'>Enable email notifications for this hold?</td>
<td class='holds_cell'>
<input type='checkbox' id='holds_enable_email' checked='checked'/>
</td>
--- 89,107 ----
</tr>
<tr>
! <td class='holds_cell'>&opac.holds.contactEmail;:</td>
<td class='holds_cell' id='holds_email'>
<span class='hide_me' id='holds.no_email'>
!
</span>
<span class='hide_me' id='holds.no_email.xul'>
! &common.email.none;
</span>
</td>
</tr>
<tr>
! <td class='holds_cell'>&common.email.enable;</td>
<td class='holds_cell'>
<input type='checkbox' id='holds_enable_email' checked='checked'/>
</td>
***************
*** 126,132 ****
<td colspan='2' align='center'>
<div style='padding: 8px;'>
<a class='classic_link' href='javascript:void(0);' style='padding: 5px;'
! onclick='unHideMe($("holds_alt_formats_row"));'>Advanced Hold Options</a>
</div>
</td>
</tr>
--- 125,131 ----
<td colspan='2' align='center'>
<div style='padding: 8px;'>
<a class='classic_link' href='javascript:void(0);' style='padding: 5px;'
! onclick='unHideMe($("holds_alt_formats_row"));'>&common.hold.advanced;</a>
</div>
</td>
</tr>
***************
*** 135,145 ****
<td class='holds_cell'>
<div style='margin-bottom: 5px;'>
! <span>Acceptable Alternative Formats: </span>
<span> <a class='classic_link' style='color:red;' href='javascript:void(0);'
! onclick='alert($("holds_explain_adv").innerHTML)'>(??)</a></span>
</div>
! <div>(control-click to select multiple formats)</div>
</td>
<td class='holds_cell'>
--- 134,144 ----
<td class='holds_cell'>
<div style='margin-bottom: 5px;'>
! <span>&common.format.alternatives; </span>
<span> <a class='classic_link' style='color:red;' href='javascript:void(0);'
! onclick='alert($("holds_explain_adv").innerHTML)'>&common.help;</a></span>
</div>
! <div>&common.control.click;</div>
</td>
<td class='holds_cell'>
***************
*** 156,162 ****
<tr>
<td class='holds_cell' align='center' colspan='2'>
<button id='holds_submit'>&opac.holds.placeHold;</button>
! <button class='hide_me' id='holds_update'>Update Hold</button>
<span style='padding: 20px;'> </span>
<button id='holds_cancel'>&common.cancel;</button>
</td>
--- 155,161 ----
<tr>
<td class='holds_cell' align='center' colspan='2'>
<button id='holds_submit'>&opac.holds.placeHold;</button>
! <button class='hide_me' id='holds_update'>&common.hold.update;</button>
<span style='padding: 20px;'> </span>
<button id='holds_cancel'>&common.cancel;</button>
</td>
***************
*** 167,181 ****
<div class='hide_me' id='holds_success'>&opac.holds.success;</div>
<div class='hide_me' id='holds_failure'>&opac.holds.failure;</div>
<span class='hide_me' id='holds_bad_phone'>
! The phone number does not have the correct format.
! The expected format is XXX-YYY-ZZZZ
</span>
<span class='hide_me' id='hold_not_allowed'>
! No items were found that could fulfill the requested holds.
! It's possible that choosing a different format will result in a successful hold.
! It is also possible that you have exceeded the number of allowable holds.
! For further information, please consult your local librarian.
</span>
</div>
--- 166,176 ----
<div class='hide_me' id='holds_success'>&opac.holds.success;</div>
<div class='hide_me' id='holds_failure'>&opac.holds.failure;</div>
<span class='hide_me' id='holds_bad_phone'>
! &common.phone.format.help;
</span>
<span class='hide_me' id='hold_not_allowed'>
! &common.hold.failed;
</span>
</div>
***************
*** 191,222 ****
<span class='hide_me' id='holds_explain_adv'>&holds.advanced_options;</span>
! <span class='hide_me' id='holds_pick_good_org'>
! Please select a physical location where your hold can be delivered.
! </span>
! <span class='hide_me' id='hold_dup_exists'>
! A hold already exists on the requested item
! </span>
! <span class='hide_me' id='hold_dup_exists_override'>
! A hold already exists on the requested item. Would you like to create the hold anyway?
! </span>
! <span id='hold_failed_patron_barred' class='hide_me'>
! PATRON BARRED.
! Please see any notes in the "Staff Notes" section of your "My Account" page or contact your local library.
! </span>
! <span id='invalid_hold' class='hide_me'>
! This hold is no longer valid.
! It's likely that the target for the hold was deleted from the system.
! Please cancel this hold and place a new one.
! </span>
! <span id='holds_invalid_recipient' class='hide_me'>
! The patron barcode entered as the hold recipient is invalid.
! </span>
</div>
--- 186,202 ----
<span class='hide_me' id='holds_explain_adv'>&holds.advanced_options;</span>
! <span class='hide_me' id='holds_pick_good_org'>&common.hold.delivery;</span>
! <span class='hide_me' id='hold_dup_exists'>&common.hold.exists;</span>
! <span class='hide_me' id='hold_dup_exists_override'>&common.hold.exists.override;</span>
! <span id='hold_failed_patron_barred' class='hide_me'>&common.hold.barred;</span>
! <span id='invalid_hold' class='hide_me'>&common.hold.item.invalid;</span>
! <span id='holds_invalid_recipient' class='hide_me'>&common.hold.patron.invalid;</span>
</div>
Index: Open-ILS/web/opac/skin/default/xml/common/libselect.xml
===================================================================
RCS file: /cvs/ILS/Open-ILS/web/opac/skin/default/xml/common/libselect.xml,v
retrieving revision 1.2
diff -c -r1.2 libselect.xml
*** Open-ILS/web/opac/skin/default/xml/common/libselect.xml 15 Dec 2005 23:10:45 -0000 1.2
--- Open-ILS/web/opac/skin/default/xml/common/libselect.xml 5 Jun 2007 05:05:27 -0000
***************
*** 2,15 ****
<script language='javascript' src='../js/depth_selector.js'> </script>
<span class='hide_me' id='depth_selector_span'>
<!--#if expr="$SHOW_DEPTHSEL_TEXT='true'"-->
! <span>Find results in </span>
<!--#endif-->
<select id='depth_selector' >
! <option value='new'>Choose a different library...</option>
</select>
</span>
<span class='hide_me' id='lib_selector_span'>
! <a id='lib_selector_link' class='classic_link' href='javascript:void(0)'>Choose a library to search</a>
</span>
</span>
--- 2,15 ----
<script language='javascript' src='../js/depth_selector.js'> </script>
<span class='hide_me' id='depth_selector_span'>
<!--#if expr="$SHOW_DEPTHSEL_TEXT='true'"-->
! <span>&library.select; </span>
<!--#endif-->
<select id='depth_selector' >
! <option value='new'>&library.select.label;</option>
</select>
</span>
<span class='hide_me' id='lib_selector_span'>
! <a id='lib_selector_link' class='classic_link' href='javascript:void(0)'>&library.select.help;</a>
</span>
</span>
Index: Open-ILS/web/opac/skin/default/xml/common/login.xml
===================================================================
RCS file: /cvs/ILS/Open-ILS/web/opac/skin/default/xml/common/login.xml,v
retrieving revision 1.5
diff -c -r1.5 login.xml
*** Open-ILS/web/opac/skin/default/xml/common/login.xml 31 Jul 2006 16:14:54 -0000 1.5
--- Open-ILS/web/opac/skin/default/xml/common/login.xml 5 Jun 2007 05:05:27 -0000
***************
*** 23,29 ****
<table id='login_table' class='data_grid' style='margin-left: 20px;' width='95%'>
<tbody>
<tr>
! <td><span class='login_text'>Enter your username or library barcode</span></td>
<td>
<span class='login_text'>
<input id='login_username' type='text' size='16'> </input>
--- 23,29 ----
<table id='login_table' class='data_grid' style='margin-left: 20px;' width='95%'>
<tbody>
<tr>
! <td><span class='login_text'>&login.username;</span></td>
<td>
<span class='login_text'>
<input id='login_username' type='text' size='16'> </input>
***************
*** 44,50 ****
<tr class='color_1'>
<td colspan='2' align='center'>
<span class='login_text' style='margin-right: 20px;'>
! <input type='submit' value='Login' id='login_button'/>
</span>
<span class='login_text' style='margin-left: 20px;'>
<input type='submit' id='login_cancel_button' value='&common.cancel;'/>
--- 44,50 ----
<tr class='color_1'>
<td colspan='2' align='center'>
<span class='login_text' style='margin-right: 20px;'>
! <input type='submit' value='&common.login;' id='login_button'/>
</span>
<span class='login_text' style='margin-left: 20px;'>
<input type='submit' id='login_cancel_button' value='&common.cancel;'/>
***************
*** 56,117 ****
<table id='change_pw_table' class='data_grid hide_me' style='margin-left: 20px;' width='95%'>
<thead>
! <tr><td colspan='2' align='center'><b>Change Password</b></td></tr>
</thead>
<tbody>
<tr>
<td colspan='2' style='padding:10px;'>
! This appears to be the first time you have logged in.
! You will need to change your password.
&common.password_criteria;
</td>
</tr>
<tr>
! <td>Enter your current password</td>
<td><input type='password' id='change_pw_current'/></td>
</tr>
<tr>
! <td>Enter the new password</td>
<td><input type='password' id='change_pw_1'/></td>
</tr>
<tr>
! <td>Re-type the new password for verifiication</td>
<td><input type='password' id='change_pw_2'/></td>
</tr>
<tr><td><br/></td><td/></tr>
<tr class='color_1'>
<td colspan='2' align='center'>
<span class='login_text' style='margin-right: 20px;'>
! <input type='submit' value='Update Password' id='change_pw_button'/>
</span>
</td>
</tr>
</tbody>
</table>
! <span id='pw_no_match' class='hide_me'>Passwords do not match</span>
! <span id='pw_update_successful' class='hide_me'>Password successfully updated</span>
<span id='pw_not_strong' class='hide_me'>
! The password provided is not strong enough.
&common.password_criteria;
</span>
! <span id='patron_card_inactive_alert' class='hide_me'>
! The barcode used to login is marked as inactive. Please contact your local library.
! </span>
! <span id='patron_inactive_alert' class='hide_me'>
! This account has been deactivated. Please contact your local library.
! </span>
! <span id='patron_login_failed' class='hide_me'>
! Login failed. The username or password provided was not valid.
! Make sure Caps-Lock is off and try again or contact your local library.
! </span>
</div>
--- 56,109 ----
<table id='change_pw_table' class='data_grid hide_me' style='margin-left: 20px;' width='95%'>
<thead>
! <tr><td colspan='2' align='center'><b>&login.password;</b></td></tr>
</thead>
<tbody>
<tr>
<td colspan='2' style='padding:10px;'>
! &login.first.time;
&common.password_criteria;
</td>
</tr>
<tr>
! <td>&login.password.current.enter;</td>
<td><input type='password' id='change_pw_current'/></td>
</tr>
<tr>
! <td>&login.password.new.enter;</td>
<td><input type='password' id='change_pw_1'/></td>
</tr>
<tr>
! <td>&login.password.new.reenter;</td>
<td><input type='password' id='change_pw_2'/></td>
</tr>
<tr><td><br/></td><td/></tr>
<tr class='color_1'>
<td colspan='2' align='center'>
<span class='login_text' style='margin-right: 20px;'>
! <input type='submit' value='&login.password.update;' id='change_pw_button'/>
</span>
</td>
</tr>
</tbody>
</table>
! <span id='pw_no_match' class='hide_me'>&login.password.nomatch;</span>
! <span id='pw_update_successful' class='hide_me'>&login.password.success;</span>
<span id='pw_not_strong' class='hide_me'>
! &login.password.strength;
&common.password_criteria;
</span>
! <span id='patron_card_inactive_alert' class='hide_me'>&login.barcode.inactive;</span>
! <span id='patron_inactive_alert' class='hide_me'>&login.account.inactive;</span>
! <span id='patron_login_failed' class='hide_me'>&login.failed;</span>
</div>
Index: Open-ILS/web/opac/skin/default/xml/common/searchbar.xml
===================================================================
RCS file: /cvs/ILS/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml,v
retrieving revision 1.4
diff -c -r1.4 searchbar.xml
*** Open-ILS/web/opac/skin/default/xml/common/searchbar.xml 15 Dec 2005 23:10:45 -0000 1.4
--- Open-ILS/web/opac/skin/default/xml/common/searchbar.xml 5 Jun 2007 05:05:27 -0000
***************
*** 30,36 ****
<input id='search_box' style='width: 190px;' type='text' />
<span style='padding-left: 6px;'>
! <input type='button' style='width: 40px;' id='search_submit' value='Go!' />
</span>
</td>
--- 30,36 ----
<input id='search_box' style='width: 190px;' type='text' />
<span style='padding-left: 6px;'>
! <input type='button' style='width: 40px;' id='search_submit' value='&button.go;' />
</span>
</td>
Index: Open-ILS/web/opac/skin/default/xml/common/sidebar.xml
===================================================================
RCS file: /cvs/ILS/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml,v
retrieving revision 1.7
diff -c -r1.7 sidebar.xml
*** Open-ILS/web/opac/skin/default/xml/common/sidebar.xml 2 Feb 2007 22:39:33 -0000 1.7
--- Open-ILS/web/opac/skin/default/xml/common/sidebar.xml 5 Jun 2007 05:05:27 -0000
***************
*** 48,56 ****
<a id='sidebar_title_results'>&navigate.titleResults;</a>
</div>
! <div title="Record Details"
id='rdetail_link_div' class="side_bar_item hide_me">
! <span>My Title Details</span>
</div>
</div>
</div>
--- 48,56 ----
<a id='sidebar_title_results'>&navigate.titleResults;</a>
</div>
! <div title="&navigate.record.details;"
id='rdetail_link_div' class="side_bar_item hide_me">
! <span>&navigate.title.details;</span>
</div>
</div>
</div>
***************
*** 104,120 ****
style='text-align:center; margin-top: 20px;'>
<hr/>
<div id='adv_quick_search'>
! <div class='adv_quick_search'><b>Quick Search</b></div>
<div style='margin-top: 8px;'>
<table><tbody><tr>
<td>
<select id='adv_quick_type' style='width: 6em;'>
! <option value='isbn'>ISBN</option>
! <option value='issn'>ISSN</option>
! <option value='cn'>Call Number</option>
! <option value='lccn'>LCCN</option>
! <option value='tcn'>TCN</option>
! <option value='barcode'>Item Barcode</option>
</select>
</td><td>
<input type='text' id='adv_quick_text' size='16'> </input>
--- 104,120 ----
style='text-align:center; margin-top: 20px;'>
<hr/>
<div id='adv_quick_search'>
! <div class='adv_quick_search'><b>&sidebar.quick.search;</b></div>
<div style='margin-top: 8px;'>
<table><tbody><tr>
<td>
<select id='adv_quick_type' style='width: 6em;'>
! <option value='isbn'>&opac.advanced.quick.isbn;</option>
! <option value='issn'>&opac.advanced.quick.issn;</option>
! <option value='cn'>&opac.advanced.quick.cn;</option>
! <option value='lccn'>&opac.advanced.quick.lccn;</option>
! <option value='tcn'>&opac.advanced.quick.tcn;</option>
! <option value='barcode'>&opac.advanced.quick.barcode;</option>
</select>
</td><td>
<input type='text' id='adv_quick_text' size='16'> </input>
***************
*** 122,130 ****
</tr></tbody></table>
</div>
! <span class='hide_me' id='myopac.copy.not.found'>No copy with the requested barcode was found</span>
<div style='margin-top: 8px;' class='adv_quick_search_submit'>
! <a id='adv_quick_submit' href='javascript:advGenericSearch();' class='classic_link'>Submit</a>
</div>
</div>
</div>
--- 122,130 ----
</tr></tbody></table>
</div>
! <span class='hide_me' id='myopac.copy.not.found'>&sidebar.copy.not.found;</span>
<div style='margin-top: 8px;' class='adv_quick_search_submit'>
! <a id='adv_quick_submit' href='javascript:advGenericSearch();' class='classic_link'>&common.submit;</a>
</div>
</div>
</div>
***************
*** 132,148 ****
<div id='adv_marc_search_sidebar' class='sidebar_chunk hide_me'
style='text-align:center; margin-top: 20px;'>
<hr/>
! <div class='adv_quick_search'><b>MARC Expert Search</b></div>
<table style='margin: 3px; border: 3px solid #E0E0E0; width: 100%;' id='adv_sdbar_table'>
<tbody>
<tr>
! <td>Tag:</td>
<td><input name='advanced.marc.tag' maxlength='3' size='3'> </input></td>
! <td>Subfield:</td>
<td><input name='advanced.marc.subfield' maxlength='1' size='1'> </input></td>
</tr>
<tr>
! <td>Value:</td>
<td colspan='3'><input name='advanced.marc.value' size='18'> </input></td>
</tr>
<tr name='crow' class='hide_me'>
--- 132,148 ----
<div id='adv_marc_search_sidebar' class='sidebar_chunk hide_me'
style='text-align:center; margin-top: 20px;'>
<hr/>
! <div class='adv_quick_search'><b>&search.marc;</b></div>
<table style='margin: 3px; border: 3px solid #E0E0E0; width: 100%;' id='adv_sdbar_table'>
<tbody>
<tr>
! <td>&search.marc.tag;</td>
<td><input name='advanced.marc.tag' maxlength='3' size='3'> </input></td>
! <td>&search.marc.subfield;</td>
<td><input name='advanced.marc.subfield' maxlength='1' size='1'> </input></td>
</tr>
<tr>
! <td>&search.marc.value;</td>
<td colspan='3'><input name='advanced.marc.value' size='18'> </input></td>
</tr>
<tr name='crow' class='hide_me'>
***************
*** 151,165 ****
onclick='
var div = $("adv_marc_search_sidebar");
if( div.getElementsByTagName("table").length > 1 )
! div.removeChild(this.parentNode.parentNode.parentNode.parentNode);'>close</a>
</td>
</tr>
</tbody>
</table>
<div id='adv_marc_submit' class='adv_quick_search_submit'>
! <a style='margin-right: 4px;' class='classic_link' href='javascript:advAddMARC();'>Add Row</a>
! <a style='margin-left: 4px;' class='classic_link' href='javascript:advMARCRun();'>Submit</a>
</div>
</div>
--- 151,165 ----
onclick='
var div = $("adv_marc_search_sidebar");
if( div.getElementsByTagName("table").length > 1 )
! div.removeChild(this.parentNode.parentNode.parentNode.parentNode);'>&common.close;</a>
</td>
</tr>
</tbody>
</table>
<div id='adv_marc_submit' class='adv_quick_search_submit'>
! <a style='margin-right: 4px;' class='classic_link' href='javascript:advAddMARC();'>&search.marc.add.row;</a>
! <a style='margin-left: 4px;' class='classic_link' href='javascript:advMARCRun();'>&common.submit;</a>
</div>
</div>
Index: Open-ILS/web/opac/skin/default/xml/common/statusbar.xml
===================================================================
RCS file: /cvs/ILS/Open-ILS/web/opac/skin/default/xml/common/statusbar.xml,v
retrieving revision 1.3
diff -c -r1.3 statusbar.xml
*** Open-ILS/web/opac/skin/default/xml/common/statusbar.xml 10 Apr 2006 20:47:43 -0000 1.3
--- Open-ILS/web/opac/skin/default/xml/common/statusbar.xml 5 Jun 2007 05:05:27 -0000
***************
*** 9,15 ****
<span style='padding: 1px; ' id='now_searching_location'> </span>
</b>
<i id='including_results_for' class='hide_me'>
! <span>Including results for</span> <b id='including_results_location'> </b>
</i>
</td>
</tr>
--- 9,15 ----
<span style='padding: 1px; ' id='now_searching_location'> </span>
</b>
<i id='including_results_for' class='hide_me'>
! <span>&status.results;</span> <b id='including_results_location'> </b>
</i>
</td>
</tr>
Index: Open-ILS/web/opac/skin/default/xml/common/tips.xml
===================================================================
RCS file: /cvs/ILS/Open-ILS/web/opac/skin/default/xml/common/tips.xml,v
retrieving revision 1.1
diff -c -r1.1 tips.xml
*** Open-ILS/web/opac/skin/default/xml/common/tips.xml 14 Dec 2005 22:45:15 -0000 1.1
--- Open-ILS/web/opac/skin/default/xml/common/tips.xml 5 Jun 2007 05:05:27 -0000
***************
*** 4,8 ****
<span>&common.tips.tip1;</span>
<span>&common.tips.tip2;</span>
</div>
! <span style="font-weight: bold;">Tip: </span>
</div>
--- 4,8 ----
<span>&common.tips.tip1;</span>
<span>&common.tips.tip2;</span>
</div>
! <span style="font-weight: bold;">&tips.label; </span>
</div>
More information about the Open-ils-dev
mailing list