Changeset 14397 for greenstone3/trunk/src

Timestamp:

2007-09-03T13:09:22+12:00 (17 years ago)

Author:

xiao

Message:

modify the method getInterfaceText so that if a interface text string is not found in the dir classes/, try a subdirectory named by the site name.

File:

• greenstone3/trunk/src/java/org/greenstone/gsdl3/util/XSLTUtil.java (modified) (3 diffs)

greenstone3/trunk/src/java/org/greenstone/gsdl3/util/XSLTUtil.java

@@ -3 +3 @@
 import java.util.Date;
 import java.util.Locale;
+import java.util.MissingResourceException;
+import java.io.File;
 import java.text.SimpleDateFormat;
 
@@ -94 +96 @@
     }
     Dictionary dict = new Dictionary("interface_"+interface_name, lang);
-        String result = dict.get(key, args);
+    String result = dict.get(key, args);
+    if (result == null) { // not found
+        //if not found, search a separate subdirectory named by the interface name
+        String sep_interface_dir = interface_name + File.separatorChar + lang + File.separatorChar + "interface"; 
+        dict = new Dictionary(sep_interface_dir, lang);
+        result = dict.get(key, args);
+        if(result != null) {
+            return result;
+        }   
+     }
 
     if (result == null && !interface_name.equals("default")) { // not found, try the default interface
@@ -102 +113 @@
         
         if (result == null) { // not found
-            return "_"+key+"_";
+                return "_"+key+"_";
         }
         return result;