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

[svn at svn.open-ils.org]

Author: dbs
Date: 2008-12-09 23:16:27 -0500 (Tue, 09 Dec 2008)
New Revision: 11488

Modified:
   trunk/Open-ILS/examples/apache/eg_vhost.conf
Log:
Be consistent about our locale patterns (xx-YY)


Modified: trunk/Open-ILS/examples/apache/eg_vhost.conf
===================================================================
--- trunk/Open-ILS/examples/apache/eg_vhost.conf	2008-12-10 03:58:51 UTC (rev 11487)
+++ trunk/Open-ILS/examples/apache/eg_vhost.conf	2008-12-10 04:16:27 UTC (rev 11488)
@@ -96,8 +96,8 @@
 
 RewriteEngine ON
 RewriteCond %{QUERY_STRING} locale=([^&]*)
-RewriteRule ^/opac/[^/]+/extras/slimpac/(.*)$ /opac/%1/extras/slimpac/$1? [redirect]
-<LocationMatch /opac/[^/]+/extras/slimpac/>
+RewriteRule ^/opac/[a-z]{2}-[A-Z]{2}/extras/slimpac/(.*)$ /opac/%1/extras/slimpac/$1? [redirect]
+<LocationMatch /opac/[a-z]{2}-[A-Z]{2}/extras/slimpac/>
     AddOutputFilter INCLUDES;XMLENT .html
 </LocationMatch>
 
@@ -109,6 +109,7 @@
 RewriteRule ^/xul/	-	[E=locale:%1]
 RewriteRule ^/reports/	- 	[E=locale:%1] [L]
 
+# Default to en-US if we haven't matched a locale of the form xx-YY 
 RewriteEngine ON
 RewriteCond %{HTTP:Accept-Language} !([a-z]{2}-[A-Z]{2})
 RewriteRule ^/xul/	-	[E=locale:en-US]
@@ -313,7 +314,7 @@
 # Conify - next-generation Evergreen administration interface
 # ----------------------------------------------------------------------------------
 RewriteEngine on
-RewriteRule ^/conify/(.*)/global/(.*)$ /conify/global/$2 [E=locale:$1,L]
+RewriteRule ^/conify/([a-z]{2}-[A-Z]{2})/global/(.*)$ /conify/global/$2 [E=locale:$1,L]
 <Location /conify>
     XMLEntStripPI "yes"
     XMLEntEscapeScript "no"