Author: bklaas
Date: Fri Aug 1 16:24:45 2008
New Revision: 2754
URL: http://svn.slimdevices.com?rev=2754&root=Jive&view=rev
Log:
Bug: 8871
Description: pull ampm fix into 7.1
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/jive/utils/datetime.lua
Modified: 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/utils/datetime.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/jive/utils/datetime.lua?rev=2754&root=Jive&r1=2753&r2=2754&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/utils/datetime.lua
(original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/utils/datetime.lua Fri Aug
1 16:24:45 2008
@@ -276,6 +276,18 @@
timeElements[i] = tonumber(element)
i = i+1
end
+
+ -- convert ampm hours to 24h for method calculation
+ if string.find(_hhmm, 'p') then
+ if timeElements[1] ~= 12 then
+ timeElements[1] = timeElements[1] + 12
+ end
+ elseif string.find(_hhmm, 'a') then
+ if timeElements[1] == 12 then
+ timeElements[1] = 0
+ end
+ end
+
-- punt if this isn't a valid hh mm array
if (timeElements[1] > 23 or timeElements[2] > 59) then
return secondsFromMidnight
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
