mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Fix import when locale set to decimal comma
This should take care of locale caused problems when the input uses decimal point but locale uses decimal comma. Also the sample I have of Suunto DM3 format weight is represented with comma instead of dot so converting that as well. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
2120bc3a9e
commit
a9cc7f9b10
4 changed files with 9 additions and 9 deletions
|
@ -97,7 +97,7 @@
|
|||
<xsl:value-of select="Tanksize"/>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<xsl:value-of select="Tanksize * 2"/>
|
||||
<xsl:value-of select="format-number(Tanksize * 2, '#.##')"/>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:attribute>
|
||||
|
|
|
@ -395,7 +395,7 @@
|
|||
|
||||
<xsl:choose>
|
||||
<xsl:when test="$units = 'Imperial'">
|
||||
<xsl:value-of select="concat(($number div 14.5037738007), ' bar')"/>
|
||||
<xsl:value-of select="concat(format-number(($number div 14.5037738007), '#.##'), ' bar')"/>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<xsl:value-of select="concat($number, ' bar')"/>
|
||||
|
@ -412,13 +412,13 @@
|
|||
<xsl:param name="units"/>
|
||||
|
||||
<xsl:variable name="size">
|
||||
<xsl:value-of select="$singleSize + $singleSize * $double"/>
|
||||
<xsl:value-of select="format-number($singleSize + $singleSize * $double, '#.##')"/>
|
||||
</xsl:variable>
|
||||
|
||||
<xsl:choose>
|
||||
<xsl:when test="$units = 'Imperial'">
|
||||
<xsl:if test="$pressure != '0'">
|
||||
<xsl:value-of select="concat((($size * 14.7 div $pressure) div 0.035315), ' l')"/>
|
||||
<xsl:value-of select="concat(format-number((($size * 14.7 div $pressure) div 0.035315), '#.##'), ' l')"/>
|
||||
</xsl:if>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
|
@ -462,7 +462,7 @@
|
|||
|
||||
<xsl:choose>
|
||||
<xsl:when test="$units = 'Imperial'">
|
||||
<xsl:value-of select="concat(($depth * 0.3048), ' m')"/>
|
||||
<xsl:value-of select="concat(format-number(($depth * 0.3048), '#.##'), ' m')"/>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<xsl:value-of select="concat($depth, ' m')"/>
|
||||
|
@ -480,7 +480,7 @@
|
|||
<xsl:when test="$weight > 0">
|
||||
<xsl:choose>
|
||||
<xsl:when test="$units = 'Imperial'">
|
||||
<xsl:value-of select="concat(($weight * 0.453592), ' kg')"/>
|
||||
<xsl:value-of select="concat(format-number(($weight * 0.453592), '#.##'), ' kg')"/>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<xsl:value-of select="concat($weight, ' kg')"/>
|
||||
|
|
|
@ -65,7 +65,7 @@
|
|||
<xsl:if test="WEIGTH != ''">
|
||||
<weightsystem>
|
||||
<xsl:attribute name="weight">
|
||||
<xsl:value-of select="concat(WEIGTH, ' kg')"/>
|
||||
<xsl:value-of select="concat(translate(WEIGTH, ',', '.'), ' kg')"/>
|
||||
</xsl:attribute>
|
||||
</weightsystem>
|
||||
</xsl:if>
|
||||
|
@ -240,7 +240,7 @@
|
|||
|
||||
<xsl:choose>
|
||||
<xsl:when test="$number != ''">
|
||||
<xsl:value-of select="concat(($number div 1000), ' bar')"/>
|
||||
<xsl:value-of select="concat(format-number(($number div 1000), '#.##'), ' bar')"/>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>0</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
|
|
|
@ -94,7 +94,7 @@
|
|||
</xsl:attribute>
|
||||
<xsl:if test="CYLINDERSIZE != ''">
|
||||
<xsl:attribute name="size">
|
||||
<xsl:value-of select="CYLINDERSIZE + CYLINDERSIZE * DBLTANK"/>
|
||||
<xsl:value-of select="format-number(CYLINDERSIZE + CYLINDERSIZE * DBLTANK, '#.##')"/>
|
||||
</xsl:attribute>
|
||||
</xsl:if>
|
||||
<xsl:if test="WORKINGPRESSURE > 0">
|
||||
|
|
Loading…
Add table
Reference in a new issue