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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/ServiceRack.java

@@ -575 +575 @@
      * getTextString - retrieves a language specific text string for the given
      * key and locale, from the specified resource_bundle (dictionary)
+         * dictionary may be null, in which case it will use class names
      */
     protected String getTextString(String key, String lang, String dictionary, String[] args)
@@ -584 +585 @@
     protected String getMetadataNameText(String key, String lang)
     {
-
-        String properties_name = "metadata_names";
-        Dictionary dict = new Dictionary(properties_name, lang);
-
-        String result = dict.get(key);
-        if (result == null)
-        { // not found
-            return null;
-        }
-        return result;
+          return Dictionary.getTextString(key, lang, null, "metadata_names", null, null, this.class_loader);
     }
 }