From b6d630aeb035e37ba079234f0235f41cca58d928 Mon Sep 17 00:00:00 2001 From: dbs Date: Sun, 7 Dec 2008 20:34:23 +0000 Subject: [PATCH] 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. git-svn-id: svn://svn.open-ils.org/ILS/trunk@11442 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/xul/staff_client/Makefile.am | 11 ++++++++++- Open-ILS/xul/staff_client/server/patron/display.xul | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Open-ILS/xul/staff_client/Makefile.am b/Open-ILS/xul/staff_client/Makefile.am index 37468162db..b4a7e290e5 100644 --- a/Open-ILS/xul/staff_client/Makefile.am +++ b/Open-ILS/xul/staff_client/Makefile.am @@ -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 @@ build_dir: 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 diff --git a/Open-ILS/xul/staff_client/server/patron/display.xul b/Open-ILS/xul/staff_client/server/patron/display.xul index 7e19712be6..4d5e1faf67 100644 --- a/Open-ILS/xul/staff_client/server/patron/display.xul +++ b/Open-ILS/xul/staff_client/server/patron/display.xul @@ -88,6 +88,7 @@ + -- 2.43.2