From 7251b8ae22dba8191f1df3c39bde3999f6e19d9b Mon Sep 17 00:00:00 2001 From: dbs Date: Thu, 19 Mar 2009 06:08:02 +0000 Subject: [PATCH] Backport r12600 from trunk for localized org tree support git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_4@12602 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/examples/apache/eg_vhost.conf | 7 ++++++- Open-ILS/web/opac/extras/bbags.xml | 4 ++-- Open-ILS/web/reports/oils_rpt_common.xhtml | 2 +- Open-ILS/web/reports/xul/template_builder.xul | 4 ++-- .../staff_client/chrome/content/OpenILS/util_overlay_chrome.xul | 2 +- Open-ILS/xul/staff_client/chrome/content/main/constants.js | 2 +- Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul | 2 +- Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml | 2 +- Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml | 2 +- Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml | 2 +- Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml | 2 +- .../xul/staff_client/server/admin/hold_pull_list_classic.xhtml | 2 +- Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml | 2 +- Open-ILS/xul/staff_client/server/admin/printer_settings.html | 2 +- Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml | 2 +- Open-ILS/xul/staff_client/server/main/ws_info.xul | 2 +- Open-ILS/xul/staff_client/server/patron/ue.xhtml | 2 +- Open-ILS/xul/staff_client/server/patron/user_edit.xhtml | 2 +- 18 files changed, 25 insertions(+), 20 deletions(-) diff --git a/Open-ILS/examples/apache/eg_vhost.conf b/Open-ILS/examples/apache/eg_vhost.conf index 47e7012c74..6cdc44ec0b 100644 --- a/Open-ILS/examples/apache/eg_vhost.conf +++ b/Open-ILS/examples/apache/eg_vhost.conf @@ -91,6 +91,10 @@ RewriteRule - - [E=locale:%1] [L] + # Force to en-US for now to satisfy bbags.xml + SetEnv locale en-US + Options +Includes + AddOutputFilter INCLUDES .xml AddType application/xhtml+xml .xml @@ -121,7 +125,7 @@ RewriteCond %{ENV:locale} ^$ [OR] RewriteCond %{ENV:locale} ^en$ RewriteRule - - [E=locale:en-US] [L] - + Options +Includes XMLEntEscapeScript "no" XMLEntStripComments "yes" @@ -129,6 +133,7 @@ RewriteRule - - [E=locale:en-US] [L] XMLEntStripDoctype "yes" XMLEntContentType "text/html; charset=utf-8" AddOutputFilter INCLUDES;XMLENT .xhtml + AddOutputFilter INCLUDES;XMLENT .html allow from all diff --git a/Open-ILS/web/opac/extras/bbags.xml b/Open-ILS/web/opac/extras/bbags.xml index e701f29011..9e7ebe3ad8 100644 --- a/Open-ILS/web/opac/extras/bbags.xml +++ b/Open-ILS/web/opac/extras/bbags.xml @@ -1,4 +1,4 @@ - + - + diff --git a/Open-ILS/web/reports/oils_rpt_common.xhtml b/Open-ILS/web/reports/oils_rpt_common.xhtml index 3f3c825876..9666f1f156 100644 --- a/Open-ILS/web/reports/oils_rpt_common.xhtml +++ b/Open-ILS/web/reports/oils_rpt_common.xhtml @@ -29,7 +29,7 @@ - + diff --git a/Open-ILS/web/reports/xul/template_builder.xul b/Open-ILS/web/reports/xul/template_builder.xul index 0e771ee78a..39bcfe2e91 100644 --- a/Open-ILS/web/reports/xul/template_builder.xul +++ b/Open-ILS/web/reports/xul/template_builder.xul @@ -1,4 +1,4 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml b/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml index fb1fa07c60..7b71133063 100644 --- a/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml +++ b/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml @@ -20,7 +20,7 @@ - + diff --git a/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml b/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml index 72906c90ff..c6cb676c58 100644 --- a/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml +++ b/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml @@ -20,7 +20,7 @@ - + diff --git a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml index 540e44d84e..78f81afc91 100644 --- a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml +++ b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml @@ -22,7 +22,7 @@ - + diff --git a/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml b/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml index 48fd2d3009..3e76c1fde6 100644 --- a/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml +++ b/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml @@ -21,7 +21,7 @@ - + diff --git a/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml b/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml index c2e07dabe1..15bf4c8b07 100644 --- a/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml +++ b/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml @@ -20,7 +20,7 @@ - + diff --git a/Open-ILS/xul/staff_client/server/admin/printer_settings.html b/Open-ILS/xul/staff_client/server/admin/printer_settings.html index c64694cab9..e9a2b02268 100644 --- a/Open-ILS/xul/staff_client/server/admin/printer_settings.html +++ b/Open-ILS/xul/staff_client/server/admin/printer_settings.html @@ -7,7 +7,7 @@ - + diff --git a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml index 92461ec18b..bfa76d69d1 100644 --- a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml +++ b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml @@ -20,7 +20,7 @@ - + diff --git a/Open-ILS/xul/staff_client/server/main/ws_info.xul b/Open-ILS/xul/staff_client/server/main/ws_info.xul index 88e31f0fe2..4cffbde4ff 100644 --- a/Open-ILS/xul/staff_client/server/main/ws_info.xul +++ b/Open-ILS/xul/staff_client/server/main/ws_info.xul @@ -34,7 +34,7 @@ - - + diff --git a/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml b/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml index 14de9b8d4c..06975e00c7 100644 --- a/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml +++ b/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml @@ -20,7 +20,7 @@ - + -- 2.11.0