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

Timestamp:

2022-09-08T11:08:46+12:00 (20 months ago)

Author:

kjdon

Message:

modified Dictionary, so that if a lang fragment starts with [PENDING], then don't use it. This is to allow the addition of old strings which will help the translators, but which are too out of date to display in the interface. OTher classes use of Dictionary modified so that they go through getTextString, or createDictionaryAndGetString, thereby benifitting from the pending stuff

File:

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

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

@@ -257 +257 @@
 
         // try the specified dictionary first
-        Dictionary dict = new Dictionary(dictionary_name, lang, my_loader);
-        String result = dict.get(key, args);
+                String result = Dictionary.createDictionaryAndGetString(dictionary_name, my_loader, key, lang, args);
         if (result == null) {
           // fall back to a general interface text search
@@ -300 +299 @@
     // now we allow looking for files in the interface's resources folder
     CustomClassLoader my_loader = new CustomClassLoader(XSLTUtil.class.getClassLoader(), GSFile.interfaceResourceDir(GlobalProperties.getGSDL3Home(), interface_name));
-    Dictionary dict = new Dictionary("interface_" + interface_name, lang, my_loader);
-    
-    String result = dict.get(key, args);
+    String result = Dictionary.createDictionaryAndGetString("interface_"+interface_name, my_loader, key, lang, args);
     if (result == null)
       {  
     //if not found, search a separate subdirectory named by the interface name. this is used for eg the flax interface. this could be replaced by new class loader option?
     String sep_interface_dir = interface_name + File.separatorChar + lang + File.separatorChar + "interface";
-    dict = new Dictionary(sep_interface_dir, lang);
-    result = dict.get(key, args);
+        result = Dictionary.createDictionaryAndGetString(sep_interface_dir, my_loader, key, lang, args);
     if (result != null)
       {
@@ -317 +313 @@
     if (result == null && !interface_name.startsWith("default")) {
       // not found, try the default interface
+      String dictionary_name;
       if (interface_name.endsWith("2")) { // hack for interface_xxx2.properties
-    dict = new Dictionary("interface_default2", lang);
+    dictionary_name = "interface_default2";
       } else {
-    dict = new Dictionary("interface_default", lang);
-    
+    dictionary_name = "interface_default";
       }
-      result = dict.get(key, args);
+      result = Dictionary.createDictionaryAndGetString(dictionary_name, my_loader, key, lang, args);
     }
         
@@ -409 +405 @@
 
             CustomClassLoader class_loader = new CustomClassLoader(XSLTUtil.class.getClassLoader(), GSFile.collectionResourceDir(GSFile.siteHome(GlobalProperties.getGSDL3Home(), site_name), collection));
-            Dictionary dict = new Dictionary("interface_custom", lang, class_loader);
-            String result = dict.get(key, args);
+            String result = Dictionary.createDictionaryAndGetString("interface_custom", class_loader, key, lang, args); 
             if (result != null)
             {
@@ -437 +432 @@
   public static String getGenericTextWithArgs(String dictionary_name, String lang, String key, String[] args)
   {
-    Dictionary dict = new Dictionary(dictionary_name, lang);
-    String result = dict.get(key, args);
+    String result = Dictionary.createDictionaryAndGetString(dictionary_name, null, key, lang, args);
     if (result == null) {
       return "_"+dictionary_name+"_"+key+"_";