From 6b7763c284ef7f9fc9147a0922ef2328cc81c1c1 Mon Sep 17 00:00:00 2001 From: dbs Date: Wed, 10 Sep 2008 03:09:02 +0000 Subject: [PATCH] build/i18n/Makefile.in: * Install the entityized version of fm_IDL.xml in /reports/ if any locale is installed * Install the DTD set of entities for fm_IDL.xml for each localization Open-ILS/src/Makefile.am: * Copy, don't link, fm_IDL.xml into /reports/ - this avoids the /conf/ version from getting replaced by the entityized version (which messes up cstore but good) Open-ILS/examples/apache/eg_vhost.conf: * Add rudimentary locale settings for the reports interface, based on the contents of the Accept-Language header (assuming that we will only support one language in the header at a time in the staff client; otherwise, the last match in eg_vhost.conf wins despite the order of entries in the header) git-svn-id: svn://svn.open-ils.org/ILS/trunk@10571 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/examples/apache/eg_vhost.conf | 5 +++++ Open-ILS/src/Makefile.am | 2 +- build/i18n/Makefile.in | 7 +++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Open-ILS/examples/apache/eg_vhost.conf b/Open-ILS/examples/apache/eg_vhost.conf index 84d7629aa1..33926dabbb 100644 --- a/Open-ILS/examples/apache/eg_vhost.conf +++ b/Open-ILS/examples/apache/eg_vhost.conf @@ -60,6 +60,7 @@ RewriteRule ^/opac/extras/ac/jacket/(small|medium|large)/$ \ # add languages as necessary SetEnvIf Request_URI "/en-US/" locale=en-US SetEnvIf Request_URI "/fr-CA/" locale=fr-CA + SetEnvIf Request_URI "/hy-AM/" locale=hy-AM SetEnvIf Request_URI ".*" OILS_OPAC_BASE=/opac/ # This gives you the option to configure a different host to serve OPAC images from @@ -259,7 +260,11 @@ RewriteRule ^/opac/extras/ac/jacket/(small|medium|large)/$ \ # ---------------------------------------------------------------------------------- Options +Includes + SetEnvIfNoCase Accept-Language "en" locale=en-US + SetEnvIfNoCase Accept-Language "fr-CA" locale=fr-CA + SetEnvIfNoCase Accept-Language "hy-AM" locale=hy-AM AddOutputFilter INCLUDES .xhtml + AddOutputFilter INCLUDES;XMLENT .xml # ---------------------------------------------------------------------------------- diff --git a/Open-ILS/src/Makefile.am b/Open-ILS/src/Makefile.am index a415aff6b6..5405942252 100644 --- a/Open-ILS/src/Makefile.am +++ b/Open-ILS/src/Makefile.am @@ -240,7 +240,7 @@ webcore-install: ln -sf $(DESTDIR)$(WEBDIR)/opac/skin/default/xml/index.xml $(DESTDIR)$(WEBDIR)/opac/skin/default/xml/advanced.xml ln -sf $(DESTDIR)$(WEBDIR)/opac/skin/default/xml/index.xml $(DESTDIR)$(WEBDIR)/opac/skin/default/xml/myopac.xml ln -sf $(DESTDIR)$(WEBDIR)/opac/skin/default/xml/index.xml $(DESTDIR)$(WEBDIR)/opac/skin/default/xml/cnbrowse.xml - ln -sf $(DESTDIR)@sysconfdir@/fm_IDL.xml $(DESTDIR)$(WEBDIR)/reports/ + cp $(DESTDIR)@sysconfdir@/fm_IDL.xml $(DESTDIR)$(WEBDIR)/reports/ offline-install: diff --git a/build/i18n/Makefile.in b/build/i18n/Makefile.in index 1dd08557bf..14da0891f5 100644 --- a/build/i18n/Makefile.in +++ b/build/i18n/Makefile.in @@ -9,12 +9,13 @@ SERVER_PROPSDIR=../../Open-ILS/xul/staff_client/server/locale FMIDLSRC=../../Open-ILS/examples/fm_IDL.xml FMIDLOUT=fm_IDL.pot FMIDLENT=fm_IDL.xml -FMIDLENTITY=fm_IDL.xml.ent +FMIDLENTITY=fm_IDL.dtd FMIDLPO=fm_IDL.po EVTSRC=../../Open-ILS/src/extras/ils_events.xml EVTOUT=ils_events.xml.pot EVTPO=ils_events.xml.po EVTXML=ils_events.xml +REPORTDIR=../../Open-ILS/web/reports/ SQLSRCDIR=../../Open-ILS/src/sql/Pg/ SQLSRCFILE=950.data.seed-values.sql SQLPOT=db.seed.pot @@ -113,7 +114,7 @@ fmidlpo2entity: @scripts/fieldmapper.py --entity $(POINDIR)/$(LOCALE)/$(FMIDLPO) --output $(PROJECT)/$(LOCALE)/$(FMIDLENTITY) # Install updated project files to their corresponding location in the source tree -install: updatepo project +install: updatepo project fmidl2fmidlent mkdir -p $(CHROME_PROPSDIR)/$(LOCALE) cp $(PROJECT)/$(LOCALE)/auth.properties $(CHROME_PROPSDIR)/$(LOCALE)/. cp $(PROJECT)/$(LOCALE)/offline.properties $(CHROME_PROPSDIR)/$(LOCALE)/. @@ -128,5 +129,7 @@ install: updatepo project cp $(PROJECT)/$(LOCALE)/lang.dtd $(CHROME_PROPSDIR)/$(LOCALE)/ cp $(PROJECT)/$(LOCALE)/lang.dtd $(DTDDIR)/$(LOCALE)/ cp $(PROJECT)/$(LOCALE)/opac.dtd $(DTDDIR)/$(LOCALE)/ + cp $(PROJECT)/$(LOCALE)/$(FMIDLENTITY) $(DTDDIR)/$(LOCALE)/ @scripts/merge_ils_events.py --master $(EVTSRC) --localization $(PROJECT)/$(LOCALE)/$(EVTXML) --output $(EVTSRC) cp $(PROJECT)/$(LOCALE)/$(SQLOUT).sql $(SQLSRCDIR)/$(SQLOUT)-$(LOCALE).sql + cp $(POOUTDIR)/$(FMIDLENT) $(REPORTDIR)/$(FMIDLENT) -- 2.43.2