X-Git-Url: https://code.delx.au/comingnext/blobdiff_plain/acfbf19b3369a48d769521ffd226ca9bfbc9da68..9725d6fde493ea229b1785da5976b611fe3d2279:/comingNext/index.html

diff --git a/comingNext/index.html b/comingNext/index.html
index 8241fe9..9502668 100644
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -107,6 +107,7 @@ var errorOccured = false;
 var entryLists = null; // stores all fetched calendar entries until data is refreshed
 var statupSuccessful = false; // indicates if everything started up wihtout errors. If we detect an error after that, it might just be a temporary problem e.g. by a backup process.
 var use12hoursTimeFormat = false; // defines how time should be formated: 19:00 or 07:00 pm
+var timeFormatSeparator = ":"; // format time 19:00 or 19.00 depending on system setting
 
 // vars for daylight saving time
 var summertime = false; // true, if current date is in summer, false if in winter
@@ -346,6 +347,7 @@ function collectLocales()
 		var curWeekday = "";
 
 		while (weekdaylist && (entry = weekdaylist.getNext()) != undefined) {
+			detectTimeFormat(entry.StartTime + '');
 			curWeekday = (entry.StartTime + '').split(',')[0];
 			log(entry.StartTime + ' -> ' + curWeekday + ' ' + counter2);
 			ids[counter + counter2] = entry.id;
@@ -373,6 +375,14 @@ function collectLocales()
 	}
 }
 
+// detects the system's current time format by parsing a native calendar timestamp (this is the only reliable formating across all devices and firmwares)
+function detectTimeFormat(localeTimeString)
+{
+	localeTimeString = localeTimeString.toLowerCase();
+	use12hoursTimeFormat = localeTimeString.indexOf("am") != -1 || localeTimeString.indexOf("pm") != -1 ? true : false;
+	timeFormatSeparator = localeTimeString.indexOf(":") != -1 ? ":" : ".";
+}
+
 function requestNotification()
 {
 	var criteria = new Object();
@@ -492,10 +502,6 @@ function parseDate(dateString)
 		if (dateArr.length == 6 && dateArr[5].toLowerCase() == 'am' && hours == 12) 
 			hours = 0;
 		
-		// remember if date was formated using 12h time format, we need to use this information later when formating time
-		if (dateArr.length == 6 && (dateArr[5].toLowerCase() == 'am' || dateArr[5].toLowerCase() == 'pm'))
-			use12hoursTimeFormat = true;
-
 		result = new Date(year, month - 1, day, hours, minutes, seconds);
 	}
 	
@@ -521,7 +527,7 @@ function parseDate(dateString)
 
 function getWeekdayLocalized(date) {
 	var localizedString = date.toLocaleDateString();
-	if (localizedString.match(/\d\d.\d\d.\d\d/)) {
+	if (localizedString.indexOf(",") == -1) {
 		return weekdays_translated[date.getDay()];
 	} else
 		return localizedString.split(',')[0];
@@ -593,15 +599,11 @@ function formatDate(date, format)
 function formatTime(date)
 {
 	// date is a Date() object
-	date.setSeconds(0); // we don't care about seconds
-	var time = date.toLocaleTimeString().replace(/[\.:]00/, ''); // remove seconds from string
-	if (time.replace(/\./, ':').split(':')[0].length < 2)
-		time = '0' + time;
-
-	// workaround for bug introduced by Anna firmwares, which causes Date().toLocaleTimeString() to no longer return time in 12h format even though this has been defined in system settings
-	if (use12hoursTimeFormat && time.toLowerCase().indexOf('am') == -1 && time.toLowerCase().indexOf('pm') == -1) {	
-		var hour = date.getHours();
-		var minute = date.getMinutes();
+	var hour = date.getHours();
+	var minute = date.getMinutes();
+	
+	// don't use Date().toLocaleTimeString() as it is utterly broken on newer firmwares
+	if (use12hoursTimeFormat) {
 		var ap = "AM";
 		if (hour > 11)
 			ap = "PM";
@@ -613,11 +615,19 @@ function formatTime(date)
 			hour = "0" + hour;
 		if (minute < 10)
 			minute = "0" + minute;
-		time = hour + ":" + minute + " " + ap;
+		time = hour + timeFormatSeparator + minute + " " + ap;
+	}
+	else {
+		if (hour < 10)
+			hour = "0" + hour;
+		if (minute < 10)
+			minute = "0" + minute;
+		time = hour + timeFormatSeparator + minute;
 	}
 	
 	if (config['showNowAsText'].Value && date.getTime() == now.getTime())
 		time = '<span class="now">' + config['nowText'].Value + '</span>';
+	log("formatTime(): " + time + ", use12hoursTimeFormat=" + use12hoursTimeFormat + ", timeFormatSeparator=" + timeFormatSeparator + ", date.toLocateTimeString(): " + date.toLocaleTimeString());
 	return time;
 }