From 1b99fc1c9a248658c2ded2e106a9ba944e9bc407 Mon Sep 17 00:00:00 2001
From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 9 Aug 2007 18:05:47 +0000
Subject: [PATCH] i18n fixation from Dan Scott and miker

git-svn-id: svn://svn.open-ils.org/ILS/trunk@7656 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul | 8 ++++----
 Open-ILS/xul/staff_client/chrome/content/cat/opac.xul            | 8 ++++----
 Open-ILS/xul/staff_client/chrome/content/circ/offline.xul        | 7 +++++--
 Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.js | 8 ++++++--
 .../xul/staff_client/chrome/content/circ/offline_checkin.xul     | 8 ++++----
 .../xul/staff_client/chrome/content/circ/offline_checkout.js     | 9 ++++++---
 .../xul/staff_client/chrome/content/circ/offline_checkout.xul    | 8 ++++----
 Open-ILS/xul/staff_client/chrome/content/main/bindings.xml       | 7 +++----
 8 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul b/Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul
index 2144092f0b..0061170ff2 100644
--- a/Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul
@@ -56,10 +56,10 @@
 	]]>
 	</script>
 
-	<stringbundleset id="adminSet">
-		<stringbundle id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
-		<stringbundle id="adminStrings" src="chrome://open_ils_staff_client/locale/admin.properties"/>
-	</stringbundleset>
+	
+	<messagecatalog id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
+	<messagecatalog id="adminStrings" src="chrome://open_ils_staff_client/locale/admin.properties"/>
+	
 
 	<!-- Layout to be filled in by overlays and javascript -->
 	<wizardpage id="page1"/>
diff --git a/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul b/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
index 31a7823391..1314d74ffc 100644
--- a/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
@@ -309,10 +309,10 @@
 	]]>
 	</script>
 
-	<stringbundleset id="catBundleSet">
-		<stringbundle id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
-		<stringbundle id="catStrings" src="chrome://open_ils_staff_client/locale/cat.properties"/>
-	</stringbundleset>
+	
+	<messagecatalog id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
+	<messagecatalog id="catStrings" src="chrome://open_ils_staff_client/locale/cat.properties"/>
+	
 
 	<vbox flex="1">
 		<deck id="top_pane"/>
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline.xul b/Open-ILS/xul/staff_client/chrome/content/circ/offline.xul
index a2e90ccb09..f95e756954 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline.xul
@@ -30,11 +30,14 @@
 	<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
 	<script>
 	<![CDATA[
-		var circStrings = document.getElementById('circStrings');
-		var commonStrings = document.getElementById('commonStrings');
+		var circStrings;
+		var commonStrings;
 
 		function my_init() {
 			try {
+				circStrings = document.getElementById('circStrings');
+				commonStrings = document.getElementById('commonStrings');
+
 				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 		                if (typeof JSAN == 'undefined') { throw(commonStrings.getString('common.jsan.missing')); }
 				JSAN.errorLevel = "die"; // none, warn, or die
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.js b/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.js
index af22864eab..a75ee826e5 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.js
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.js
@@ -1,7 +1,11 @@
-var commonStrings = document.getElementById('commonStrings');
-var circStrings = document.getElementById('circStrings');
+var commonStrings;
+var circStrings;
+
 function my_init() {
 	try {
+		commonStrings = document.getElementById('commonStrings');
+		circStrings = document.getElementById('circStrings');
+
 		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 		if (typeof JSAN == 'undefined') { throw(commonStrings.getString('common.jsan.missing')); }
 		JSAN.errorLevel = "die"; // none, warn, or die
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.xul b/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.xul
index d524533b06..93e435d6de 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.xul
@@ -29,10 +29,10 @@
 	<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
 	<script type="text/javascript" src="offline_checkin.js"/>
 
-	<stringbundleset id="circBundleSet">
-		<stringbundle id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
-		<stringbundle id="circStrings" src="chrome://open_ils_staff_client/locale/circ.properties"/>
-	</stringbundleset>
+	
+	<messagecatalog id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
+	<messagecatalog id="circStrings" src="chrome://open_ils_staff_client/locale/circ.properties"/>
+	
 
 	<groupbox flex="1">
 		<caption label="&staff.circ.offline_checkin.main.label;"/>
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.js b/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.js
index 7560c83224..db3a031fa5 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.js
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.js
@@ -1,8 +1,11 @@
-var commonStrings = document.getElementById('commonStrings');
-var circStrings = document.getElementById('circStrings');
+var commonStrings;
+var circStrings;
 
 function my_init() {
 	try {
+		commonStrings = document.getElementById('commonStrings');
+		circStrings = document.getElementById('circStrings');
+
 		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 		if (typeof JSAN == 'undefined') { throw(commonStrings.getString('common.jsan.missing')); }
 		JSAN.errorLevel = "die"; // none, warn, or die
@@ -77,7 +80,7 @@ function my_init() {
 		if (file._file.exists()) { g.delta = file.get_object()[0]; file.close(); } else { g.delta = 0; }
 
 	} catch(E) {
-		var err_msg = commonStrings.getFormattedMessage('common.exception', ["circ/offline_checkout.xul", E]);
+		var err_msg = commonStrings.getFormattedString('common.exception', ["circ/offline_checkout.xul", E]);
 		try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
 		alert(err_msg);
 	}
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul b/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul
index a6db8be264..ba57480244 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul
@@ -29,10 +29,10 @@
 	<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
 	<script type="text/javascript" src="offline_checkout.js"/>
 
-	<stringbundleset id="circBundleSet">
-		<stringbundle id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
-		<stringbundle id="circStrings" src="chrome://open_ils_staff_client/locale/circ.properties"/>
-	</stringbundleset>
+	
+	<messagecatalog id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
+	<messagecatalog id="circStrings" src="chrome://open_ils_staff_client/locale/circ.properties"/>
+	
 
 	<groupbox flex="1">
 		<caption label="&staff.circ.offline_checkout.main.label;"/>
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/bindings.xml b/Open-ILS/xul/staff_client/chrome/content/main/bindings.xml
index d93c4d4255..b649ea0151 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/bindings.xml
+++ b/Open-ILS/xul/staff_client/chrome/content/main/bindings.xml
@@ -6,9 +6,8 @@
    xmlns:xbl="http://www.mozilla.org/xbl">
 
 	<binding id="messagecatalog">
-		<resources>
-		</resources>
-    
+		<resources/>
+
 		<content>
 			<children>
 			</children>
@@ -137,7 +136,7 @@
 					<![CDATA[
 					try { 
 						var x = new XMLHttpRequest();
-						x.open("GET","/xul/server/util/sprintf.js",false);
+						x.open("GET","chrome://open_ils_staff_client/content/util/sprintf.js",false);
 						x.send(null);
 						if (x.responseText) {
 							eval(x.responseText);
-- 
2.11.0