Changed the label- from-key FTL template to fix expression evaluation…

… issues

src/main/resources/templates/xsl_markup/label_from_key.ftl

@@ -3,9 +3,10 @@
     - key: The key to use for rendering
 	- quantity: If pluralisation is required, then this contains the suffix that identifies the plural form of the label.
 -->
+<xsl:variable name="key" select="${key}"/>
 <#if quantity?has_content>
-    <xsl:variable name="plural" select="concat(${key}, ted:plural-label-suffix(${quantity}))"/>
-    <span class="label"><xsl:value-of select="($labels//entry[@key=$plural]/text(), $labels//entry[@key=${key}}]/text(), concat('{', ${key}, '}'))[1]"/></span>
+    <xsl:variable name="plural" select="concat($key, ted:plural-label-suffix(${quantity}))"/>
+    <span class="label"><xsl:value-of select="($labels//entry[@key=$plural]/text(), $labels//entry[@key=$key}]/text(), concat('{', $key, '}'))[1]"/></span>
 <#else>
-    <span class="label"><xsl:value-of select="($labels//entry[@key=${key}]/text(), concat('{', ${key}, '}'))[1]"/></span>
+    <span class="label"><xsl:value-of select="($labels//entry[@key=$key]/text(), concat('{', $key, '}'))[1]"/></span>
 </#if>