[open-ils-commits] [GIT] Evergreen ILS branch rel_2_9 updated. cffa81a5335563cd9adda91a372609037ed3791f

Evergreen Git git at git.evergreen-ils.org
Wed Feb 17 14:19:51 EST 2016 

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_9 has been updated
       via  cffa81a5335563cd9adda91a372609037ed3791f (commit)
       via  a0fcc135bb8ef39385e3e70999a25ebfd83001a7 (commit)
       via  706b8a073b979c78ff00f1753ffad4567e926629 (commit)
       via  51658b0ab61fd90fbd42ab8bcf11255e2d758f05 (commit)
       via  119b9320b54e4cb4dcca74f4fe863770d944d8e0 (commit)
       via  b004f1b0064c9809b7e4327b8bdcd78661ef3c46 (commit)
      from  338ff97d2667921d68831779fa2925ee52574ce9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cffa81a5335563cd9adda91a372609037ed3791f
Author: Ben Shum <ben at evergreener.net>
Date:   Wed Feb 17 13:39:22 2016 -0500

    LP#1544606: Copy the new directories we make for locales
    
    Make it cp -r to copy the directories and not just the files (of which
    there won't be any by default).
    
    Signed-off-by: Ben Shum <ben at evergreener.net>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>

diff --git a/Open-ILS/src/Makefile.am b/Open-ILS/src/Makefile.am
index 4e62684..6c4cf07 100644
--- a/Open-ILS/src/Makefile.am
+++ b/Open-ILS/src/Makefile.am
@@ -250,7 +250,7 @@ ilscore-install:
 	- at if test -d @srcdir@/data/locale; then \
 		$(MKDIR_P) $(DESTDIR)$(datadir)/locale/ && \
 		echo "Installing template data files to $(datadir)/locale/" && \
-		cp @srcdir@/data/locale/* $(datadir)/locale/ ;\
+		cp -r @srcdir@/data/locale/* $(datadir)/locale/ ;\
 	fi;
 	$(MKDIR_P) $(DESTDIR)$(datadir)/overdue/
 	sed -i 's|LOCALSTATEDIR|@localstatedir@|g' '$(DESTDIR)@sysconfdir@/oils_sip.xml.example'

commit a0fcc135bb8ef39385e3e70999a25ebfd83001a7
Author: Ben Shum <ben at evergreener.net>
Date:   Thu Feb 11 15:40:05 2016 -0500

    LP#1544606: Change i18n Makefile so that there are different dirs for opac vs webstaff
    
    In i18n Makefile, we only have a single directory variable TT2_DATA_DIR.
    
    Remove that variable, and add distinct variables for TT2_OPAC_DATA_DIR and
    TT2_WEBSTAFF_DATA_DIR that point to more distinct defined areas.
    
    Signed-off-by: Ben Shum <ben at evergreener.net>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>

diff --git a/build/i18n/Makefile b/build/i18n/Makefile
index 4370b97..41f8e2d 100644
--- a/build/i18n/Makefile
+++ b/build/i18n/Makefile
@@ -6,7 +6,8 @@ POTLIST=$(shell ls -d po/*)
 DTDDIR=../../Open-ILS/web/opac/locale
 CHROME_PROPSDIR=../../Open-ILS/xul/staff_client/chrome/locale
 SERVER_PROPSDIR=../../Open-ILS/xul/staff_client/server/locale
-TT2_DATA_DIR=../../Open-ILS/src/data/locale
+TT2_OPAC_DATA_DIR=../../Open-ILS/src/data/locale/opac
+TT2_WEBSTAFF_DATA_DIR=../../Open-ILS/src/data/locale/staff
 DOJO_LOCALE := $(shell echo ${LOCALE} | tr '[:upper:]' '[:lower:]')
 DOJO_ACQ_SRC=../../Open-ILS/web/js/dojo/openils/acq/nls
 DOJO_ACTOR_SRC=../../Open-ILS/web/js/dojo/openils/actor/nls
@@ -362,9 +363,10 @@ install: updatepo project fmidl2fmidlent fmidlpo2entity-en
 	cp $(PROJECT)/$(LOCALE)/Searcher.js $(DOJO_WIDGET_SRC)/$(DOJO_LOCALE)/Searcher.js
 	cp $(PROJECT)/$(LOCALE)/TranslatorPopup.js $(DOJO_WIDGET_SRC)/$(DOJO_LOCALE)/TranslatorPopup.js
 	cp $(PROJECT)/$(LOCALE)/XULTermLoader.js $(DOJO_WIDGET_SRC)/$(DOJO_LOCALE)/XULTermLoader.js
-	mkdir -p $(TT2_DATA_DIR)
-	cp $(PO)/tpac/$(LOCALE).po $(TT2_DATA_DIR)/.
-	cp $(PO)/webstaff/$(LOCALE).po $(TT2_DATA_DIR)/.
+	mkdir -p $(TT2_OPAC_DATA_DIR)
+	cp $(PO)/tpac/$(LOCALE).po $(TT2_OPAC_DATA_DIR)/.
+	mkdir -p $(TT2_WEBSTAFF_DATA_DIR)
+	cp $(PO)/webstaff/$(LOCALE).po $(TT2_WEBSTAFF_DATA_DIR)/.
 
 install_all_locales: newpot
 	for i in `ls po/*/*po|grep -v en-US | cut -f3 -d'/' | cut -f1 -d. | sort | uniq`; \

commit 706b8a073b979c78ff00f1753ffad4567e926629
Author: Ben Shum <ben at evergreener.net>
Date:   Thu Feb 11 14:54:49 2016 -0500

    LP#1544606: Change docs to more specific locale/opac location
    
    Signed-off-by: Ben Shum <ben at evergreener.net>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>

diff --git a/docs/admin_initial_setup/designing_your_catalog.txt b/docs/admin_initial_setup/designing_your_catalog.txt
index 0570560..81e5fec 100644
--- a/docs/admin_initial_setup/designing_your_catalog.txt
+++ b/docs/admin_initial_setup/designing_your_catalog.txt
@@ -267,7 +267,7 @@ and being set as the default locale:
 
 ----
 PerlAddVar OILSWebLocale "fr_ca"
-PerlAddVar OILSWebLocale "/openils/var/data/locale/fr-CA.po"
+PerlAddVar OILSWebLocale "/openils/var/data/locale/opac/fr-CA.po"
 PerlAddVar OILSWebDefaultLocale "fr-CA"
 ----
 
@@ -276,13 +276,13 @@ Below is a table of the currently supported languages packaged with Evergreen:
 [options="header"]
 |================================================================
 |Language| Code| PO file
-|Czech| cs_cz| /openils/var/data/locale/cs-CZ.po
-|English - Canada| en_ca| /openils/var/data/locale/en-CA.po
-|English - Great Britain| en_gb| /openils/var/data/locale/en-GB.po
+|Czech| cs_cz| /openils/var/data/locale/opac/cs-CZ.po
+|English - Canada| en_ca| /openils/var/data/locale/opac/en-CA.po
+|English - Great Britain| en_gb| /openils/var/data/locale/opac/en-GB.po
 |*English - United States| en_us| not applicable
-|French - Canada| fr_ca| /openils/var/data/locale/fr-CA.po
-|Portuguese - Brazil| pt_br| /openils/var/data/locale/pt_BR.po
-|Russian| ru_ru| /openils/var/data/locale/ru_RU.po
+|French - Canada| fr_ca| /openils/var/data/locale/opac/fr-CA.po
+|Portuguese - Brazil| pt_br| /openils/var/data/locale/opac/pt_BR.po
+|Russian| ru_ru| /openils/var/data/locale/opac/ru_RU.po
 |=================================================================
 *American English is built into Evergreen so you do not need to set up this
 language and there are no PO files. 
diff --git a/docs/opac/new_skin_customizations.txt b/docs/opac/new_skin_customizations.txt
index 638172c..ffe98ca 100644
--- a/docs/opac/new_skin_customizations.txt
+++ b/docs/opac/new_skin_customizations.txt
@@ -18,7 +18,7 @@ customizing TPAC behavior. These directives should generally live within a
 +
 ------------------------------------------------------------------------------
 PerlAddVar OILSWebLocale "fr_ca"
-PerlAddVar OILSWebLocale "/openils/var/data/locale/fr-CA.po"
+PerlAddVar OILSWebLocale "/openils/var/data/locale/opac/fr-CA.po"
 PerlAddVar OILSWebDefaultLocale "fr-CA"
 ------------------------------------------------------------------------------
 +

commit 51658b0ab61fd90fbd42ab8bcf11255e2d758f05
Author: Ben Shum <ben at evergreener.net>
Date:   Thu Feb 11 14:30:57 2016 -0500

    LP#1544606: Change apache examples for TPAC to more specific locale/opac location
    
    Signed-off-by: Ben Shum <ben at evergreener.net>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>

diff --git a/Open-ILS/examples/apache/eg_vhost.conf.in b/Open-ILS/examples/apache/eg_vhost.conf.in
index 7f8527a..5fc1ba3 100644
--- a/Open-ILS/examples/apache/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache/eg_vhost.conf.in
@@ -682,11 +682,11 @@ RewriteRule ^/openurl$ ${openurl:%1} [NE,PT]
     # select their preferred locale from a locale picker in the TPAC.
     #
     #PerlAddVar OILSWebLocale "en"
-    #PerlAddVar OILSWebLocale "@localstatedir@/data/locale/messages.en.po"
+    #PerlAddVar OILSWebLocale "@localstatedir@/data/locale/opac/messages.en.po"
     #PerlAddVar OILSWebLocale "en_ca"
-    #PerlAddVar OILSWebLocale "@localstatedir@/data/locale/en-CA.po"
+    #PerlAddVar OILSWebLocale "@localstatedir@/data/locale/opac/en-CA.po"
     #PerlAddVar OILSWebLocale "fr_ca"
-    #PerlAddVar OILSWebLocale "@localstatedir@/data/locale/fr-CA.po"
+    #PerlAddVar OILSWebLocale "@localstatedir@/data/locale/opac/fr-CA.po"
 
     # Set the default locale: defaults to en-US
     #PerlAddVar OILSWebDefaultLocale "fr_ca"
diff --git a/Open-ILS/examples/apache_24/eg_vhost.conf.in b/Open-ILS/examples/apache_24/eg_vhost.conf.in
index 7a152d4..0e04b3a 100644
--- a/Open-ILS/examples/apache_24/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache_24/eg_vhost.conf.in
@@ -681,11 +681,11 @@ RewriteRule ^/openurl$ ${openurl:%1} [NE,PT]
     # select their preferred locale from a locale picker in the TPAC.
     #
     #PerlAddVar OILSWebLocale "en"
-    #PerlAddVar OILSWebLocale "@localstatedir@/data/locale/messages.en.po"
+    #PerlAddVar OILSWebLocale "@localstatedir@/data/locale/opac/messages.en.po"
     #PerlAddVar OILSWebLocale "en_ca"
-    #PerlAddVar OILSWebLocale "@localstatedir@/data/locale/en-CA.po"
+    #PerlAddVar OILSWebLocale "@localstatedir@/data/locale/opac/en-CA.po"
     #PerlAddVar OILSWebLocale "fr_ca"
-    #PerlAddVar OILSWebLocale "@localstatedir@/data/locale/fr-CA.po"
+    #PerlAddVar OILSWebLocale "@localstatedir@/data/locale/opac/fr-CA.po"
 
     # Set the default locale: defaults to en-US
     #PerlAddVar OILSWebDefaultLocale "fr_ca"

commit 119b9320b54e4cb4dcca74f4fe863770d944d8e0
Author: Ben Shum <ben at evergreener.net>
Date:   Thu Feb 11 14:36:35 2016 -0500

    LP#1544606: Change static entry to variable in config example for locale/staff
    
    We were using a hardcoded entry for /openils/var here, but this should be a
    variable that is altered based on how users configure/build Evergreen.
    
    Signed-off-by: Ben Shum <ben at evergreener.net>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>

diff --git a/Open-ILS/examples/apache/eg_vhost.conf.in b/Open-ILS/examples/apache/eg_vhost.conf.in
index d1c8160..7f8527a 100644
--- a/Open-ILS/examples/apache/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache/eg_vhost.conf.in
@@ -822,9 +822,9 @@ RewriteRule ^/openurl$ ${openurl:%1} [NE,PT]
 
     # sample staff-specific translation files
     #PerlAddVar OILSWebLocale "en_ca"
-    #PerlAddVar OILSWebLocale "/openils/var/data/locale/staff/en-CA.po"
+    #PerlAddVar OILSWebLocale "@localstatedir@/data/locale/staff/en-CA.po"
     #PerlAddVar OILSWebLocale "fr_ca"
-    #PerlAddVar OILSWebLocale "/openils/var/data/locale/staff/fr-CA.po"
+    #PerlAddVar OILSWebLocale "@localstatedir@/data/locale/staff/fr-CA.po"
 </LocationMatch>
 
 <Location /js/>
diff --git a/Open-ILS/examples/apache_24/eg_vhost.conf.in b/Open-ILS/examples/apache_24/eg_vhost.conf.in
index cbec077..7a152d4 100644
--- a/Open-ILS/examples/apache_24/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache_24/eg_vhost.conf.in
@@ -828,9 +828,9 @@ RewriteRule ^/openurl$ ${openurl:%1} [NE,PT]
 
     # sample staff-specific translation files
     #PerlAddVar OILSWebLocale "en_ca"
-    #PerlAddVar OILSWebLocale "/openils/var/data/locale/staff/en-CA.po"
+    #PerlAddVar OILSWebLocale "@localstatedir@/data/locale/staff/en-CA.po"
     #PerlAddVar OILSWebLocale "fr_ca"
-    #PerlAddVar OILSWebLocale "/openils/var/data/locale/staff/fr-CA.po"
+    #PerlAddVar OILSWebLocale "@localstatedir@/data/locale/staff/fr-CA.po"
 </LocationMatch>
 
 <Location /js/>

commit b004f1b0064c9809b7e4327b8bdcd78661ef3c46
Author: Ben Shum <ben at evergreener.net>
Date:   Thu Feb 11 14:27:20 2016 -0500

    LP#1544606: Remove trailing whitespace from sample configs for locale/staff
    
    Signed-off-by: Ben Shum <ben at evergreener.net>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>

diff --git a/Open-ILS/examples/apache/eg_vhost.conf.in b/Open-ILS/examples/apache/eg_vhost.conf.in
index e64c2d7..d1c8160 100644
--- a/Open-ILS/examples/apache/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache/eg_vhost.conf.in
@@ -821,10 +821,10 @@ RewriteRule ^/openurl$ ${openurl:%1} [NE,PT]
     RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [NE,R,L]
 
     # sample staff-specific translation files
-    #PerlAddVar OILSWebLocale "en_ca"                                           
-    #PerlAddVar OILSWebLocale "/openils/var/data/locale/staff/en-CA.po"         
-    #PerlAddVar OILSWebLocale "fr_ca"                                           
-    #PerlAddVar OILSWebLocale "/openils/var/data/locale/staff/fr-CA.po"   
+    #PerlAddVar OILSWebLocale "en_ca"
+    #PerlAddVar OILSWebLocale "/openils/var/data/locale/staff/en-CA.po"
+    #PerlAddVar OILSWebLocale "fr_ca"
+    #PerlAddVar OILSWebLocale "/openils/var/data/locale/staff/fr-CA.po"
 </LocationMatch>
 
 <Location /js/>
diff --git a/Open-ILS/examples/apache_24/eg_vhost.conf.in b/Open-ILS/examples/apache_24/eg_vhost.conf.in
index 94d5c34..cbec077 100644
--- a/Open-ILS/examples/apache_24/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache_24/eg_vhost.conf.in
@@ -827,10 +827,10 @@ RewriteRule ^/openurl$ ${openurl:%1} [NE,PT]
     RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [NE,R,L]
 
     # sample staff-specific translation files
-    #PerlAddVar OILSWebLocale "en_ca"                                           
-    #PerlAddVar OILSWebLocale "/openils/var/data/locale/staff/en-CA.po"         
-    #PerlAddVar OILSWebLocale "fr_ca"                                           
-    #PerlAddVar OILSWebLocale "/openils/var/data/locale/staff/fr-CA.po"   
+    #PerlAddVar OILSWebLocale "en_ca"
+    #PerlAddVar OILSWebLocale "/openils/var/data/locale/staff/en-CA.po"
+    #PerlAddVar OILSWebLocale "fr_ca"
+    #PerlAddVar OILSWebLocale "/openils/var/data/locale/staff/fr-CA.po"
 </LocationMatch>
 
 <Location /js/>

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/examples/apache/eg_vhost.conf.in          |   14 +++++++-------
 Open-ILS/examples/apache_24/eg_vhost.conf.in       |   14 +++++++-------
 Open-ILS/src/Makefile.am                           |    2 +-
 build/i18n/Makefile                                |   10 ++++++----
 .../admin_initial_setup/designing_your_catalog.txt |   14 +++++++-------
 docs/opac/new_skin_customizations.txt              |    2 +-
 6 files changed, 29 insertions(+), 27 deletions(-)


hooks/post-receive
-- 
Evergreen ILS

More information about the open-ils-commits mailing list