diff options
| -rw-r--r-- | xslt/MacDive.xslt | 16 | ||||
| -rw-r--r-- | xslt/commonTemplates.xsl | 17 |
2 files changed, 17 insertions, 16 deletions
diff --git a/xslt/MacDive.xslt b/xslt/MacDive.xslt index 59b05c3fe..2f2c84c85 100644 --- a/xslt/MacDive.xslt +++ b/xslt/MacDive.xslt @@ -529,22 +529,6 @@ </xsl:template> <!-- end convert time --> - <!-- convert depth to meters --> - <xsl:template name="depthConvert"> - <xsl:param name="depth"/> - <xsl:param name="units"/> - - <xsl:choose> - <xsl:when test="$units = 'Imperial'"> - <xsl:value-of select="concat(format-number(($depth * 0.3048), '#.##'), ' m')"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="concat($depth, ' m')"/> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - <!-- end convert depth --> - <!-- convert weight to kg --> <xsl:template name="weightConvert"> <xsl:param name="weight"/> diff --git a/xslt/commonTemplates.xsl b/xslt/commonTemplates.xsl index 9f0423a11..c3709e003 100644 --- a/xslt/commonTemplates.xsl +++ b/xslt/commonTemplates.xsl @@ -168,6 +168,23 @@ <xsl:value-of select="concat(floor($depth div 1000), '.', format-number($depth mod 1000, '00'))"/> </xsl:template> + <!-- convert depth to meters --> + <xsl:template name="depthConvert"> + <xsl:param name="depth"/> + <xsl:param name="units"/> + + <xsl:choose> + <xsl:when test="$units = 'Imperial'"> + <xsl:value-of select="concat(format-number(($depth * 0.3048), '#.##'), ' m')"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="concat($depth, ' m')"/> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + <!-- end convert depth --> + + <!-- Convert date format "Sun Jan 19 11:02:56 2014 UTC" => 2014-1-19 11:02 --> <xsl:template name="convertDate"> |