From c711c956bc9491c7972f98359e5bd7fdfc96a997 Mon Sep 17 00:00:00 2001 From: miker Date: Tue, 7 Aug 2007 15:24:38 +0000 Subject: [PATCH] Re-application of the main/ i18n patch from Dan Scott git-svn-id: svn://svn.open-ils.org/ILS/trunk@7627 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/examples/apache/eg_vhost.conf | 3 + Open-ILS/web/opac/locale/en-US/lang.dtd | 158 ++++++++++++++++++--- .../xul/staff_client/chrome/content/main/main.xul | 38 ++--- .../chrome/content/main/menu_frame_menus.xul | 116 +++++++-------- .../chrome/content/main/simple_auth.xul | 14 +- .../xul/staff_client/chrome/content/main/test.xul | 5 +- 6 files changed, 232 insertions(+), 102 deletions(-) diff --git a/Open-ILS/examples/apache/eg_vhost.conf b/Open-ILS/examples/apache/eg_vhost.conf index 66cf5910ea..8a47ef059c 100644 --- a/Open-ILS/examples/apache/eg_vhost.conf +++ b/Open-ILS/examples/apache/eg_vhost.conf @@ -105,6 +105,9 @@ RewriteRule /opac/extras/jacket/large/(.*) \ XMLEntContentType "application/vnd.mozilla.xul+xml" AddOutputFilter INCLUDES;XMLENT .xul allow from all + + # We only support one locale (en-US) for the time being + SetEnv locale=en-US # ---------------------------------------------------------------------------------- diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd index cf589c7d71..530286cb97 100644 --- a/Open-ILS/web/opac/locale/en-US/lang.dtd +++ b/Open-ILS/web/opac/locale/en-US/lang.dtd @@ -17,6 +17,7 @@ + @@ -30,7 +31,10 @@ - + + + + @@ -121,10 +125,12 @@ + + @@ -408,10 +414,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,29 +484,54 @@ - + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + @@ -450,20 +540,33 @@ + + + + + + + + + + + + + @@ -493,8 +596,10 @@ + + @@ -509,13 +614,33 @@ + + + + + + + + + + + + + + + + + + + + @@ -940,25 +1065,24 @@ - - - - - - + - - - - - + + + + - - + + + + + + + diff --git a/Open-ILS/xul/staff_client/chrome/content/main/main.xul b/Open-ILS/xul/staff_client/chrome/content/main/main.xul index b316fddbb8..13cac9b070 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/main.xul +++ b/Open-ILS/xul/staff_client/chrome/content/main/main.xul @@ -79,7 +79,7 @@ - +