[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kjs
From:       Harri Porten <porten () kde ! org>
Date:       2005-06-11 14:40:00
Message-ID: 1118500800.217717.30990.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 424339 by porten:

found AM and PM not to be recognized when parsing dates. Applied fixed
version of JavaScriptCore patch.


 M  +5 -0      ChangeLog  
 M  +18 -0     date_object.cpp  


--- trunk/KDE/kdelibs/kjs/ChangeLog #424338:424339
@@ -1,3 +1,8 @@
+2005-06-11  Harri Porten  <porten@kde.org>
+
+	* date_object.cpp (KRFCDate_parseDate): parse AM and PM. Fixed
+	version of JavaScriptCore patch.
+
 2005-05-28  Harri Porten  <porten@kde.org>
 
 	* nodes.cpp: fixed override of properties on variable
--- trunk/KDE/kdelibs/kjs/date_object.cpp #424338:424339
@@ -909,6 +909,24 @@
 
           while(*dateString && isspace(*dateString))
             dateString++;
+
+	  if (strncasecmp(dateString, "AM", 2) == 0) {
+	    if (hour > 12)
+	      return invalidDate;
+	    if (hour == 12)
+	      hour = 0;
+	    dateString += 2;
+	    while (isspace(*dateString))
+	      dateString++;
+	  } else if (strncasecmp(dateString, "PM", 2) == 0) {
+	    if (hour > 12)
+	      return invalidDate;
+	    if (hour != 12)
+	      hour += 12;
+	    dateString += 2;
+	    while (isspace(*dateString))
+	      dateString++;
+	  }
         }
      } else {
        dateString = newPosStr;
[prev in list] [next in list] [prev in thread] [next in thread]