Changeset 32470 for main

Timestamp:

2018-09-18T13:38:11+12:00 (6 years ago)

Author:

kjdon

Message:

de string keys can't have extra . in them - breaks javascript later

Location:

main/trunk/greenstone3/web

Files:

• WEB-INF/classes/interface_default.properties (modified) (1 diff)
• interfaces/default/transform/layouts/header.xsl (modified) (1 diff)

main/trunk/greenstone3/web/WEB-INF/classes/interface_default.properties

@@ -179 +179 @@
 #####################
 de.error=Editing unavailable...
-de.error.unavailable=Document editing is unavailable at this time. Maybe the archives folder is not present.
-de.error.wrong_group=You are not a member of the right group to have edit permission for this collection. 
-de.error.contact_admin=Please contact your library administrator ({0}).
+de.error_unavailable=Document editing is unavailable at this time. Maybe the archives folder is not present.
+de.error_wrong_group=You are not a member of the right group to have edit permission for this collection. 
+de.error_contact_admin=Please contact your library administrator ({0}).
 de.rebuilding_collection=rebuilding collection
 de.no_changes=No changes detected

main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.xsl

@@ -413 +413 @@
     });
     });
-    </xsl:text></xsl:when><xsl:otherwise><xsl:variable name="reason"><xsl:choose><xsl:when test="$isEditingAvailable != '1'"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'de.error.unavailable')"/></xsl:when><xsl:when test="$userHasEditPermission != '1'"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'de.error.wrong_group')"/></xsl:when></xsl:choose><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'de.error.contact_admin', $siteAdmin)"/></xsl:variable><xsl:text disable-output-escaping="yes">
+    </xsl:text></xsl:when><xsl:otherwise><xsl:variable name="reason"><xsl:choose><xsl:when test="$isEditingAvailable != '1'"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'de.error_unavailable')"/></xsl:when><xsl:when test="$userHasEditPermission != '1'"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'de.error_wrong_group')"/></xsl:when></xsl:choose><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'de.error_contact_admin', $siteAdmin)"/></xsl:variable><xsl:text disable-output-escaping="yes">
     .html("</xsl:text><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'de.error')"/><xsl:text disable-output-escaping='yes'>")
     .click(function()