Revision: 1616
          http://mrbs.svn.sourceforge.net/mrbs/?rev=1616&view=rev
Author:   cimorrison
Date:     2010-11-18 17:30:32 +0000 (Thu, 18 Nov 2010)

Log Message:
-----------
Fixed a bug which meant that the start and end times did not appear on the 
edit_entry form when using Windows servers.

Modified Paths:
--------------
    mrbs/trunk/web/edit_entry.php
    mrbs/trunk/web/language.inc

Modified: mrbs/trunk/web/edit_entry.php
===================================================================
--- mrbs/trunk/web/edit_entry.php       2010-11-18 17:05:52 UTC (rev 1615)
+++ mrbs/trunk/web/edit_entry.php       2010-11-18 17:30:32 UTC (rev 1616)
@@ -82,7 +82,7 @@
   }
   else
   {
-    $format = ($twentyfourhour_format) ? "%R" : "%l:%M %P";
+    $format = ($twentyfourhour_format) ? "%H:%M" : "%l:%M %P";
   }
   $html .= "<select style=\"display: $display\" id = 
\"${prefix}seconds${area['id']}\" name=\"${prefix}seconds\" 
onChange=\"adjustSlotSelectors(this.form)\"$disabled>\n";
   for ($t = $first; $t <= $last; $t = $t + $resolution)

Modified: mrbs/trunk/web/language.inc
===================================================================
--- mrbs/trunk/web/language.inc 2010-11-18 17:05:52 UTC (rev 1615)
+++ mrbs/trunk/web/language.inc 2010-11-18 17:30:32 UTC (rev 1616)
@@ -784,6 +784,8 @@
 
     $format = preg_replace('/%p/', $ampm, $format);
   }
+  // %R not supported on Windows
+  $format = str_replace("%R", "%H:%M", $format);
 
   $result = strftime($format,$time);
   return utf8_convert_from_locale($result);


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1,  ECMAScript5, and DOM L2 & L3.
Spend less time writing and  rewriting code and more time creating great
experiences on the web. Be a part of the beta today
http://p.sf.net/sfu/msIE9-sfdev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits

Reply via email to