[open-ils-commits] r16606 - in trunk/Open-ILS/web/js: dojo/openils/User/nls dojo/openils/actor/nls dojo/openils/booking/nls dojo/openils/circ/nls dojo/openils/widget/nls ui/default/actor/user (dbs)

svn at svn.open-ils.org svn at svn.open-ils.org
Mon Jun 7 01:36:51 EDT 2010


Author: dbs
Date: 2010-06-07 01:36:47 -0400 (Mon, 07 Jun 2010)
New Revision: 16606

Modified:
   trunk/Open-ILS/web/js/dojo/openils/User/nls/User.js
   trunk/Open-ILS/web/js/dojo/openils/actor/nls/register.js
   trunk/Open-ILS/web/js/dojo/openils/booking/nls/capture.js
   trunk/Open-ILS/web/js/dojo/openils/booking/nls/pickup_and_return.js
   trunk/Open-ILS/web/js/dojo/openils/booking/nls/pull_list.js
   trunk/Open-ILS/web/js/dojo/openils/booking/nls/reservation.js
   trunk/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js
   trunk/Open-ILS/web/js/dojo/openils/widget/nls/AutoFieldWidget.js
   trunk/Open-ILS/web/js/dojo/openils/widget/nls/TranslatorPopup.js
   trunk/Open-ILS/web/js/dojo/openils/widget/nls/XULTermLoader.js
   trunk/Open-ILS/web/js/ui/default/actor/user/register.js
Log:
More cleanup of Dojo JSON files

  * Double-quote all strings - no single-quoting or barewords
  * Don't escape dollar signs
  * JSON doesn't allow expressions like string continuations ("" + "")

reservations.js has some remaining issues, looks like functions were
defined for what should be simple string substitutions. dojo.string.substitute()
will solve this problem, I believe, with ${0}, ${1}, etc tokens for substitution


Modified: trunk/Open-ILS/web/js/dojo/openils/User/nls/User.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/openils/User/nls/User.js	2010-06-07 05:15:52 UTC (rev 16605)
+++ trunk/Open-ILS/web/js/dojo/openils/User/nls/User.js	2010-06-07 05:36:47 UTC (rev 16606)
@@ -1,3 +1,3 @@
 {
-    'FULL_NAME': "${0}, ${3} ${1} ${2} ${4}"
+    "FULL_NAME": "${0}, ${3} ${1} ${2} ${4}"
 }

Modified: trunk/Open-ILS/web/js/dojo/openils/actor/nls/register.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/openils/actor/nls/register.js	2010-06-07 05:15:52 UTC (rev 16605)
+++ trunk/Open-ILS/web/js/dojo/openils/actor/nls/register.js	2010-06-07 05:36:47 UTC (rev 16606)
@@ -1,8 +1,8 @@
 {
-    DUPE_PATRON_NAME : 'Found ${0} patron(s) with the same name',
-    DUPE_PATRON_EMAIL : 'Found ${0} patron(s) with the same email address',
-    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>'
+    "DUPE_PATRON_NAME" : "Found ${0} patron(s) with the same name",
+    "DUPE_PATRON_EMAIL" : "Found ${0} patron(s) with the same email address",
+    "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>"
 }

Modified: trunk/Open-ILS/web/js/dojo/openils/booking/nls/capture.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/openils/booking/nls/capture.js	2010-06-07 05:15:52 UTC (rev 16605)
+++ trunk/Open-ILS/web/js/dojo/openils/booking/nls/capture.js	2010-06-07 05:36:47 UTC (rev 16606)
@@ -1,24 +1,21 @@
 {
-    'FAILURE': "Capture failed",
-    'SUCCESS': "Capture succeeded",
-    'UNKNOWN_PROBLEM': "An unknown problem occurred during capture attempt.",
-    'CAPTURED_NOTHING': "Didn't capture anything.",
-    'NO_PAYLOAD':
-        "We did not receive further information from the server about this" +
-        "attempt to capture.",
-    'HERES_WHAT_WE_KNOW':
-        "The following information is available about the failed capture:",
-    'CAPTURE_INFO': "Capture Information",
-    'CAPTURE_BRESV_DATES': "Reservation time:",
-    'CAPTURE_BRESV_BRSRC': "Resource barcode:",
-    'CAPTURE_BRESV_PICKUP_LIB': "Pickup library:",
-    'CAPTURE_BRESV_PATRON_BARCODE': "Patron barcode:",
-    'CAPTURE_CAUSES_TRANSIT': "This item is now in transit!",
-    'CAPTURE_TRANSIT_SOURCE': "From:",
-    'CAPTURE_TRANSIT_DEST': "To:",
+    "FAILURE": "Capture failed",
+    "SUCCESS": "Capture succeeded",
+    "UNKNOWN_PROBLEM": "An unknown problem occurred during capture attempt.",
+    "CAPTURED_NOTHING": "Didn't capture anything.",
+    "NO_PAYLOAD": "We did not receive further information from the server about this attempt to capture.",
+    "HERES_WHAT_WE_KNOW": "The following information is available about the failed capture:",
+    "CAPTURE_INFO": "Capture Information",
+    "CAPTURE_BRESV_DATES": "Reservation time:",
+    "CAPTURE_BRESV_BRSRC": "Resource barcode:",
+    "CAPTURE_BRESV_PICKUP_LIB": "Pickup library:",
+    "CAPTURE_BRESV_PATRON_BARCODE": "Patron barcode:",
+    "CAPTURE_CAUSES_TRANSIT": "This item is now in transit!",
+    "CAPTURE_TRANSIT_SOURCE": "From:",
+    "CAPTURE_TRANSIT_DEST": "To:",
 
-    'AUTO_capture_heading': "Capture Reserved Resources",
-    'AUTO_resource_barcode': "Enter barcode:",
-    'AUTO_pickup_lib_selector': "Pickup library:",
-    'AUTO_ATTR_VALUE_capture': "Capture"
+    "AUTO_capture_heading": "Capture Reserved Resources",
+    "AUTO_resource_barcode": "Enter barcode:",
+    "AUTO_pickup_lib_selector": "Pickup library:",
+    "AUTO_ATTR_VALUE_capture": "Capture"
 }

Modified: trunk/Open-ILS/web/js/dojo/openils/booking/nls/pickup_and_return.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/openils/booking/nls/pickup_and_return.js	2010-06-07 05:15:52 UTC (rev 16605)
+++ trunk/Open-ILS/web/js/dojo/openils/booking/nls/pickup_and_return.js	2010-06-07 05:36:47 UTC (rev 16606)
@@ -1,38 +1,35 @@
 {
-    'NO_PATRON_BARCODE': "Please enter a patron barcode.",
-    'RESERVATIONS_NO_RESPONSE':
+    "NO_PATRON_BARCODE": "Please enter a patron barcode.",
+    "RESERVATIONS_NO_RESPONSE":
         "No response from server when asking for reservations.",
-    'RESERVATIONS_ERROR':
+    "RESERVATIONS_ERROR":
         "Error communicating with server (asking for reservations):",
-    'PICKUP_NO_RESPONSE': "No response from server when attempting pickup.",
-    'PICKUP_ERROR': "Error communicating with server (attempting pickup):",
-    'RETURN_NO_RESPONSE': "No response from server when attempting return.",
-    'RETURN_ERROR': "Error communicating with server (attempting return):",
-    'RETURN_SUCCESS': "Return successful.",
-    'SELECT_SOMETHING': "You have not selected any reservations.",
-    'NO_SUCH_RETURNABLE_RESOURCE': "No such returnable resource.",
-    'RETURNABLE_RESOURCE_ERROR': "Error looking up returnable resource:",
-    'NOTICE_CHANGE_OF_PATRON':
-        "Note that the resource scanned was out on reservation to different\n" +
-        "patron than the last resource you scanned.  If this is not\n" +
-        "expected, stop to examine outstanding reservations for your patron\n" +
-        "or on the resource.",
+    "PICKUP_NO_RESPONSE": "No response from server when attempting pickup.",
+    "PICKUP_ERROR": "Error communicating with server (attempting pickup):",
+    "RETURN_NO_RESPONSE": "No response from server when attempting return.",
+    "RETURN_ERROR": "Error communicating with server (attempting return):",
+    "RETURN_SUCCESS": "Return successful.",
+    "SELECT_SOMETHING": "You have not selected any reservations.",
+    "NO_SUCH_RETURNABLE_RESOURCE": "No such returnable resource.",
+    "RETURNABLE_RESOURCE_ERROR": "Error looking up returnable resource:",
+    "NOTICE_CHANGE_OF_PATRON":
+        "Note that the resource scanned was out on reservation to different\npatron than the last resource you scanned.  If this is not\nexpected, stop to examine outstanding reservations for your patron\nor on the resource.",
 
-    'AUTO_h1': "Reservations Pickup",
-    'AUTO_return_h1': "Reservations Return",
-    'AUTO_patron_barcode': "Enter patron barcode:",
-    'AUTO_barcode_type': "Return by barcode of",
-    'AUTO_in_bresv': "Patron has returned these resources today:",
-    'AUTO_ready_bresv': "Patron has these reservations ready for pickup:",
-    'AUTO_out_bresv': "Patron currently has these reservations out:",
-    'AUTO_no_ready_bresv':
+    "AUTO_h1": "Reservations Pickup",
+    "AUTO_return_h1": "Reservations Return",
+    "AUTO_patron_barcode": "Enter patron barcode:",
+    "AUTO_barcode_type": "Return by barcode of",
+    "AUTO_in_bresv": "Patron has returned these resources today:",
+    "AUTO_ready_bresv": "Patron has these reservations ready for pickup:",
+    "AUTO_out_bresv": "Patron currently has these reservations out:",
+    "AUTO_no_ready_bresv":
         "Patron has no reservations ready for pickup at this time.",
-    'AUTO_no_out_bresv': "Patron has no more reservations out at this time.",
-    'AUTO_no_in_bresv': "Patron has not returned any resources today.",
-    'AUTO_patron': "Patron",
-    'AUTO_resource': "Resource",
-    'AUTO_ATTR_VALUE_go': "Go",
-    'AUTO_ATTR_VALUE_reset': "Clear / New Patron",
-    'AUTO_ATTR_VALUE_pickup': "Pick up",
-    'AUTO_ATTR_VALUE_return': "Return"
+    "AUTO_no_out_bresv": "Patron has no more reservations out at this time.",
+    "AUTO_no_in_bresv": "Patron has not returned any resources today.",
+    "AUTO_patron": "Patron",
+    "AUTO_resource": "Resource",
+    "AUTO_ATTR_VALUE_go": "Go",
+    "AUTO_ATTR_VALUE_reset": "Clear / New Patron",
+    "AUTO_ATTR_VALUE_pickup": "Pick up",
+    "AUTO_ATTR_VALUE_return": "Return"
 }

Modified: trunk/Open-ILS/web/js/dojo/openils/booking/nls/pull_list.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/openils/booking/nls/pull_list.js	2010-06-07 05:15:52 UTC (rev 16605)
+++ trunk/Open-ILS/web/js/dojo/openils/booking/nls/pull_list.js	2010-06-07 05:36:47 UTC (rev 16606)
@@ -1,20 +1,20 @@
 {
-    'PULL_LIST_NO_RESPONSE': "No response from server trying to get pull list!",
-    'PULL_LIST_ERROR': "Error trying to fetch pull list: ",
-    'COPY_LOOKUP_NO_RESPONSE': "No response looking up copies by barcode",
-    'COPY_LOOKUP_ERROR': "Error looking up copies by barcode: ",
-    'COPY_MISSING': "Unexpected error: No information for copy: ",
+    "PULL_LIST_NO_RESPONSE": "No response from server trying to get pull list!",
+    "PULL_LIST_ERROR": "Error trying to fetch pull list: ",
+    "COPY_LOOKUP_NO_RESPONSE": "No response looking up copies by barcode",
+    "COPY_LOOKUP_ERROR": "Error looking up copies by barcode: ",
+    "COPY_MISSING": "Unexpected error: No information for copy: ",
 
-    'AUTO_no_results': "No results",
-    'AUTO_owning_lib_selector': "See pull list for library:",
-    'AUTO_pull_list_title': "Booking Pull List",
-    'AUTO_interval_in_days': "Generate list for this many days hence: ",
-    'AUTO_ATTR_VALUE_fetch': "Fetch",
-    'AUTO_th_title_or_name': "Title or name",
-    'AUTO_th_barcode': "Barcode",
-    'AUTO_th_call_number': "Call number",
-    'AUTO_th_copy_location': "Copy location",
-    'AUTO_th_copy_number': "Copy number",
-    'AUTO_th_resv_details': "Reservation details",
-    'AUTO_ATTR_VALUE_print': "Print",
+    "AUTO_no_results": "No results",
+    "AUTO_owning_lib_selector": "See pull list for library:",
+    "AUTO_pull_list_title": "Booking Pull List",
+    "AUTO_interval_in_days": "Generate list for this many days hence: ",
+    "AUTO_ATTR_VALUE_fetch": "Fetch",
+    "AUTO_th_title_or_name": "Title or name",
+    "AUTO_th_barcode": "Barcode",
+    "AUTO_th_call_number": "Call number",
+    "AUTO_th_copy_location": "Copy location",
+    "AUTO_th_copy_number": "Copy number",
+    "AUTO_th_resv_details": "Reservation details",
+    "AUTO_ATTR_VALUE_print": "Print"
 }

Modified: trunk/Open-ILS/web/js/dojo/openils/booking/nls/reservation.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/openils/booking/nls/reservation.js	2010-06-07 05:15:52 UTC (rev 16605)
+++ trunk/Open-ILS/web/js/dojo/openils/booking/nls/reservation.js	2010-06-07 05:36:47 UTC (rev 16606)
@@ -1,82 +1,63 @@
 {
-    'NO_BRT_RESULTS': "There are no bookable resource types registered.",
-    'NO_TARG_DIV': "Could not find target div",
-    'NO_BRA_RESULTS': "Couldn't retrieve booking resource attributes.",
-    'SELECT_A_BRSRC_THEN': "Select a resource from the big list above.",
-    'CREATE_BRESV_LOCAL_ERROR': "Exception trying to create reservation: ",
-    'CREATE_BRESV_SERVER_ERROR': "Server error trying to create reservation: ",
-    'CREATE_BRESV_SERVER_NO_RESPONSE':
-        "No response from server after trying to create reservation.",
-    /* FIXME: Users aren't likely to be able to do anything with the following
-     * message.  Figure out a way to do something more helpful.
-     */
-    'CREATE_BRESV_OK_MISSING_TARGET': function(n, m) {
+    "NO_BRT_RESULTS": "There are no bookable resource types registered.",
+    "NO_TARG_DIV": "Could not find target div",
+    "NO_BRA_RESULTS": "Couldn't retrieve booking resource attributes.",
+    "SELECT_A_BRSRC_THEN": "Select a resource from the big list above.",
+    "CREATE_BRESV_LOCAL_ERROR": "Exception trying to create reservation: ",
+    "CREATE_BRESV_SERVER_ERROR": "Server error trying to create reservation: ",
+    "CREATE_BRESV_SERVER_NO_RESPONSE": "No response from server after trying to create reservation.",
+    "CREATE_BRESV_OK_MISSING_TARGET": function(n, m) {
         return "Created " + n + " reservation(s), but " + m + " of these " +
             "couldn't target any resources.\n\n" +
             "This means that it won't be possible to fulfill some of these\n" +
             "reservations until a suitable resource becomes available.";
     },
-    'CREATE_BRESV_OK': function(n) {
+    "CREATE_BRESV_OK": function(n) {
         return "Created " + n + " reservation" + (n == 1 ? "" : "s") + ".";
     },
-    'WHERES_THE_BARCODE': "Enter a patron's barcode to make a reservation.",
-    'ACTOR_CARD_NOT_FOUND': "Patron barcode not found. Please try again.",
-    'GET_BRESV_LIST_ERR': "Error while retrieving reservation list: ",
-    'GET_BRESV_LIST_NO_RESULT':
-        "No results from server retrieving reservation list.",
-    'OUTSTANDING_BRESV': "Outstanding reservations for patron",
-    'UNTARGETED': "None targeted",
-    'GET_PATRON_NO_RESULT':
-        "No server response after attempting to look up patron by barcode.",
-    'HERE_ARE_EXISTING_BRESV': "Existing reservations for",
-    'NO_EXISTING_BRESV': "This user has no existing reservations at this time.",
-    'NO_USABLE_BRSRC':
-        "No reservable resources.  Adjust start and end time\n" +
-        "until a resource is available for reservation.",
-    'CXL_BRESV_SUCCESS': function(n) {
+    "WHERES_THE_BARCODE": "Enter a patron's barcode to make a reservation.",
+    "ACTOR_CARD_NOT_FOUND": "Patron barcode not found. Please try again.",
+    "GET_BRESV_LIST_ERR": "Error while retrieving reservation list: ",
+    "GET_BRESV_LIST_NO_RESULT": "No results from server retrieving reservation list.",
+    "OUTSTANDING_BRESV": "Outstanding reservations for patron",
+    "UNTARGETED": "None targeted",
+    "GET_PATRON_NO_RESULT": "No server response after attempting to look up patron by barcode.",
+    "HERE_ARE_EXISTING_BRESV": "Existing reservations for",
+    "NO_EXISTING_BRESV": "This user has no existing reservations at this time.",
+    "NO_USABLE_BRSRC": "No reservable resources.  Adjust start and end time\nuntil a resource is available for reservation.",
+    "CXL_BRESV_SUCCESS": function(n) {
         return ("Canceled " + n + " reservation" + (n == 1 ? "" : "s") + ".");
     },
-    'CXL_BRESV_FAILURE': "Error canceling reservations; server silent.",
-    'CXL_BRESV_FAILURE2': "Error canceling reservations:\n",
-    'CXL_BRESV_SELECT_SOMETHING':
-        "You have not selected any reservations to cancel.",
-    'NEED_EXACTLY_ONE_BRT_PASSED_IN':
-        "Can't book multiple resource types at once",
-    'COULD_NOT_RETRIEVE_BRT_PASSED_IN':
-        "Error retrieving booking resource type",
-    'INVALID_TS_RANGE':
-        "You must choose a valid start and end time for the reservation.",
-    'BRSRC_NOT_FOUND': "Could not locate that resource.",
-    'BRSRC_RETRIVE_ERROR': "Error retrieving resource: ",
-    'ON_FLY_NO_RESPONSE':
-        "No response from server attempting to make item a bookable resource.",
-    'ON_FLY_ERROR':
-        "Error attempting to make item a bookable resource:",
-    'ANY': "ANY",
+    "CXL_BRESV_FAILURE": "Error canceling reservations; server silent.",
+    "CXL_BRESV_FAILURE2": "Error canceling reservations:\n",
+    "CXL_BRESV_SELECT_SOMETHING": "You have not selected any reservations to cancel.",
+    "NEED_EXACTLY_ONE_BRT_PASSED_IN": "Can't book multiple resource types at once",
+    "COULD_NOT_RETRIEVE_BRT_PASSED_IN": "Error retrieving booking resource type",
+    "INVALID_TS_RANGE": "You must choose a valid start and end time for the reservation.",
+    "BRSRC_NOT_FOUND": "Could not locate that resource.",
+    "BRSRC_RETRIVE_ERROR": "Error retrieving resource: ",
+    "ON_FLY_NO_RESPONSE": "No response from server attempting to make item a bookable resource.",
+    "ON_FLY_ERROR": "Error attempting to make item a bookable resource:",
+    "ANY": "ANY",
 
-    'AUTO_choose_a_brt': "Choose a Bookable Resource Type",
-    'AUTO_i_need_this_resource': "I need this resource...",
-    'AUTO_starting_at': "Between",
-    'AUTO_ending_at': "and",
-    'AUTO_with_these_attr': "With these attributes:",
-    'AUTO_patron_barcode': "Reserve to patron barcode:",
-    'AUTO_ATTR_VALUE_next': "Next",
-    'AUTO_ATTR_VALUE_reserve_brsrc': "Reserve Selected",
-    'AUTO_ATTR_VALUE_reserve_brt': "Reserve Any",
-    'AUTO_ATTR_VALUE_button_edit_existing': "Edit selected",
-    'AUTO_ATTR_VALUE_button_cancel_existing': "Cancel selcted",
-    'AUTO_bresv_grid_type': "Type",
-    'AUTO_bresv_grid_resource': "Resource",
-    'AUTO_bresv_grid_start_time': "Start time",
-    'AUTO_bresv_grid_end_time': "End time",
-    'AUTO_brt_noncat_only': "Show only non-cataloged bookable resource types",
-    'AUTO_arbitrary_resource':
-        "Enter the barcode of a cataloged, bookable resource:",
-    'AUTO_explain_bookable':
-        "To reserve an item that is not yet registered as a bookable " +
-        "resource, find it in the catalog or under <em>Display Item</em>, and "+
-        "select <em>Make Item Bookable</em> or <em>Book Item Now</em> there.",
-    'AUTO_pickup_lib_selector':
-        "Choose the pickup library for this reservation:",
-    'AUTO_or': '- Or -'
+    "AUTO_choose_a_brt": "Choose a Bookable Resource Type",
+    "AUTO_i_need_this_resource": "I need this resource...",
+    "AUTO_starting_at": "Between",
+    "AUTO_ending_at": "and",
+    "AUTO_with_these_attr": "With these attributes:",
+    "AUTO_patron_barcode": "Reserve to patron barcode:",
+    "AUTO_ATTR_VALUE_next": "Next",
+    "AUTO_ATTR_VALUE_reserve_brsrc": "Reserve Selected",
+    "AUTO_ATTR_VALUE_reserve_brt": "Reserve Any",
+    "AUTO_ATTR_VALUE_button_edit_existing": "Edit selected",
+    "AUTO_ATTR_VALUE_button_cancel_existing": "Cancel selcted",
+    "AUTO_bresv_grid_type": "Type",
+    "AUTO_bresv_grid_resource": "Resource",
+    "AUTO_bresv_grid_start_time": "Start time",
+    "AUTO_bresv_grid_end_time": "End time",
+    "AUTO_brt_noncat_only": "Show only non-cataloged bookable resource types",
+    "AUTO_arbitrary_resource": "Enter the barcode of a cataloged, bookable resource:",
+    "AUTO_explain_bookable": "To reserve an item that is not yet registered as a bookable resource, find it in the catalog or under <em>Display Item</em>, and select <em>Make Item Bookable</em> or <em>Book Item Now</em> there.",
+    "AUTO_pickup_lib_selector": "Choose the pickup library for this reservation:",
+    "AUTO_or": "- Or -"
 }

Modified: trunk/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js	2010-06-07 05:15:52 UTC (rev 16605)
+++ trunk/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js	2010-06-07 05:36:47 UTC (rev 16606)
@@ -1,24 +1,24 @@
 {
-    '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>.",
-    'HOLD_STATUS_READY' : 'Ready for pickup',
-    'HOLD_STATUS_WAITING' : '#${0} in line with ${1} copies',
-    'CHECKOUT_SUCCESS' : 'Checkout of item ${0} succeeded',
-    'RENEW_SUCCESS' : 'Renewal of item ${0} succeeded',
-    'ALREADY_OUT' : 'Item ${0} is already checked out',
-    'OPEN_CIRCULATION_EXISTS' : 'Item ${0} is already checked out to another user',
-    'GENERIC_CIRC_FAILURE' : 'Unable to check out item ${0}.  Please see staff.',
-    'LOGIN_FAILED' : 'Login for ${0} failed',
-    'UNKNOWN_ERROR' : 'An unhandled exception occurred with error code ${0}',
-    'MAX_RENEWALS' : 'No more renewals allowed for item ${0}',
-    'ITEM_NOT_CATALOGED' : 'Item ${0} was not found in the system.  Try re-scanning the item.',
-    'WORKSTATION_REQUIRED' : 'A workstation is required to log in to selfcheck.  You can set the  workstation name with URL param "ws".  \n\nWould you like to register a new workstation for this self-check interface?',
-    'WORKSTATION_EXISTS' : 'This workstation has already been registered.  Would you like to use it for this self-check station?',
-    'CC_PAYABLE_BALANCE' : 'Total amount to pay: \$${0}',
-    'TOTAL_FINES_SELECTED' : 'Selected total: \$${0}',
-    'WELCOME_BANNER' : 'Welcome, ${0}'
+    "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>.",
+    "HOLD_STATUS_READY" : "Ready for pickup",
+    "HOLD_STATUS_WAITING" : "#${0} in line with ${1} copies",
+    "CHECKOUT_SUCCESS" : "Checkout of item ${0} succeeded",
+    "RENEW_SUCCESS" : "Renewal of item ${0} succeeded",
+    "ALREADY_OUT" : "Item ${0} is already checked out",
+    "OPEN_CIRCULATION_EXISTS" : "Item ${0} is already checked out to another user",
+    "GENERIC_CIRC_FAILURE" : "Unable to check out item ${0}.  Please see staff.",
+    "LOGIN_FAILED" : "Login for ${0} failed",
+    "UNKNOWN_ERROR" : "An unhandled exception occurred with error code ${0}",
+    "MAX_RENEWALS" : "No more renewals allowed for item ${0}",
+    "ITEM_NOT_CATALOGED" : "Item ${0} was not found in the system.  Try re-scanning the item.",
+    "WORKSTATION_REQUIRED" : "A workstation is required to log in to selfcheck.  You can set the  workstation name with URL param 'ws'.  \n\nWould you like to register a new workstation for this self-check interface?",
+    "WORKSTATION_EXISTS" : "This workstation has already been registered.  Would you like to use it for this self-check station?",
+    "CC_PAYABLE_BALANCE" : "Total amount to pay: $${0}",
+    "TOTAL_FINES_SELECTED" : "Selected total: $${0}",
+    "WELCOME_BANNER" : "Welcome, ${0}"
 }
 

Modified: trunk/Open-ILS/web/js/dojo/openils/widget/nls/AutoFieldWidget.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/openils/widget/nls/AutoFieldWidget.js	2010-06-07 05:15:52 UTC (rev 16605)
+++ trunk/Open-ILS/web/js/dojo/openils/widget/nls/AutoFieldWidget.js	2010-06-07 05:36:47 UTC (rev 16606)
@@ -1,5 +1,5 @@
 {
-    'TRUE' : 'True',
-    'FALSE' : 'False',
-    'UNSET' : 'Unset'
+    "TRUE" : "True",
+    "FALSE" : "False",
+    "UNSET" : "Unset"
 }

Modified: trunk/Open-ILS/web/js/dojo/openils/widget/nls/TranslatorPopup.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/openils/widget/nls/TranslatorPopup.js	2010-06-07 05:15:52 UTC (rev 16605)
+++ trunk/Open-ILS/web/js/dojo/openils/widget/nls/TranslatorPopup.js	2010-06-07 05:36:47 UTC (rev 16606)
@@ -1,8 +1,8 @@
-({
-	locale : 'Locale',
-	translation : 'Translation',
-	translate : 'Translate',
-	create : 'Create',
-	update : 'Update',
-	remove : 'Remove'
-})
+{
+	"locale" : "Locale",
+	"translation" : "Translation",
+	"translate" : "Translate",
+	"create" : "Create",
+	"update" : "Update",
+	"remove" : "Remove"
+}

Modified: trunk/Open-ILS/web/js/dojo/openils/widget/nls/XULTermLoader.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/openils/widget/nls/XULTermLoader.js	2010-06-07 05:15:52 UTC (rev 16605)
+++ trunk/Open-ILS/web/js/dojo/openils/widget/nls/XULTermLoader.js	2010-06-07 05:36:47 UTC (rev 16606)
@@ -1,7 +1,7 @@
 {
-    'LABEL_TEXT': " term(s) loaded",
-    'BUTTON_TEXT': "Load more terms",
-    'TERM_LIMIT': "You have already loaded the maximum number of terms.",
-    'TERM_LIMIT_SOME': "Could not load all terms from the file without exceeding maximum number of terms. Some data not included.",
-    'CHOOSE_FILE': "Choose a file from which to read search terms."
+    "LABEL_TEXT": " term(s) loaded",
+    "BUTTON_TEXT": "Load more terms",
+    "TERM_LIMIT": "You have already loaded the maximum number of terms.",
+    "TERM_LIMIT_SOME": "Could not load all terms from the file without exceeding maximum number of terms. Some data not included.",
+    "CHOOSE_FILE": "Choose a file from which to read search terms."
 }

Modified: trunk/Open-ILS/web/js/ui/default/actor/user/register.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/actor/user/register.js	2010-06-07 05:15:52 UTC (rev 16605)
+++ trunk/Open-ILS/web/js/ui/default/actor/user/register.js	2010-06-07 05:36:47 UTC (rev 16606)
@@ -23,7 +23,7 @@
 var fmClasses = ['au', 'ac', 'aua', 'actsc', 'asv', 'asvq', 'asva'];
 var fieldDoc = {};
 var statCats;
-var statCatTempate;
+var statCatTemplate;
 var surveys;
 var staff;
 var patron;



More information about the open-ils-commits mailing list