Changeset 36592 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/DisplayItemUtil.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/DisplayItemUtil.java (modified) (2 diffs)

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

@@ -85 +85 @@
     if (best_di != null) {
         // look up the dictionary
-        String value = getTextString(best_di.getAttribute(GSXML.KEY_ATT), lang, best_di.getAttribute(GSXML.DICTIONARY_ATT), class_loader);
+          String value = Dictionary.createDictionaryAndGetString(best_di.getAttribute(GSXML.DICTIONARY_ATT), class_loader, best_di.getAttribute(GSXML.KEY_ATT), lang, null);
         if (value != null) {
         // copy the node now. Don't want to be modifying the underlying list as can lead to concurrent access problems.
@@ -127 +127 @@
   }
 
-  protected static String getTextString(String key, String lang, String dictionary, ClassLoader class_loader) {
-    return getTextString(key, lang, dictionary, null, class_loader);
-  }
-
-  protected static String getTextString(String key, String lang, String dictionary, String[] args, ClassLoader class_loader)
-  {
-    Dictionary dict;
-    if (class_loader != null) {
-      dict = new Dictionary(dictionary, lang, class_loader);
-    } else {
-      dict = new Dictionary(dictionary, lang);
-    }
-    String result = dict.get(key, args);
-    return result;
-  }
-  
 
 }