From 2dbf2b7d984865320aae63c78c9b450b4014411c Mon Sep 17 00:00:00 2001 From: miker Date: Wed, 1 Aug 2007 13:56:56 +0000 Subject: [PATCH] Patch from Dan Scott to entity-ize a chunk of the Staff Client interfaces: Taking this one step at a time, I'll move the remaining hard-coded strings from main/*.xul into lang.dtd. I've also followed the same ${locale} approach for the remote XUL files rather than having the en-US hard-coded into the XUL files themselves -- although at the moment we don't really have a good way of serving up a different locale anyways. Accordingly, I've included a modification to eg_vhost.conf. lang.dtd is getting very big. To try to make it a bit easier to work with, I've sorted the bulk of the UI entity definitions as seemed to be the general intent (a few had fallen out of order) so the diffs in this patch are a little more than absolutely necessary; sorry about that. git-svn-id: svn://svn.open-ils.org/ILS/trunk@7615 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 @@ - +