Merge pull request #2448 from myxor/agenda_today

Agenda: Setting to use "Today" and "Yesterday" instead of dates

apps/agenda/ChangeLog

@@ -9,4 +9,5 @@
       Fix clkinfo icon
 0.09: Ensure Agenda supplies an image for clkinfo items
 0.10: Update clock_info to avoid a redraw
-0.11: Added dynamic, short and range fields to clkinfo
+0.11: Setting to use "Today" and "Yesterday" instead of dates
+      Added dynamic, short and range fields to clkinfo

apps/agenda/agenda.js

@@ -33,16 +33,32 @@ CALENDAR=CALENDAR.sort((a,b)=>a.timestamp - b.timestamp);
 function getDate(timestamp) {
   return new Date(timestamp*1000);
 }
+function formatDay(date) {
+  if (!settings.useToday) {
+    return Locale.date(date);
+  }
+  const dateformatted = date.toISOString().split('T')[0]; // yyyy-mm-dd
+  const today = new Date(Date.now()).toISOString().split('T')[0]; // yyyy-mm-dd
+  if (dateformatted == today) {
+     return /*LANG*/"Today ";
+  } else {
+    const tomorrow = new Date(Date.now() + 86400 * 1000).toISOString().split('T')[0]; // yyyy-mm-dd
+    if (dateformatted == tomorrow) {
+       return /*LANG*/"Tomorrow ";
+    }
+    return Locale.date(date);
+  }
+}
 function formatDateLong(date, includeDay, allDay) {
   let shortTime = Locale.time(date,1)+Locale.meridian(date);
   if(allDay) shortTime = "";
-  if(includeDay || allDay)
+  if(includeDay || allDay) {
-    return Locale.date(date)+" "+shortTime;
+    return formatDay(date)+" "+shortTime;
+  }
   return shortTime;
 }
 function formatDateShort(date, allDay) {
-  return Locale.date(date).replace(/\d\d\d\d/,"")+(allDay?
+  return formatDay(date).replace(/\d\d\d\d/,"")+(allDay?"":Locale.time(date,1)+Locale.meridian(date));
-    "" : Locale.time(date,1)+Locale.meridian(date));
 }
 
 var lines = [];

apps/agenda/settings.js

@@ -43,6 +43,13 @@
         updateSettings();
       }
     },
+    /*LANG*/"Use 'Today',..." : {
+      value : !!settings.useToday,
+      onchange: v => {
+        settings.useToday = v;
+        updateSettings();
+      }
+    },
   };
   E.showMenu(mainmenu);
 })