From 320e5d99e45c6dddff2965fafb4992212f5ac45f Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Thu, 4 Jul 2013 08:33:25 +0300 Subject: [PATCH] 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 Signed-off-by: Galen Charlton --- Open-ILS/examples/apache/eg_vhost.conf.in | 7 +++++++ Open-ILS/examples/apache_24/eg_vhost.conf.in | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/Open-ILS/examples/apache/eg_vhost.conf.in b/Open-ILS/examples/apache/eg_vhost.conf.in index c692fd73c3..bf63947b68 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 # ---------------------------------------------------------------------------------- + + Options +Includes + XMLEntContentType "text/html; charset=utf-8" + AddOutputFilter INCLUDES;XMLENT .xhtml + AddOutputFilter INCLUDES;XMLENT .html + + 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 28b8c1790e..78fab7e548 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 # ---------------------------------------------------------------------------------- + + SSILegacyExprParser on + Options +Includes + XMLEntContentType "text/html; charset=utf-8" + AddOutputFilter INCLUDES;XMLENT .xhtml + AddOutputFilter INCLUDES;XMLENT .html + + SSILegacyExprParser on Options +Includes -- 2.43.2