diff options
| author |  Miika Turkia <miika.turkia@gmail.com> | 2014-12-31 18:27:31 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-12-31 08:35:36 -0800 |
| commit | d70a6f23ed0e7e8ad6ae07b9b7a7234f53892e74 (patch) | |
| tree | a4d5a1544e04a82c3933e6d1dbe1992addd56391 | |
| parent | 65ee482adb08a46fbda57d067524df270ca5a121 (diff) | |
| download | subsurface-d70a6f23ed0e7e8ad6ae07b9b7a7234f53892e74.tar.gz | |
Change the XSLT to use the duration format instead of "logic"
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | qt-ui/divelogimportdialog.cpp | 1 | ||||
| -rw-r--r-- | xslt/manualcsv2xml.xslt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/qt-ui/divelogimportdialog.cpp b/qt-ui/divelogimportdialog.cpp index b79d33c43..3318bc90b 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 d74944398..544220a37 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> |