[open-ils-commits] r10583 - trunk/Open-ILS/examples/apache

[svn at svn.open-ils.org]

Author: dbs
Date: 2008-09-11 15:50:53 -0400 (Thu, 11 Sep 2008)
New Revision: 10583

Modified:
   trunk/Open-ILS/examples/apache/eg_vhost.conf
Log:
Set up locales for current translations in staff client
This assumes we'll use the Accept-Language header for content negotiation in the staff client


Modified: trunk/Open-ILS/examples/apache/eg_vhost.conf
===================================================================
--- trunk/Open-ILS/examples/apache/eg_vhost.conf	2008-09-11 13:51:23 UTC (rev 10582)
+++ trunk/Open-ILS/examples/apache/eg_vhost.conf	2008-09-11 19:50:53 UTC (rev 10583)
@@ -3,7 +3,6 @@
 # through all virtual hosts (port 80, port 443, etc.) should live in here.
 # ----------------------------------------------------------------------------------
 
-
 # ----------------------------------------------------------------------------------
 # Point / to the opac
 # ----------------------------------------------------------------------------------
@@ -91,14 +90,17 @@
 # ----------------------------------------------------------------------------------
 # Run server-side XUL and XHTML through xmlent to load the correct XML entities
 # ----------------------------------------------------------------------------------
+<LocationMatch /xul>
+    SetEnvIfNoCase Accept-Language "en" locale=en-US
+    SetEnvIfNoCase Accept-Language "fr-CA" locale=fr-CA
+    SetEnvIfNoCase Accept-Language "hy-AM" locale=hy-AM
+</LocationMatch>
+
 <LocationMatch /xul/.*\.xhtml$>
     Options +Includes
     XMLEntEscapeScript "no"
     AddOutputFilter INCLUDES;XMLENT .xhtml
     allow from all
-
-    # We only support one locale (en-US) for the time being
-    SetEnv locale en-US
 </LocationMatch>
 
 <LocationMatch /xul/.*\.xul$>
@@ -106,9 +108,6 @@
     XMLEntContentType "application/vnd.mozilla.xul+xml"
     AddOutputFilter INCLUDES;XMLENT .xul
     allow from all
-
-    # We only support one locale (en-US) for the time being
-    SetEnv locale en-US
 </LocationMatch>
 
 
@@ -260,9 +259,9 @@
 # ----------------------------------------------------------------------------------
 <LocationMatch /reports/>
     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
+    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
 </LocationMatch>