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

Timestamp:

2022-01-13T14:56:08+13:00 (2 years ago)

Author:

cstephen

Message:

Fix lang retrieval in XSLTUtil#getInterfaceStringsAsJavascript when a key is not nested

File:

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

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

@@ -822 +822 @@
     }
 
+    /**
+     * Generates a Javascript object graph to store language strings. Leaf nodes are the key, and their value the string.
+     * Further preceding nodes denote the prefix of the string within the language strings property file.
+     * Accessing a language string from the object graph can be done as such: 'const myString = gs.text.{prefix}.{key};'
+     * @param interfaceName The name of the interface to retrieve language strings for.
+     * @param lang The language to retrieve.
+     * @param prefix The prefix to to retrieve strings under. E.g. a value of 'atea.macroniser' will only retrieve strings prefixed with that value.
+     * @return Stringified Javascript code that will generate the language string object graph.
+     */
     public static String getInterfaceStringsAsJavascript(String interfaceName, String lang, String prefix)
     {
@@ -873 +882 @@
                 if (key.startsWith(prefix))
                 {
-                    // Builds the JS object structure we need to access the key.
-                    // Also has the side effect of ensuring that any '.' characters in
-                    // the key are valid once parsed by the JS engine.
-                    buildJSObjectGraph(
-                        outputStr,
-                        prependToPrefix + "." + key.substring(0, key.lastIndexOf(".")), // Strip the actual key from the path
-                        initialisedNodes
-                    );
+                    int lastDotIndex = key.lastIndexOf(".");
+                    // If this is true, the key is nested under nodes that we might have to construct
+                    if (lastDotIndex > 0) {
+                        // Builds the JS object structure we need to access the key.
+                        // Also has the side effect of ensuring that any '.' characters in
+                        // the key are valid once parsed by the JS engine.
+                        buildJSObjectGraph(
+                            outputStr,
+                            prependToPrefix + "." + key.substring(0, lastDotIndex), // Strip the actual key from the path
+                            initialisedNodes
+                        );
+                    }
 
                     // get the language dependent value for the key. This will return the english if no value found for the given lang