infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge branch 'calendar' into reminders

pull/1/head
yflory 2021-04-12 11:21:01 +02:00
parent 8ebc71cd96 3d6bf334db
commit 231d5ebd24
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/admin/inner.js
View File

@ -1322,7 +1322,7 @@ define([
var $start = $(start); var $start = $(start);
var $end = $(end); var $end = $(end);
// XXX new Date().toLocaleString('fr-fr', {month: 'long'}).replace(/./, c => c.toUpperCase()) // XXX new Date().toLocaleString('fr-fr', {month: 'long'}).replace(/./, c => c.toUpperCase())
var is24h = false var is24h = false;
try { try {
is24h = !new Intl.DateTimeFormat(navigator.language, { hour: 'numeric' }).format(0).match(/AM/); is24h = !new Intl.DateTimeFormat(navigator.language, { hour: 'numeric' }).format(0).match(/AM/);
} catch (e) {} } catch (e) {}

2
www/calendar/inner.js
View File

@ -226,8 +226,6 @@ Messages.calendar_dateTimeRange = "{0} {1} - {2}";
timegridDisplayTime: getTime, timegridDisplayTime: getTime,
timegridDisplayPrimaryTime: getTime, timegridDisplayPrimaryTime: getTime,
popupDetailDate: function(isAllDay, start, end) { popupDetailDate: function(isAllDay, start, end) {
var isSameDate = +start._date === +end._date;
var startDate = start._date.toLocaleDateString(); var startDate = start._date.toLocaleDateString();
var endDate = end._date.toLocaleDateString(); var endDate = end._date.toLocaleDateString();
if (isAllDay) { if (isAllDay) {