From: Dan Scott <dan@coffeecode.net>
Date: Mon, 30 May 2011 02:43:46 +0000 (-0400)
Subject: Tackle the obvious en-CA-isms in Apache and osrf confs
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Ffeature%2Fen-CA-default;p=contrib%2FConifer.git

Tackle the obvious en-CA-isms in Apache and osrf confs

Signed-off-by: Dan Scott <dscott@laurentian.ca>
---

diff --git a/Open-ILS/examples/apache/eg_vhost.conf b/Open-ILS/examples/apache/eg_vhost.conf
index e8c6fd8b88..1c9bde4194 100644
--- a/Open-ILS/examples/apache/eg_vhost.conf
+++ b/Open-ILS/examples/apache/eg_vhost.conf
@@ -6,7 +6,7 @@
 # ----------------------------------------------------------------------------------
 # Point / to the opac - if you have a custom skin or locale, point at it here
 # ----------------------------------------------------------------------------------
-RedirectMatch 301 ^/$ /opac/en-US/skin/default/xml/index.xml
+RedirectMatch 301 ^/$ /opac/en-CA/skin/default/xml/index.xml
 
 # ----------------------------------------------------------------------------------
 # Point / to the IP address redirector
@@ -19,7 +19,7 @@ RedirectMatch 301 ^/$ /opac/en-US/skin/default/xml/index.xml
 #    #PerlSetVar OILSRedirectSkin "default"
 #    # OILSRedirectDepth defaults to the depth of the branch that the OPAC was directed to
 #    #PerlSetVar OILSRedirectDepth "0"
-#    #PerlSetVar OILSRedirectLocale "en-US"
+#    #PerlSetVar OILSRedirectLocale "en-CA"
 #    allow from all
 #</LocationMatch>
 
@@ -27,8 +27,8 @@ RedirectMatch 301 ^/$ /opac/en-US/skin/default/xml/index.xml
 # ----------------------------------------------------------------------------------
 # Assign a default locale to the accessible OPAC
 # ----------------------------------------------------------------------------------
-RedirectMatch 301 ^/opac/extras/slimpac/start.html$    /opac/en-US/extras/slimpac/start.html
-RedirectMatch 301 ^/opac/extras/slimpac/advanced.html$ /opac/en-US/extras/slimpac/advanced.html
+RedirectMatch 301 ^/opac/extras/slimpac/start.html$    /opac/en-CA/extras/slimpac/start.html
+RedirectMatch 301 ^/opac/extras/slimpac/advanced.html$ /opac/en-CA/extras/slimpac/advanced.html
 
 # ----------------------------------------------------------------------------------
 # Configure the gateway
@@ -193,8 +193,8 @@ RewriteRule . - [E=locale:%1]
 </LocationMatch>
 
 <LocationMatch /opac/extras/>
-    # Force to en-US for now to satisfy bbags.xml
-    SetEnv locale en-US
+    # Force to en-CA for now to satisfy bbags.xml
+    SetEnv locale en-CA
     Options +Includes
     AddOutputFilter INCLUDES .xml
     AddType application/xhtml+xml .xml
@@ -213,15 +213,15 @@ RewriteCond %{HTTP:Accept-Language} ([a-z]{2}-[A-Z]{2})
 RewriteRule ^/xul/	-	[E=locale:%1]
 RewriteRule ^/reports/	- 	[E=locale:%1]
 
-# Default to en-US if we haven't matched a locale of the form xx-YY 
+# Default to en-CA if we haven't matched a locale of the form xx-YY 
 RewriteCond %{HTTP:Accept-Language} !([a-z]{2}-[A-Z]{2})
-RewriteRule ^/xul/	-	[E=locale:en-US]
-RewriteRule ^/reports/	- 	[E=locale:en-US]
+RewriteRule ^/xul/	-	[E=locale:en-CA]
+RewriteRule ^/reports/	- 	[E=locale:en-CA]
 
-# Default to en-US if we are just given en
+# Default to en-CA if we are just given en
 RewriteCond %{ENV:locale} ^$ [OR]
 RewriteCond %{ENV:locale} ^en$
-RewriteRule . - [E=locale:en-US]
+RewriteRule . - [E=locale:en-CA]
 
 <LocationMatch /xul/.*\.x?html$>
     Options +Includes
@@ -491,7 +491,7 @@ RewriteRule ^/conify/([a-z]{2}-[A-Z]{2})/global/(.*)$ /conify/global/$2 [E=local
 # ----------------------------------------------------------------------------------
 # Vandelay importers / exporters (your Web interface to bibliographic travel)
 # ----------------------------------------------------------------------------------
-RedirectMatch 301 ^/vandelay/vandelay.xml(.*)$ /vandelay/en-US/vandelay.xml$1
+RedirectMatch 301 ^/vandelay/vandelay.xml(.*)$ /vandelay/en-CA/vandelay.xml$1
 
 RewriteRule ^/vandelay/([a-z]{2}-[A-Z]{2})/(.*)$ /vandelay/$2 [E=locale:$1]
 
diff --git a/Open-ILS/examples/opensrf.xml.example b/Open-ILS/examples/opensrf.xml.example
index fcfacfb253..7da12ac149 100644
--- a/Open-ILS/examples/opensrf.xml.example
+++ b/Open-ILS/examples/opensrf.xml.example
@@ -10,7 +10,7 @@ vim:et:ts=4:sw=4:
     <default>
 
         <!-- unless otherwise overidden, use this locale -->
-        <default_locale>en-US</default_locale>
+        <default_locale>en-CA</default_locale>
 
         <dirs>
             <log>LOCALSTATEDIR/log</log> <!-- unix::server log files -->