LP#1775466 Apache/doc updates for locale changes

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/Open-ILS/examples/apache/eg_vhost.conf.in b/Open-ILS/examples/apache/eg_vhost.conf.in
index 2720867..f32e6fc 100644 (file)
--- a/Open-ILS/examples/apache/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache/eg_vhost.conf.in
@@ -843,9 +843,9 @@ RewriteRule ^/openurl$ ${openurl:%1} [NE,PT]
 
 # Default / en-US.
 # No alternate supported cookie provided.
-#RewriteCond %{REQUEST_URI}  ^/eg2/
-#RewriteCond %{REQUEST_URI}  !^/eg2/([a-z]{2}-[A-Z]{2})/
-#RewriteRule ^/eg2/(.*) https://%{HTTP_HOST}/eg2/en-US/$1 [R=307,L]
+RewriteCond %{REQUEST_URI}  ^/eg2/
+RewriteCond %{REQUEST_URI}  !^/eg2/([a-z]{2}-[A-Z]{2})/
+RewriteRule ^/eg2/(.*) https://%{HTTP_HOST}/eg2/en-US/$1 [R=307,L]
 
 # en-US build
 # This is the only required configuration when only using the default locale.

diff --git a/Open-ILS/examples/apache_24/eg_vhost.conf.in b/Open-ILS/examples/apache_24/eg_vhost.conf.in
index b8b3acf..cfeb27e 100644 (file)
--- a/Open-ILS/examples/apache_24/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache_24/eg_vhost.conf.in
@@ -839,9 +839,9 @@ RewriteRule ^/openurl$ ${openurl:%1} [NE,PT]
 
 # Default / en-US.
 # No alternate supported cookie provided.
-#RewriteCond %{REQUEST_URI}  ^/eg2/
-#RewriteCond %{REQUEST_URI}  !^/eg2/([a-z]{2}-[A-Z]{2})/
-#RewriteRule ^/eg2/(.*) https://%{HTTP_HOST}/eg2/en-US/$1 [R=307,L]
+RewriteCond %{REQUEST_URI}  ^/eg2/
+RewriteCond %{REQUEST_URI}  !^/eg2/([a-z]{2}-[A-Z]{2})/
+RewriteRule ^/eg2/(.*) https://%{HTTP_HOST}/eg2/en-US/$1 [R=307,L]
 
 # en-US build
 # This is the only required configuration when only using the default locale.

diff --git a/Open-ILS/src/eg2/README.adoc b/Open-ILS/src/eg2/README.adoc
index d2ff274..3dc9b43 100644 (file)
--- a/Open-ILS/src/eg2/README.adoc
+++ b/Open-ILS/src/eg2/README.adoc
@@ -8,14 +8,9 @@ on a separate VM to avoid disruption.
 
 === Apache Configuration ===
 
-* Add the following to /etc/apache2/eg_vhost.conf
-
-[source,conf]
----------------------------------------------------------------------
-<Directory "/openils/var/web/eg2">
-    FallbackResource /eg2/index.html
-</Directory>
----------------------------------------------------------------------
+Update /etc/apache2/eg_vhost.conf following the changes at the
+bottom of Open-ILS/examples/apache_24/eg_vhost.conf.in, starting
+with "/eg2/ client setup"
 
 === Install Node v8
 

diff --git a/Open-ILS/src/eg2/package.json b/Open-ILS/src/eg2/package.json
index f43925c..b194c0f 100644 (file)
--- a/Open-ILS/src/eg2/package.json
+++ b/Open-ILS/src/eg2/package.json
@@ -63,7 +63,10 @@
     "i18nFormat": "xlf",
     "encoding": "UTF-8",
     "defaultLanguage": "en",
-    "languages": ["en", "fr-CA"],
+    "languages": [
+      "en",
+      "fr-CA"
+    ],
     "removeUnusedIds": true,
     "supportNgxTranslate": false,
     "ngxTranslateExtractionPattern": "@@|ngx-translate",