fixed time format detection for cases where month or weekday names contain "am" or...

diff --git a/Readme.txt b/Readme.txt
index 8a10d3fa62a1209d51876ec7d02ad62357122b57..0d3bdfed3ce52ef8a7bf706173ef3721663550fd 100644 (file)
--- a/Readme.txt
+++ b/Readme.txt
@@ -291,4 +291,6 @@ Changelog:
 1.35 (2012-01-27) by Michael Prager\r
   - fixed 24/12h time format detection\r
   - fixed weekday not showing on some devices\r
+1.36 (2012-01-31) by Michael Prager\r
+  - fixed 24/12h time format detection problem introduced in v1.35\r
 \r

diff --git a/build.pl b/build.pl
index 85b1b44af54d0017cf09304fcc8a5d55c1827b2f..34c61e689ece5f67d146a8abaaad5e9803912ee1 100755 (executable)
--- a/build.pl
+++ b/build.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-my $version = "1.35";
+my $version = "1.36";
 
 use warnings;
 use strict;

diff --git a/comingNext/Info.plist b/comingNext/Info.plist
index d0c1c5002130ccce9b652a12695af9d8eb105639..d11c605ab58b1ab9dd19cc073331af0d1aec71a9 100644 (file)
--- a/comingNext/Info.plist
+++ b/comingNext/Info.plist
@@ -2,9 +2,9 @@
 <!DOCTYPE plist PUBLIC "-//Nokia//DTD PLIST 1.0//EN" "http://www.nokia.com/NOKIA_COM_1/DTDs/plist-1.0.dtd">\r
 <plist version="1.0">\r
 <dict>\r
-       <key>DisplayName</key>                  <string>ComingNext 1.35</string>\r
+       <key>DisplayName</key>                  <string>ComingNext 1.36</string>\r
        <key>Identifier</key>                   <string>ar.com.cochambre.symbian.wrt.comingnext</string>\r
-       <key>Version</key>                      <string>1.35</string>\r
+       <key>Version</key>                      <string>1.36</string>\r
        <key>MainHTML</key>                     <string>index.html</string>\r
        <key>AllowNetworkAccess</key>           <true/>\r
        <key>MiniViewEnabled</key>              <true/> \r

diff --git a/comingNext/index.html b/comingNext/index.html
index 5cc4ee671e71224635878ff2cf18f897a4cfb9c2..54c98d5cd17ac8b605585b924d056aace3b86027 100644 (file)
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -83,7 +83,7 @@ var config = {
 // Nothing of interest from here on...\r
 //-------------------------------------------------------\r
 var panelNum = 0; // use 1 for second panel\r
-var version = "1.35";\r
+var version = "1.36";\r
 var versionURL = "http://comingnext.sourceforge.net/version.xml";\r
 var calendarService = null;\r
 var cacheEntriesHtml = [];\r
@@ -375,11 +375,16 @@ function collectLocales()
        }\r
 }\r
 \r
+function stringEndsWith(str, suffix)\r
+{\r
+       return str.indexOf(suffix, str.length - suffix.length) !== -1;\r
+}\r
+\r
 // detects the system's current time format by parsing a native calendar timestamp (this is the only reliable formating across all devices and firmwares)\r
 function detectTimeFormat(localeTimeString)\r
 {\r
        localeTimeString = localeTimeString.toLowerCase();\r
-       use12hoursTimeFormat = localeTimeString.indexOf("am") != -1 || localeTimeString.indexOf("pm") != -1 ? true : false;\r
+       use12hoursTimeFormat = stringEndsWith(localeTimeString, "am") || stringEndsWith(localeTimeString, "pm");\r
        timeFormatSeparator = localeTimeString.indexOf(":") != -1 ? ":" : ".";\r
 }\r
 \r