mirror of https://github.com/espruino/BangleApps
Setting to use "Today" and "Yesterday" instead of dates
parent
1f1b8a20d5
commit
6ab32959d5
|
@ -9,3 +9,4 @@
|
||||||
Fix clkinfo icon
|
Fix clkinfo icon
|
||||||
0.09: Ensure Agenda supplies an image for clkinfo items
|
0.09: Ensure Agenda supplies an image for clkinfo items
|
||||||
0.10: Update clock_info to avoid a redraw
|
0.10: Update clock_info to avoid a redraw
|
||||||
|
0.11: Setting to use "Today" and "Yesterday" instead of dates
|
||||||
|
|
|
@ -33,16 +33,32 @@ CALENDAR=CALENDAR.sort((a,b)=>a.timestamp - b.timestamp);
|
||||||
function getDate(timestamp) {
|
function getDate(timestamp) {
|
||||||
return new Date(timestamp*1000);
|
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) {
|
function formatDateLong(date, includeDay, allDay) {
|
||||||
let shortTime = Locale.time(date,1)+Locale.meridian(date);
|
let shortTime = Locale.time(date,1)+Locale.meridian(date);
|
||||||
if(allDay) shortTime = "";
|
if(allDay) shortTime = "";
|
||||||
if(includeDay || allDay)
|
if(includeDay || allDay) {
|
||||||
return Locale.date(date)+" "+shortTime;
|
return formatDay(date)+" "+shortTime;
|
||||||
|
}
|
||||||
return shortTime;
|
return shortTime;
|
||||||
}
|
}
|
||||||
function formatDateShort(date, allDay) {
|
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 = [];
|
var lines = [];
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"id": "agenda",
|
"id": "agenda",
|
||||||
"name": "Agenda",
|
"name": "Agenda",
|
||||||
"version": "0.10",
|
"version": "0.11",
|
||||||
"description": "Simple agenda",
|
"description": "Simple agenda",
|
||||||
"icon": "agenda.png",
|
"icon": "agenda.png",
|
||||||
"screenshots": [{"url":"screenshot_agenda_overview.png"}, {"url":"screenshot_agenda_event1.png"}, {"url":"screenshot_agenda_event2.png"}],
|
"screenshots": [{"url":"screenshot_agenda_overview.png"}, {"url":"screenshot_agenda_event1.png"}, {"url":"screenshot_agenda_event2.png"}],
|
||||||
|
|
|
@ -43,6 +43,13 @@
|
||||||
updateSettings();
|
updateSettings();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
/*LANG*/"Use 'Today',..." : {
|
||||||
|
value : !!settings.useToday,
|
||||||
|
onchange: v => {
|
||||||
|
settings.useToday = v;
|
||||||
|
updateSettings();
|
||||||
|
}
|
||||||
|
},
|
||||||
};
|
};
|
||||||
E.showMenu(mainmenu);
|
E.showMenu(mainmenu);
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue