Changeset 9423

Timestamp:

2005-03-15T13:49:07+13:00 (19 years ago)

Author:

kjdon

Message:

modified getTextSTring: if no dictionary is specified, now tries a collection specific one called collection.properties, located in teh resources directory of the collection

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/ServiceRack.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/ServiceRack.java

@@ -338 +338 @@
     
     /** getTextString - retrieves a language specific text string for the given
-key and locale, from the specified resource_bundle
+key and locale, from the specified resource_bundle (dictionary)
     */
     protected String getTextString(String key, String lang, String dictionary, String[] args) {
 
-    //String class_name = this.getClass().getName();
-    //class_name = class_name.substring(class_name.lastIndexOf('.')+1);
     if (dictionary != null) {
         // just try the one specified dictionary
@@ -354 +352 @@
     }
 
-    // else we try class names for dictionary names
+    // If no dictionary was specified, we try collection specific one, then
+    // dictionaries based on the class names
+    
+    // first we try a collection properties file
+    Dictionary dict = new Dictionary("collection", lang, new CollectionClassLoader(this.site_home, this.cluster_name));
+    String result = dict.get(key, args);
+    if (result != null) {
+        return result;
+    }
+    
+    // then we try class names for dictionary names
     String class_name = this.getClass().getName();
     class_name = class_name.substring(class_name.lastIndexOf('.')+1);
-    Dictionary dict = new Dictionary(class_name, lang);
-    String result = dict.get(key, args);
+    dict = new Dictionary(class_name, lang);
+    result = dict.get(key, args);
     if (result != null) {
         return result;
@@ -372 +380 @@
         break;
         }
-        dict = new Dictionary(class_name, lang);
+        dict = new Dictionary(class_name, lang, new CollectionClassLoader(this.site_home, this.cluster_name));
         result = dict.get(key, args);
         c = c.getSuperclass();