From 1ff540fff357b6299acd569eac44e8415bc9d140 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 8 Aug 2018 12:00:09 -0400 Subject: [PATCH] LP#1775466 Apache/doc updates for locale changes Signed-off-by: Bill Erickson --- Open-ILS/examples/apache/eg_vhost.conf.in | 6 +++--- Open-ILS/examples/apache_24/eg_vhost.conf.in | 6 +++--- Open-ILS/src/eg2/README.adoc | 11 +++-------- Open-ILS/src/eg2/package.json | 5 ++++- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/Open-ILS/examples/apache/eg_vhost.conf.in b/Open-ILS/examples/apache/eg_vhost.conf.in index 2720867382..f32e6fc9a7 100644 --- 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 b8b3acf880..cfeb27ed34 100644 --- 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 d2ff274bd1..3dc9b43890 100644 --- 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] ---------------------------------------------------------------------- - - FallbackResource /eg2/index.html - ---------------------------------------------------------------------- +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 f43925c835..b194c0ff69 100644 --- 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", -- 2.11.0