[open-ils-commits] r8414 - in trunk/Open-ILS: web/opac/locale/en-US xul/staff_client/server/admin

svn at svn.open-ils.org svn at svn.open-ils.org
Thu Jan 17 22:24:03 EST 2008


Author: dbs
Date: 2008-01-17 21:58:17 -0500 (Thu, 17 Jan 2008)
New Revision: 8414

Modified:
   trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
   trunk/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul
Log:
Move hardcoded strings out of offline transaction mgmt interface


Modified: trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- trunk/Open-ILS/web/opac/locale/en-US/lang.dtd	2008-01-17 22:03:30 UTC (rev 8413)
+++ trunk/Open-ILS/web/opac/locale/en-US/lang.dtd	2008-01-18 02:58:17 UTC (rev 8414)
@@ -39,6 +39,7 @@
 <!ENTITY common.username "Username">
 <!ENTITY common.username.label "Username:">
 <!ENTITY common.password "Password">
+<!ENTITY common.refresh "Refresh">
 <!ENTITY common.submit "Submit">
 <!ENTITY common.user_not_found "User not found">
 <!ENTITY common.unimplemented 'Not Yet Implemented'>
@@ -1210,3 +1211,18 @@
 <!ENTITY staff.z39_50.search_class.tcn "Accession #">
 <!ENTITY staff.z39_50.search_class.title "Title">
 <!ENTITY staff.z39_50_import_interface_label "Z39.50 IMPORT">
+<!ENTITY staff.server.admin.offline.xacts.caption "Offline Sessions">
+<!ENTITY staff.server.admin.offline.xacts.refresh.accesskey "R">
+<!ENTITY staff.server.admin.offline.xacts.create.label "Create">
+<!ENTITY staff.server.admin.offline.xacts.execute.label "Process">
+<!ENTITY staff.server.admin.offline.xacts.update.label "Update">
+<!ENTITY staff.server.admin.offline.xacts.status.label "Uploaded Transaction Files">
+<!ENTITY staff.server.admin.offline.xacts.status.desc "The transactions from the following workstations have been uploaded, but not processed.  When all expected workstations are present here, use the Process button above.">
+<!ENTITY staff.server.admin.offline.xacts.errors.label "Exceptions">
+<!ENTITY staff.server.admin.offline.xacts.errors.desc "All transactions from this session have been processed.  The errors, if any, are listed below.">
+<!ENTITY staff.server.admin.offline.xacts.export.label "Export List">
+<!ENTITY staff.server.admin.offline.xacts.print.label "Print Export">
+<!ENTITY staff.server.admin.offline.xacts.get_item.label "Retrieve Item">
+<!ENTITY staff.server.admin.offline.xacts.get_patron.label "Retrieve Patron">
+<!ENTITY staff.server.admin.offline.xacts.get_details.label "Details">
+<!ENTITY staff.server.admin.offline.xacts.errors.caption "The session is now processing.  Hit Refresh to check its status.">

Modified: trunk/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul	2008-01-17 22:03:30 UTC (rev 8413)
+++ trunk/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul	2008-01-18 02:58:17 UTC (rev 8414)
@@ -34,7 +34,7 @@
 		function my_init() {
 			try {
 				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		                if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
+				if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing'); }
 				JSAN.errorLevel = "die"; // none, warn, or die
 				JSAN.addRepository('/xul/server/');
 				JSAN.use('util.error'); g.error = new util.error();
@@ -44,9 +44,7 @@
 				g.admin.init({});
 
 			} catch(E) {
-				var err_msg = "!! This software has encountered an error.  Please tell your friendly " +
-					"system administrator or software developer the following:\n" 
-					+ 'admin/offline_manage_xacts.xul\n' + E + '\n';
+				var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['admin/offline_manage_xacts.xul', E]);
 				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
 				alert(err_msg);
 			}
@@ -54,17 +52,19 @@
 
 	]]>
 	</script>
+	<messagecatalog id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
+	<messagecatalog id="adminStrings" src="chrome://open_ils_staff_client/locale/admin.properties"/>
 
 	<vbox id="admin_offline_manage_xacts_main" flex="1">
 
 		<groupbox flex="1">
-			<caption label="Offline Sessions"/>
+			<caption label="&staff.server.admin.offline.xacts.sessions;"/>
 			<hbox>
-				<button id="refresh" label="Refresh" accesskey="R"/>
-				<button id="create" label="Create" disabled="true"/>
-				<button id="execute" label="Process" disabled="true"/>
+				<button id="refresh" label="&common.refresh;" accesskey="&staff.server.admin.offline.xacts.refresh.accesskey;"/>
+				<button id="create" label="&staff.server.admin.offline.xacts.create.label;" disabled="true"/>
+				<button id="execute" label="&staff.server.admin.offline.xacts.execute.label;" disabled="true"/>
 				<spacer flex="1"/>
-				<button id="upload" label="Upload" disabled="true"/>
+				<button id="upload" label="&staff.server.admin.offline.xacts.update.label;" disabled="true"/>
 			</hbox>
 			<tree id="session_tree" enableColumnDrag="true" seltype="single" flex="1"/>
 		</groupbox>
@@ -72,31 +72,31 @@
 		<deck flex="1" id="deck">
 			<label value=" "/>
 			<groupbox flex="1">
-				<caption id="status_caption" label="Uploaded Transaction Files"/>
+				<caption id="status_caption" label="&staff.server.admin.offline.xacts.status.label;"/>
 				<description style="background-color: lightgreen">
-				The transactions from the following workstations have been uploaded, but not processed.  When all expected workstations are present here, use the Process button above.
+                &staff.server.admin.offline.xacts.status.desc;
 				</description>
 				<tree id="script_tree" enableColumnDrag="true" seltype="single" flex="1"/>
 			</groupbox>
 			<groupbox flex="1">
-				<caption id="errors_caption" label="Exceptions"/>
+				<caption id="errors_caption" label="&staff.server.admin.offline.xacts.errors.label;"/>
 				<description style="background-color: orange">
-				All transactions from this session have been processed.  The errors, if any, are listed below.
+                &staff.server.admin.offline.xacts.errors.desc;
 				</description>
 				<vbox flex="1">
 					<hbox>
-						<button id='export_btn' label="Export List" />
-						<button id='print_export_btn' label="Print Export" />
+						<button id='export_btn' label="&staff.server.admin.offline.xacts.export.label;" />
+						<button id='print_export_btn' label="&staff.server.admin.offline.xacts.print.label;" />
 						<spacer flex="1"/>
-						<button id='retrieve_item' label="Retrieve Item" disabled="true"/>
-						<button id='retrieve_patron' label="Retrieve Patron" disabled="true"/>
-						<button id='retrieve_details' label="Details" disabled="true"/>
+						<button id='retrieve_item' label="&staff.server.admin.offline.xacts.get_item.label;" disabled="true"/>
+						<button id='retrieve_patron' label="&staff.server.admin.offline.xacts.get_patron.label;" disabled="true"/>
+						<button id='retrieve_details' label="&staff.server.admin.offline.xacts.get_details.label;" disabled="true"/>
 					</hbox>
 					<tree id="error_tree" enableColumnDrag="true" seltype="multiple" flex="1"/>
 				</vbox>
 			</groupbox>
 			<groupbox flex="1">
-				<caption id="errors_caption" label="The session is now processing.  Hit Refresh to check its status."/>
+				<caption id="errors_caption" label="&staff.server.admin.offline.xacts.errors.caption;"/>
 			</groupbox>
 		</deck>
 		<hbox id="iframe_placeholder" hidden="false" flex="0"/>



More information about the open-ils-commits mailing list