[open-ils-commits] SPAM: r8625 - in trunk/Open-ILS/xul/staff_client/chrome/content: circ main

[svn at svn.open-ils.org]

Author: dbs
Date: 2008-02-04 22:44:01 -0500 (Mon, 04 Feb 2008)
New Revision: 8625

Modified:
   trunk/Open-ILS/xul/staff_client/chrome/content/circ/offline_renew.js
   trunk/Open-ILS/xul/staff_client/chrome/content/main/main.js
   trunk/Open-ILS/xul/staff_client/chrome/content/main/simple_auth.xul
Log:
Correct common.error vs. common.exception mistake, plus a bit more i18n


Modified: trunk/Open-ILS/xul/staff_client/chrome/content/circ/offline_renew.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/circ/offline_renew.js	2008-02-05 03:22:51 UTC (rev 8624)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/circ/offline_renew.js	2008-02-05 03:44:01 UTC (rev 8625)
@@ -1,5 +1,7 @@
+var offlineStrings;
 function my_init() {
 	try {
+		offlineStrings = $('offlineStrings');
 		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 		if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
 		JSAN.errorLevel = "die"; // none, warn, or die

Modified: trunk/Open-ILS/xul/staff_client/chrome/content/main/main.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/main/main.js	2008-02-05 03:22:51 UTC (rev 8624)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/main/main.js	2008-02-05 03:44:01 UTC (rev 8625)
@@ -264,7 +264,7 @@
 		}
 
 	} catch(E) {
-		var error = offlineStrings.getFormattedString('common.error', [E, '']);
+		var error = offlineStrings.getFormattedString('common.exception', [E, '']);
 		try { G.error.sdump('D_ERROR',error); } catch(E) { dump(error); }
 		alert(error);
 	}

Modified: trunk/Open-ILS/xul/staff_client/chrome/content/main/simple_auth.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/main/simple_auth.xul	2008-02-05 03:22:51 UTC (rev 8624)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/main/simple_auth.xul	2008-02-05 03:44:01 UTC (rev 8625)
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <!-- Application: Evergreen Staff Client -->
 <!-- Screen: Example Template for remote xul -->
+<!--
+ vim:noet:sw=4:ts=4:
+-->
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- STYLESHEETS -->
@@ -35,7 +38,9 @@
 		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( offlineStrings.getString('common.jsan.missing'));
+				}
 				JSAN.errorLevel = "die"; // none, warn, or die
 				JSAN.addRepository('/xul/server/');
 				JSAN.use('util.error'); g.error = new util.error();
@@ -63,8 +68,7 @@
 				$('password').addEventListener('keypress',handle_keypress,false);
 
 			} catch(E) {
-				var err_msg = "!! This software has encountered an error.  Please tell your friendly " +
-					"system administrator or software developer the following:\nquick_auth.xul\n" + E + '\n';
+				var err_msg =  offlineStrings.getFormattedString('common.exception', ['simple_auth.xul', E]);
 				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
 				alert(err_msg);
 			}