From 7c43ca90353a547553423bf03f2e968d8db4b0a2 Mon Sep 17 00:00:00 2001
From: Miika Turkia <miika.turkia@gmail.com>
Date: Sun, 25 Jan 2015 20:09:11 +0200
Subject: Support for AM/PM time format on manual CSV import

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 xslt/manualcsv2xml.xslt | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/xslt/manualcsv2xml.xslt b/xslt/manualcsv2xml.xslt
index e7f295566..f771df56f 100644
--- a/xslt/manualcsv2xml.xslt
+++ b/xslt/manualcsv2xml.xslt
@@ -136,10 +136,23 @@
       <xsl:attribute name="time">
         <xsl:choose>
           <xsl:when test="$timeField >= 0">
-            <xsl:call-template name="getFieldByIndex">
-              <xsl:with-param name="index" select="$timeField"/>
-              <xsl:with-param name="line" select="$line"/>
-            </xsl:call-template>
+            <xsl:variable name="timef">
+              <xsl:call-template name="getFieldByIndex">
+                <xsl:with-param name="index" select="$timeField"/>
+                <xsl:with-param name="line" select="$line"/>
+              </xsl:call-template>
+            </xsl:variable>
+            <xsl:choose>
+              <xsl:when test="contains($timef, 'AM')">
+                <xsl:value-of select="concat(substring-before($timef, ':') mod 12, ':', translate(substring-after($timef, ':'), ' AM', ''))"/>
+              </xsl:when>
+              <xsl:when test="contains($timef, 'PM')">
+                <xsl:value-of select="concat(substring-before($timef, ':') mod 12 + 12, ':', translate(substring-after($timef, ':'), ' PM', ''))"/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:value-of select="$timef"/>
+              </xsl:otherwise>
+            </xsl:choose>
           </xsl:when>
           <xsl:otherwise>
             <xsl:value-of select="concat(substring($time, 2, 2), ':', substring($time, 4, 2))"/>
-- 
cgit v1.2.3-70-g09d2