[PATCH 3/3] Change the XSLT to use the duration format instead of "logic"

[Miika Turkia]

Signed-off-by: Miika Turkia <miika.turkia at gmail.com>
---
 qt-ui/divelogimportdialog.cpp | 1 +
 xslt/manualcsv2xml.xslt       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/qt-ui/divelogimportdialog.cpp b/qt-ui/divelogimportdialog.cpp
index b79d33c..3318bc9 100644
--- a/qt-ui/divelogimportdialog.cpp
+++ b/qt-ui/divelogimportdialog.cpp
@@ -133,6 +133,7 @@ void DiveLogImportDialog::on_buttonBox_accepted()
 					  ui->ManualSeparator->currentIndex(),
 					  ui->Units->currentIndex(),
 					  ui->DateFormat->currentIndex(),
+					  ui->DurationFormat->currentIndex(),
 					  VALUE_IF_CHECKED(DiveNumber),
 					  VALUE_IF_CHECKED(Date), VALUE_IF_CHECKED(Time),
 					  VALUE_IF_CHECKED(Duration), VALUE_IF_CHECKED(Location),
diff --git a/xslt/manualcsv2xml.xslt b/xslt/manualcsv2xml.xslt
index d749443..544220a 100644
--- a/xslt/manualcsv2xml.xslt
+++ b/xslt/manualcsv2xml.xslt
@@ -164,7 +164,7 @@
         </xsl:variable>
         <xsl:attribute name="duration">
           <xsl:choose>
-            <xsl:when test="substring-before($duration, ':') = '' and $duration < 600">
+            <xsl:when test="$durationfmt = 1">
               <xsl:value-of select="$duration * 60"/>
             </xsl:when>
             <xsl:otherwise>
-- 
1.9.1