Changeset 33215

Show
Ignore:
Timestamp:
24.06.2019 14:31:32 (4 weeks ago)
Author:
kjdon
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XSLTUtil.java

    r32995 r33215  
    249249        } 
    250250 
    251         if (result == null && !interface_name.equals("default")) 
     251        if (result == null && !interface_name.startsWith("default")) 
    252252        { // not found, try the default interface 
    253             dict = new Dictionary("interface_default", lang); 
    254             result = dict.get(key, args); 
    255         } 
    256  
     253          if (interface_name.endsWith("2")) { // hack for interface_xxx2.properties 
     254            dict = new Dictionary("interface_default2", lang); 
     255          } else { 
     256            dict = new Dictionary("interface_default", lang); 
     257 
     258          } 
     259          result = dict.get(key, args); 
     260        } 
     261         
    257262        if (result == null) 
    258263        { // not found