Convert z39.50 client over to common.properties strings from lang.js

git-svn-id: svn://svn.open-ils.org/ILS/trunk@8525 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 86bced1..5c13238 100644 (file)
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -1190,27 +1190,6 @@
 <!ENTITY staff.volume.wizard.page4 "Entering Copy-Level Attribute Defaults">
 <!ENTITY staff.volume.wizard.title "Batch Add Volumes/Copies Wizard">
 <!ENTITY staff.xuleditor_label "XUL TEST">
-<!ENTITY staff.z39_50.search_class.author "Author">
-<!ENTITY staff.z39_50.search_class.isbn "ISBN">
-<!ENTITY staff.z39_50.search_class.issn "ISSN">
-<!ENTITY staff.z39_50.search_class.item_type "Item Type">
-<!ENTITY staff.z39_50.search_class.item_type.all "All Formats"> 
-<!ENTITY staff.z39_50.search_class.item_type.art "Papers/Articles"> 
-<!ENTITY staff.z39_50.search_class.item_type.bks "Books"> 
-<!ENTITY staff.z39_50.search_class.item_type.com "Computer files"> 
-<!ENTITY staff.z39_50.search_class.item_type.map "Maps"> 
-<!ENTITY staff.z39_50.search_class.item_type.mix "Mixed material"> 
-<!ENTITY staff.z39_50.search_class.item_type.rec "Sound recordings"> 
-<!ENTITY staff.z39_50.search_class.item_type.sco "Musical scores"> 
-<!ENTITY staff.z39_50.search_class.item_type.ser "Serials"> 
-<!ENTITY staff.z39_50.search_class.item_type.url "Internet Resources"> 
-<!ENTITY staff.z39_50.search_class.item_type.vis "Visual materials"> 
-<!ENTITY staff.z39_50.search_class.lccn "LCCN">
-<!ENTITY staff.z39_50.search_class.pubdate "PubDate">
-<!ENTITY staff.z39_50.search_class.publisher "Publisher">
-<!ENTITY staff.z39_50.search_class.tcn "Accession #">
-<!ENTITY staff.z39_50.search_class.title "Title">
-<!ENTITY staff.z39_50_import_interface_label "Z39.50 IMPORT">
 <!ENTITY staff.server.admin.offline.xacts.caption "Offline Sessions">
 <!ENTITY staff.server.admin.offline.xacts.refresh.accesskey "R">
 <!ENTITY staff.server.admin.offline.xacts.create.label "Create">

diff --git a/Open-ILS/xul/staff_client/server/cat/z3950.js b/Open-ILS/xul/staff_client/server/cat/z3950.js
index edaaa41..c4790dc 100644 (file)
--- a/Open-ILS/xul/staff_client/server/cat/z3950.js
+++ b/Open-ILS/xul/staff_client/server/cat/z3950.js
@@ -206,8 +206,8 @@ cat.z3950.prototype = {
                                                         }
                                                         if (attr.label) {
                                                             attrs[i].labels[ attr.label ] = true;
-                                                        } else if (entities['staff.z39_50.search_class.'+i]) {
-                                                            attrs[i].labels[ entities['staff.z39_50.search_class.'+i] ] = true;
+                                                        } else if (document.getElementById('commonStrings').getString('staff.z39_50.search_class.' + i)) {
+                                                            attrs[i].labels[ document.getElementById('commonStrings').getString('staff.z39_50.search_class.' + i) ] = true;
                                                         } else if (attr.name) {
                                                             attrs[i].labels[ attr.name ] = true;
                                                         } else {

diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/common.properties b/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
index dbfcd0d..53d297d 100644 (file)
--- a/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
@@ -62,3 +62,24 @@ staff.au_label_family_name=Family Name
 staff.au_label_first_given_name=First Name
 staff.au_label_second_given_name=Middle Name
 staff.au_label_suffix=Suffix
+staff.z39_50.search_class.author=Author
+staff.z39_50.search_class.isbn=ISBN
+staff.z39_50.search_class.issn=ISSN
+staff.z39_50.search_class.item_type=Item Type
+staff.z39_50.search_class.item_type.all=All Formats
+staff.z39_50.search_class.item_type.art=Papers/Articles
+staff.z39_50.search_class.item_type.bks=Books
+staff.z39_50.search_class.item_type.com=Computer files
+staff.z39_50.search_class.item_type.map=Maps
+staff.z39_50.search_class.item_type.mix=Mixed material
+staff.z39_50.search_class.item_type.rec=Sound recordings
+staff.z39_50.search_class.item_type.sco=Musical scores
+staff.z39_50.search_class.item_type.ser=Serials
+staff.z39_50.search_class.item_type.url=Internet Resources
+staff.z39_50.search_class.item_type.vis=Visual materials
+staff.z39_50.search_class.lccn=LCCN
+staff.z39_50.search_class.pubdate=PubDate
+staff.z39_50.search_class.publisher=Publisher
+staff.z39_50.search_class.tcn=Accession #
+staff.z39_50.search_class.title=Title
+staff.z39_50_import_interface_label=Z39.50 IMPORT