mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2026-09-10 15:56:35 -04:00
Fix ISO date insertion in diary
See Bug#81263. Diary's 'iso' dates should use ISO8601 YYYY-MM-DD format. This change fixes the format used by `diary-insert-entry'. * lisp/calendar/calendar.el (diary-iso-date-insertion-form): Use YYYY-MM-DD format (not YYYY/M/D) when inserting ISO dates. * test/lisp/calendar/diary-icalendar-resources/import-bug-11473.diary-iso: * test/lisp/calendar/diary-icalendar-resources/import-bug-22092.diary-iso: * test/lisp/calendar/diary-icalendar-resources/import-bug-33277.diary-iso: * test/lisp/calendar/diary-icalendar-resources/import-legacy-vars.diary-iso: * test/lisp/calendar/diary-icalendar-resources/import-multiple-vcalendars.diary-iso: * test/lisp/calendar/diary-icalendar-resources/import-non-recurring-1.diary-iso: * test/lisp/calendar/diary-icalendar-resources/import-non-recurring-all-day.diary-iso: * test/lisp/calendar/diary-icalendar-resources/import-non-recurring-another-example.diary-iso: * test/lisp/calendar/diary-icalendar-resources/import-non-recurring-folded-summary.diary-iso: * test/lisp/calendar/diary-icalendar-resources/import-non-recurring-long-summary.diary-iso: * test/lisp/calendar/diary-icalendar-resources/import-time-format-12hr-blank.diary-iso: * test/lisp/calendar/diary-icalendar-resources/import-with-attachment.diary-iso: * test/lisp/calendar/diary-icalendar-resources/import-with-timezone.diary-iso: * test/lisp/calendar/diary-icalendar-resources/import-with-uid.diary-iso: Update tests.
This commit is contained in:
Richard Lawrence
Eli Zaretskii
parent
3c9517300e
commit
e0185b0907
|
|
@ -918,7 +918,9 @@ including those inserted into the diary from the calendar with
|
|||
(defconst diary-european-date-insertion-form '(day "/" month "/" year)
|
||||
"Pseudo-pattern for European dates in `diary-date-insertion-form'")
|
||||
|
||||
(defconst diary-iso-date-insertion-form '(year "/" month "/" day)
|
||||
(defconst diary-iso-date-insertion-form '((format "%s-%.2d-%.2d" year
|
||||
(string-to-number month)
|
||||
(string-to-number day)))
|
||||
"Pseudo-pattern for ISO dates in `diary-date-insertion-form'")
|
||||
|
||||
(defcustom diary-date-insertion-form
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
&2012/5/15 15:00-15:30 Query
|
||||
&2012-05-15 15:00-15:30 Query
|
||||
Location: phone
|
||||
Status: confirmed
|
||||
Organizer: A. Luser <a.luser@foo.com>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
&2014/12/8 18:30-22:55 Norwegian til Tromsoe-Langnes -
|
||||
&2014-12-08 18:30-22:55 Norwegian til Tromsoe-Langnes -
|
||||
Location: Stavanger-Sola
|
||||
Category: Appointment
|
||||
Access: public
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
&2018/11/5 21:00 event with same start/end time
|
||||
&2018-11-05 21:00 event with same start/end time
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
2025/9/19 09:00-11:30 Testing legacy `icalendar-import-format*' vars
|
||||
2025-09-19 09:00-11:30 Testing legacy `icalendar-import-format*' vars
|
||||
CLASS=private
|
||||
DESCRIPTION=described
|
||||
LOCATION=somewhere
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
&2011/7/23 event-1
|
||||
&2011-07-23 event-1
|
||||
|
||||
&2011/7/24 event-2
|
||||
&2011-07-24 event-2
|
||||
|
||||
&2011/7/25 event-3a
|
||||
&2011-07-25 event-3a
|
||||
|
||||
&2011/7/25 event-3b
|
||||
&2011-07-25 event-3b
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
&2003/9/19 09:00-11:30 non-recurring
|
||||
&2003-09-19 09:00-11:30 non-recurring
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
&2003/9/19 non-recurring allday
|
||||
&2003-09-19 non-recurring allday
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
&2004/11/23 14:45-15:45 another example
|
||||
&2004-11-23 14:45-15:45 another example
|
||||
Status: tentative
|
||||
Access: private
|
||||
UID: 6161a312-3902-11d9-b512-f764153bb28b
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
&2004/11/23 14:00-14:30 folded summary
|
||||
&2004-11-23 14:00-14:30 folded summary
|
||||
Status: tentative
|
||||
Access: private
|
||||
UID: 04979712-3902-11d9-93dd-8f9f4afe08da
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
&2003/9/19 long summary
|
||||
&2003-09-19 long summary
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
&2003/9/19 9.00h-11.30h 12hr blank-padded
|
||||
&2003-09-19 9.00h-11.30h 12hr blank-padded
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
&2003/9/19 09:00 Has an attachment
|
||||
&2003-09-19 09:00 Has an attachment
|
||||
Attachment: R3Jl.plain
|
||||
UID: f9fee9a0-1231-4984-9078-f1357db352db
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
&2012/1/15 15:00-15:30 standardtime
|
||||
&2012-01-15 15:00-15:30 standardtime
|
||||
|
||||
&2012/12/15 11:00-11:30 daylightsavingtime
|
||||
&2012-12-15 11:00-11:30 daylightsavingtime
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
&2003/9/19 09:00-11:30 non-recurring
|
||||
&2003-09-19 09:00-11:30 non-recurring
|
||||
UID: 1234567890uid
|
||||
|
|
|
|||
Loading…
Reference in a new issue