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

[Evergreen Git]

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  fc2487ee459765c679ac0c976aa83737c2a986ed (commit)
      from  3f603b9f41945dc43ba36da350145b0da324258e (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 fc2487ee459765c679ac0c976aa83737c2a986ed
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date:   Thu Jul 4 08:33:25 2013 +0300

    LP#1092018: Make the reports UI use UTF-8.
    
    To test:
    
    [1] Install the translation for a language that uses
        non-Latin-1 characters, such as Russian.
    [2] Start the XUL staff client and open the reports
        interface.  Note that labels are mangled.
    [3] Apply the Apache configuration changes in this patch,
        reload Apache, clear cache in the staff client, and
        reload the reports UI. The labels should now be
        displayed correctly.
    
    Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/Open-ILS/examples/apache/eg_vhost.conf.in b/Open-ILS/examples/apache/eg_vhost.conf.in
index c692fd7..bf63947 100644
--- a/Open-ILS/examples/apache/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache/eg_vhost.conf.in
@@ -532,6 +532,13 @@ RewriteRule .? - [E=locale:%{HTTP:Accept-Language}]
 # ----------------------------------------------------------------------------------
 # Reports GUI
 # ----------------------------------------------------------------------------------
+<LocationMatch /reports.*\.x?html>
+    Options +Includes
+    XMLEntContentType "text/html; charset=utf-8"
+    AddOutputFilter INCLUDES;XMLENT .xhtml
+    AddOutputFilter INCLUDES;XMLENT .html
+</LocationMatch>
+
 <LocationMatch /reports>
     Options +Includes
     AddOutputFilter INCLUDES;XMLENT .xhtml
diff --git a/Open-ILS/examples/apache_24/eg_vhost.conf.in b/Open-ILS/examples/apache_24/eg_vhost.conf.in
index 28b8c17..78fab7e 100644
--- a/Open-ILS/examples/apache_24/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache_24/eg_vhost.conf.in
@@ -530,6 +530,14 @@ RewriteRule .? - [E=locale:%{HTTP:Accept-Language}]
 # ----------------------------------------------------------------------------------
 # Reports GUI
 # ----------------------------------------------------------------------------------
+<LocationMatch /reports.*\.x?html>
+    SSILegacyExprParser on
+    Options +Includes
+    XMLEntContentType "text/html; charset=utf-8"
+    AddOutputFilter INCLUDES;XMLENT .xhtml
+    AddOutputFilter INCLUDES;XMLENT .html
+</LocationMatch>
+
 <LocationMatch /reports>
     SSILegacyExprParser on
     Options +Includes

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

Summary of changes:
 Open-ILS/examples/apache/eg_vhost.conf.in    |    7 +++++++
 Open-ILS/examples/apache_24/eg_vhost.conf.in |    8 ++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS