From 925b17db58765095a3c865095056b8f9fe2f04f2 Mon Sep 17 00:00:00 2001 From: dbs Date: Mon, 14 Jun 2010 17:05:50 +0000 Subject: [PATCH] I18N fixes: Merge r16707, r16708, r16709, r16712 from rel_1_6 git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@16715 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/js/dojo/openils/acq/nls/acq.js | 8 +-- Open-ILS/web/js/dojo/openils/actor/nls/register.js | 10 ++-- .../web/js/dojo/openils/booking/nls/capture.js | 65 ++++++++++----------- .../dojo/openils/booking/nls/pickup_and_return.js | 66 ++++++++++------------ .../web/js/dojo/openils/booking/nls/pull_list.js | 38 ++++++------- .../web/js/dojo/openils/reports/nls/reports.js | 4 +- .../js/dojo/openils/widget/nls/AutoFieldWidget.js | 6 +- .../js/dojo/openils/widget/nls/TranslatorPopup.js | 16 +++--- build/i18n/Makefile | 11 ++-- 9 files changed, 106 insertions(+), 118 deletions(-) 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 c688a5b26d..34b5769bbe 100644 --- a/Open-ILS/web/js/dojo/openils/acq/nls/acq.js +++ b/Open-ILS/web/js/dojo/openils/acq/nls/acq.js @@ -1,6 +1,6 @@ { - 'CREATE_PO_ASSETS_CONFIRM' : "This will create bibliographic, call number, and copy records for this purchase order in the ILS.\n\nContinue?", - 'ROLLBACK_PO_RECEIVE_CONFIRM' : "This will rollback receipt of all copies for this purchase order.\n\nContinue?", - 'XUL_RECORD_DETAIL_PAGE' : 'Record Details', - 'DELETE_LI_COPIES_CONFIRM' : 'This will delete the last ${0} copies in the table. Proceed?' + "CREATE_PO_ASSETS_CONFIRM" : "This will create bibliographic, call number, and copy records for this purchase order in the ILS.\n\nContinue?", + "ROLLBACK_PO_RECEIVE_CONFIRM" : "This will rollback receipt of all copies for this purchase order.\n\nContinue?", + "XUL_RECORD_DETAIL_PAGE" : "Record Details", + "DELETE_LI_COPIES_CONFIRM" : "This will delete the last ${0} copies in the table. Proceed?" } 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 250c12dcfe..4b643da387 100644 --- a/Open-ILS/web/js/dojo/openils/actor/nls/register.js +++ b/Open-ILS/web/js/dojo/openils/actor/nls/register.js @@ -1,7 +1,7 @@ { - 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' + "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" } diff --git a/Open-ILS/web/js/dojo/openils/booking/nls/capture.js b/Open-ILS/web/js/dojo/openils/booking/nls/capture.js index e85ceb91f4..b868babc5f 100644 --- a/Open-ILS/web/js/dojo/openils/booking/nls/capture.js +++ b/Open-ILS/web/js/dojo/openils/booking/nls/capture.js @@ -1,37 +1,34 @@ { - '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_CAUSES_TRANSIT': "This item is now in transit!", - 'CAPTURE_TRANSIT_SOURCE': "From:", - 'CAPTURE_TRANSIT_DEST': "To:", - 'BARCODE': "Barcode", - 'TITLE': "Title", - 'AUTHOR': "Author", - 'RESERVED': "Reserved for patron", - 'REQUEST': "Request time", - 'DURATION': "Reserved from", - 'SLIP_DATE': "Slip date", - 'PRINTED_BY': "Printed by", - 'AT': "at", - 'PRINT': "Print", - 'PRINT_ACCESSKEY': "P", - 'TRANSIT': "*** TRANSIT ***", - 'RESERVATION_SHELF': "RESERVATION SHELF", - 'NEEDS_ROUTED_TO': "This item need to be routed 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_CAUSES_TRANSIT": "This item is now in transit!", + "CAPTURE_TRANSIT_SOURCE": "From:", + "CAPTURE_TRANSIT_DEST": "To:", + "BARCODE": "Barcode", + "TITLE": "Title", + "AUTHOR": "Author", + "RESERVED": "Reserved for patron", + "REQUEST": "Request time", + "DURATION": "Reserved from", + "SLIP_DATE": "Slip date", + "PRINTED_BY": "Printed by", + "AT": "at", + "PRINT": "Print", + "PRINT_ACCESSKEY": "P", + "TRANSIT": "*** TRANSIT ***", + "RESERVATION_SHELF": "RESERVATION SHELF", + "NEEDS_ROUTED_TO": "This item need to be routed 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" } diff --git a/Open-ILS/web/js/dojo/openils/booking/nls/pickup_and_return.js b/Open-ILS/web/js/dojo/openils/booking/nls/pickup_and_return.js index cbe04cf20f..f6df5dd567 100644 --- a/Open-ILS/web/js/dojo/openils/booking/nls/pickup_and_return.js +++ b/Open-ILS/web/js/dojo/openils/booking/nls/pickup_and_return.js @@ -1,39 +1,33 @@ { - 'NO_PATRON_BARCODE': "Please enter a patron barcode.", - 'RESERVATIONS_NO_RESPONSE': - "No response from server when asking for reservations.", - '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.", + "NO_PATRON_BARCODE": "Please enter a patron barcode.", + "RESERVATIONS_NO_RESPONSE": "No response from server when asking for reservations.", + "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 a 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': - "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", - 'ADDRESS': "${0}\n${1}\n${2}, ${3} ${4}" + "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", + "ADDRESS": "${0}\n${1}\n${2}, ${3} ${4}" } diff --git a/Open-ILS/web/js/dojo/openils/booking/nls/pull_list.js b/Open-ILS/web/js/dojo/openils/booking/nls/pull_list.js index 6ee91881e3..0d7e1d163b 100644 --- a/Open-ILS/web/js/dojo/openils/booking/nls/pull_list.js +++ b/Open-ILS/web/js/dojo/openils/booking/nls/pull_list.js @@ -1,22 +1,22 @@ { - '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: ", - 'AT': "at", - 'FOR': "for", + "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: ", + "AT": "at", + "FOR": "for", - '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_pickup_lib': "Pickup library", - '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_pickup_lib": "Pickup library", + "AUTO_th_resv_details": "Reservation details", + "AUTO_ATTR_VALUE_print": "Print" } diff --git a/Open-ILS/web/js/dojo/openils/reports/nls/reports.js b/Open-ILS/web/js/dojo/openils/reports/nls/reports.js index f9b72e551a..3485df3394 100644 --- a/Open-ILS/web/js/dojo/openils/reports/nls/reports.js +++ b/Open-ILS/web/js/dojo/openils/reports/nls/reports.js @@ -43,7 +43,7 @@ "REPORT_EDITOR_OUTPUT_FOLDERS": "Output Folders", "REPORT_EDITOR_PROVIDE_FOLDER_ALERT": "Please provide a report folder", "REPORT_EDITOR_ENTER_NAME_ALERT": "Please enter a report name", - "REPORT_EDITOR_INVALID_DATE_ALERT": "invalid start date - YYYY-MM-DD", + "REPORT_EDITOR_INVALID_DATE_ALERT": "invalid start date - YYYY-MM-DD", "REPORT_EDITOR_PROVIDE_OUTPUT_ALERT": "Please provide an output folder", "TFORMS_LABEL_RAW_DATA": "Raw Data", @@ -69,7 +69,7 @@ "TFORMS_LABEL_YEAR_TRUNC": "Year", "TFORMS_LABEL_HOUR_TRUNC": "Hour", "TFORMS_LABEL_DAY_NAME": "Day Name", - "TFORMS_LABEL_MONTH_NAME": "Month Name'", + "TFORMS_LABEL_MONTH_NAME": "Month Name", "TFORMS_LABEL_AGE": "Age", "TFORMS_LABEL_MONTHS_AGO": "Months ago", "TFORMS_LABEL_QUARTERS_AGO": "Quarters ago", diff --git a/Open-ILS/web/js/dojo/openils/widget/nls/AutoFieldWidget.js b/Open-ILS/web/js/dojo/openils/widget/nls/AutoFieldWidget.js index 3fee288dbd..4d19f3419d 100644 --- a/Open-ILS/web/js/dojo/openils/widget/nls/AutoFieldWidget.js +++ b/Open-ILS/web/js/dojo/openils/widget/nls/AutoFieldWidget.js @@ -1,5 +1,5 @@ { - 'TRUE' : 'True', - 'FALSE' : 'False', - 'UNSET' : 'Unset' + "TRUE" : "True", + "FALSE" : "False", + "UNSET" : "Unset" } diff --git a/Open-ILS/web/js/dojo/openils/widget/nls/TranslatorPopup.js b/Open-ILS/web/js/dojo/openils/widget/nls/TranslatorPopup.js index 7fc07a47bd..5b7102d67a 100644 --- a/Open-ILS/web/js/dojo/openils/widget/nls/TranslatorPopup.js +++ b/Open-ILS/web/js/dojo/openils/widget/nls/TranslatorPopup.js @@ -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" +} diff --git a/build/i18n/Makefile b/build/i18n/Makefile index f6fdff0697..bdf12a92cc 100644 --- a/build/i18n/Makefile +++ b/build/i18n/Makefile @@ -93,8 +93,7 @@ dojo2pot: @scripts/dojo_resource.py --pot $(DOJO_BOOKING_SRC)/capture.js --output $(POTSRC)/capture.js.pot @scripts/dojo_resource.py --pot $(DOJO_BOOKING_SRC)/pickup_and_return.js --output $(POTSRC)/pickup_and_return.js.pot @scripts/dojo_resource.py --pot $(DOJO_BOOKING_SRC)/pull_list.js --output $(POTSRC)/pull_list.js.pot - # FIXME: reservation.js is not valid JSON - #@scripts/dojo_resource.py --pot $(DOJO_BOOKING_SRC)/reservation.js --output $(POTSRC)/reservation.js.pot + @scripts/dojo_resource.py --pot $(DOJO_BOOKING_SRC)/reservation.js --output $(POTSRC)/reservation.js.pot @scripts/dojo_resource.py --pot $(DOJO_CON_SRC)/conify.js --output $(POTSRC)/conify.js.pot @scripts/dojo_resource.py --pot $(DOJO_OPAC_SRC)/opac.js --output $(POTSRC)/opac.js.pot @scripts/dojo_resource.py --pot $(DOJO_RPT_SRC)/reports.js --output $(POTSRC)/reports.js.pot @@ -103,14 +102,13 @@ dojo2pot: po2dojo: @scripts/dojo_resource.py --create $(POINDIR)/$(LOCALE)/acq.js.po --output $(PROJECT)/$(LOCALE)/acq.js - @scripts/dojo_resource.py --create $(POINDIR)/$(LOCALE)/register.js.po --output $(PROJECT)/$(LOCALE)/register.js + @scripts/dojo_resource.py --create $(POINDIR)/$(LOCALE)/capture.js.po --output $(PROJECT)/$(LOCALE)/capture.js @scripts/dojo_resource.py --create $(POINDIR)/$(LOCALE)/conify.js.po --output $(PROJECT)/$(LOCALE)/conify.js @scripts/dojo_resource.py --create $(POINDIR)/$(LOCALE)/opac.js.po --output $(PROJECT)/$(LOCALE)/opac.js @scripts/dojo_resource.py --create $(POINDIR)/$(LOCALE)/pickup_and_return.js.po --output $(PROJECT)/$(LOCALE)/pickup_and_return.js @scripts/dojo_resource.py --create $(POINDIR)/$(LOCALE)/pull_list.js.po --output $(PROJECT)/$(LOCALE)/pull_list.js @scripts/dojo_resource.py --create $(POINDIR)/$(LOCALE)/register.js.po --output $(PROJECT)/$(LOCALE)/register.js - # FIXME: reservation.js is not valid JSON - #@scripts/dojo_resource.py --create $(POINDIR)/$(LOCALE)/reservation.js.po --output $(PROJECT)/$(LOCALE)/reservation.js + @scripts/dojo_resource.py --create $(POINDIR)/$(LOCALE)/reservation.js.po --output $(PROJECT)/$(LOCALE)/reservation.js @scripts/dojo_resource.py --create $(POINDIR)/$(LOCALE)/reports.js.po --output $(PROJECT)/$(LOCALE)/reports.js @scripts/dojo_resource.py --create $(POINDIR)/$(LOCALE)/AutoFieldWidget.js.po --output $(PROJECT)/$(LOCALE)/AutoFieldWidget.js @scripts/dojo_resource.py --create $(POINDIR)/$(LOCALE)/TranslatorPopup.js.po --output $(PROJECT)/$(LOCALE)/TranslatorPopup.js @@ -188,8 +186,7 @@ install: updatepo project fmidl2fmidlent fmidlpo2entity-en cp $(PROJECT)/$(LOCALE)/capture.js $(DOJO_BOOKING_SRC)/$(DOJO_LOCALE)/capture.js cp $(PROJECT)/$(LOCALE)/pickup_and_return.js $(DOJO_BOOKING_SRC)/$(DOJO_LOCALE)/pickup_and_return.js cp $(PROJECT)/$(LOCALE)/pull_list.js $(DOJO_BOOKING_SRC)/$(DOJO_LOCALE)/pull_list.js - # FIXME: reservation.js is not valid JSON - #cp $(PROJECT)/$(LOCALE)/reservation.js $(DOJO_BOOKING_SRC)/$(DOJO_LOCALE)/reservation.js + cp $(PROJECT)/$(LOCALE)/reservation.js $(DOJO_BOOKING_SRC)/$(DOJO_LOCALE)/reservation.js mkdir -p $(DOJO_CON_SRC)/$(DOJO_LOCALE) cp $(PROJECT)/$(LOCALE)/conify.js $(DOJO_CON_SRC)/$(DOJO_LOCALE)/conify.js mkdir -p $(DOJO_OPAC_SRC)/$(DOJO_LOCALE) -- 2.11.0