Changeset 33215 for main/trunk

Timestamp:

2019-06-24T14:31:32+12:00 (5 years ago)

Author:

kjdon

Message:

in asking for something from eg heritage2 interface file, need to look in default2 not default interface properties file

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XSLTUtil.java (modified) (1 diff)

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

@@ -249 +249 @@
         }
 
-        if (result == null && !interface_name.equals("default"))
+        if (result == null && !interface_name.startsWith("default"))
         { // not found, try the default interface
-            dict = new Dictionary("interface_default", lang);
-            result = dict.get(key, args);
-        }
-
+          if (interface_name.endsWith("2")) { // hack for interface_xxx2.properties
+            dict = new Dictionary("interface_default2", lang);
+          } else {
+            dict = new Dictionary("interface_default", lang);
+
+          }
+          result = dict.get(key, args);
+        }
+        
         if (result == null)
         { // not found