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

[comingnext] / comingNext / index.html

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