[pLog-svn] r683 - plog/trunk/class/locale

[ork at devel.plogworld.net]

Author: ork
Date: 2005-01-05 21:04:15 +0000 (Wed, 05 Jan 2005)
New Revision: 683

Modified:
   plog/trunk/class/locale/locale.class.php
Log:
fixed bugs of report #124 and removed one of two equal %p lines


Modified: plog/trunk/class/locale/locale.class.php
===================================================================
--- plog/trunk/class/locale/locale.class.php	2005-01-05 13:50:00 UTC (rev 682)
+++ plog/trunk/class/locale/locale.class.php	2005-01-05 21:04:15 UTC (rev 683)
@@ -371,7 +371,7 @@
          * <li>%j   day of the month, numeric (without leading zero)</li>
 		 * <li>%H	hours, in 24-h format</li>
 		 * <li>%I	hours, in 12-h format</li>
-		 * <li>%p   hours, in 12-h format including AM or PM</li>
+		 * <li>%p   returns AM or PM</li>
 		 * <li>%M	minutes</li>
 		 * <li>%m	month number, from 00 to 12</li>
 		 * <li>%S	seconds</li>
@@ -404,9 +404,8 @@
 			$values["%e"] = intval($timeStamp->getDay());
 			$values["%j"] = $timeStamp->getDay();
 			$values["%H"] = $timeStamp->getHour();
-			$values["%I"] = $timeStamp->getHour() >= 12 ? $timeStamp->getHour()-12 : $timeStamp->getHour();
+			$values["%I"] = ($timeStamp->getHour() != 0) ? ($timeStamp->getHour() > 12) ? $timeStamp->getHour()-12 : $timeStamp->getHour() : 12;
 			$values["%p"] = $timeStamp->getHour() >= 12 ? "pm" : "am";
-			$values["%p"] = $timeStamp->getHour() >= 12 ? "pm" : "am";
 			$values["%M"] = $timeStamp->getMinutes();
 			$values["%m"] = $timeStamp->getMonth();
 			$values["%S"] = $timeStamp->getSeconds();