[open-ils-commits] r11442 - in trunk/Open-ILS/xul/staff_client: . server/patron

[svn at svn.open-ils.org]

Author: dbs
Date: 2008-12-07 15:34:23 -0500 (Sun, 07 Dec 2008)
New Revision: 11442

Modified:
   trunk/Open-ILS/xul/staff_client/Makefile.am
   trunk/Open-ILS/xul/staff_client/server/patron/display.xul
Log:
Some hamfisted attempts to fix the current unhappy network.js i18n;
we are now placing a copy of chrome message catalogs on the server for server XUL to eat.

This does resolve the exception that was being thrown at check out.


Modified: trunk/Open-ILS/xul/staff_client/Makefile.am
===================================================================
--- trunk/Open-ILS/xul/staff_client/Makefile.am	2008-12-07 11:24:43 UTC (rev 11441)
+++ trunk/Open-ILS/xul/staff_client/Makefile.am	2008-12-07 20:34:23 UTC (rev 11442)
@@ -5,10 +5,11 @@
 
 export STAFF_CLIENT_BUILD_ID = $$(/bin/cat build/BUILD_ID)
 OPENSRF_JSLIBS = "$(OPENSRF_LIBS)/javascript"
+CHROME_LOCALES = $$(ls server/locale)
 
 install-exec-local: build
 
-build: build_dir generated open-ils stamp
+build: build_dir chrome2remote generated open-ils stamp
 	@echo To test the staff client:
 	@echo "  cd build/"
 	@echo "  xulrunner application.ini"
@@ -30,6 +31,14 @@
 	cp build/chrome/content/OpenILS/global_util.js build/server/OpenILS/global_util.js
 	external/prune_dirs.sh build/
 
+# Convert chrome to remote for server localization
+chrome2remote:
+	sed -i 's/chrome:\/\/open_ils_staff_client\/locale\//\/xul\/server\/locale\/<\!--#echo var=locale-->\//' build/server/auth/verify_credentials.xul
+	sed -i 's/chrome:\/\/open_ils_staff_client\/locale\//\/xul\/server\/locale\/<\!--#echo var=locale-->\//' build/server/main/simple_auth.xul
+	@for loc in $(CHROME_LOCALES); do \
+		cp -r chrome/locale/$$loc build/server/locale/. ; \
+	done;
+
 stamp:
 	@/bin/date +"%Y%m%d.%H%M%S" > build/BUILD_ID
 	@if [ -n "${STAFF_CLIENT_BUILD_ID}" ]; then ( echo "Stamping with Build ID: ${STAFF_CLIENT_BUILD_ID}" ; echo ${STAFF_CLIENT_BUILD_ID} > build/BUILD_ID ) ; fi

Modified: trunk/Open-ILS/xul/staff_client/server/patron/display.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/display.xul	2008-12-07 11:24:43 UTC (rev 11441)
+++ trunk/Open-ILS/xul/staff_client/server/patron/display.xul	2008-12-07 20:34:23 UTC (rev 11442)
@@ -88,6 +88,7 @@
 
 	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 	<messagecatalog id="commonStrings" src="/xul/server/locale/<!--#echo var='locale'-->/common.properties" />
+	<messagecatalog id="offlineStrings" src="/xul/server/locale/<!--#echo var='locale'-->/offline.properties" />
 
 	<commandset id="patron_display_cmds">
 		<command id="cmd_patron_refresh" />