From 399d4e78f9cc5d4cfbe84f82741119e9043367d4 Mon Sep 17 00:00:00 2001 From: dbs Date: Mon, 7 Jun 2010 05:45:26 +0000 Subject: [PATCH] Make booking reservation Dojo NLS file JSON-compliant You can't use string concatentation based on the plurality of arguments to create a translatable string. Solution: create a singular and a plural version of the string, and use the logic in the program itself to pass in the substitution variable to the correct respective string. git-svn-id: svn://svn.open-ils.org/ILS/trunk@16608 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/js/dojo/openils/booking/nls/reservation.js | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/Open-ILS/web/js/dojo/openils/booking/nls/reservation.js b/Open-ILS/web/js/dojo/openils/booking/nls/reservation.js index f1f6a07e1..5a80d1615 100644 --- a/Open-ILS/web/js/dojo/openils/booking/nls/reservation.js +++ b/Open-ILS/web/js/dojo/openils/booking/nls/reservation.js @@ -6,15 +6,9 @@ "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) { - return "Created " + n + " reservation" + (n == 1 ? "" : "s") + "."; - }, + "CREATE_BRESV_OK_MISSING_TARGET": "Created ${0} reservation(s), but ${1} of these couldn't target any resources.\n\nThis means that it won't be possible to fulfill some of these\nreservations until a suitable resource becomes available.", + "CREATE_BRESV_OK": "Created ${0} reservation.", + "CREATE_BRESV_OK_PLURAL": "Created ${0} reservations", "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: ", @@ -25,9 +19,8 @@ "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_SUCCESS": "Canceled ${0} reservation.", + "CXL_BRESV_SUCCESS_PLURAL": "Canceled ${0} reservations", "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.", -- 2.11.0