From: dbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 11 Sep 2008 19:50:53 +0000 (+0000)
Subject: Set up locales for current translations in staff client
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=5f2df696e3ce3e4000c727733843e8a815d33c90;p=Evergreen.git

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


git-svn-id: svn://svn.open-ils.org/ILS/trunk@10583 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/examples/apache/eg_vhost.conf b/Open-ILS/examples/apache/eg_vhost.conf
index 33926dabbb..587d80c43a 100644
--- a/Open-ILS/examples/apache/eg_vhost.conf
+++ b/Open-ILS/examples/apache/eg_vhost.conf
@@ -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 @@ RewriteRule ^/opac/extras/ac/jacket/(small|medium|large)/$ \
 # ----------------------------------------------------------------------------------
 # 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 @@ RewriteRule ^/opac/extras/ac/jacket/(small|medium|large)/$ \
     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 @@ RewriteRule ^/opac/extras/ac/jacket/(small|medium|large)/$ \
 # ----------------------------------------------------------------------------------
 <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>