Add dates and URLs, tweak wording

1 files changed, 42 insertions, 13 deletions

diff --git a/2022/organizers-notebook.org b/2022/organizers-notebook.org
index 732478c9..2ad128c4 100644
--- a/2022/organizers-notebook.org
+++ b/2022/organizers-notebook.org
@@ -1207,17 +1207,39 @@ Objectives for this e-mail:
   (let* ((template (or template (emacsconf-mail-merge-get-template "early-acceptance")))
          (talks (cdr group))
          (first (car talks))
-         (prerec-target "November 7")
+         (reply-by-date (date-to-time "2022-10-08"))
+         (prerec-target (date-to-time "2022-11-07"))
          (attrs `(:speakers-short
                   ,(plist-get first :speakers-short)
                   :email
                   ,(plist-get first :email)
                   :year
                   ,(or (plist-get first :year) emacsconf-year)
+                  :reply-date
+                  ,(format-time-string "%b %e (%a)" reply-by-date)
                   :titles
                   ,(mapconcat (lambda (o) (format "\"%s\"" (plist-get o :title))) talks " and ")
                   :prerec-target
-                  ,prerec-target
+                  ,(format-time-string "%b %e (%a)" prerec-target)
+                  :page-urls
+                  ,(mapconcat (lambda (o) (format "https://emacsconf.org/%s/talks/%s" (plist-get o :year)
+                                                  (plist-get o :slug)))
+                              talks "\n")
+                  :acceptance-tasks
+                  ,(concat
+                   "* TODO Reply to acceptance e-mail in order to confirm e-mail communication  :emacsconf:
+  DEADLINE: " (format-time-string "<%Y-%m-%d %a>" reply-by-date) "\n  Please include public e-mail and/or any extra information you want on\n"
+(mapconcat (lambda (o) (format "  https://emacsconf.org/%s/talks/%s"
+                               (plist-get o :year)
+                               (plist-get o :slug)))
+           talks "\n") "\n"
+(mapconcat (lambda (o) (format "* Record %s-minute talk for \"%s\"  :emacsconf:
+  DEADLINE: %s\n  https://emacsconf.org/%s/prepare/"
+                               (plist-get o :time)
+                               (plist-get o :title)
+                               (format-time-string "<%Y-%m-%d %a>" prerec-target)
+                               (plist-get o :year)))
+           talks "\n"))
                   :talk-details-and-comments
                   ,(mapconcat
                     (lambda (o)
@@ -1233,7 +1255,7 @@ Objectives for this e-mail:
      (emacsconf-replace-plist-in-string attrs (plist-get template :subject))
      `(("Reply-To" . ,(plist-get template :reply-to))
        ("Mail-Followup-To" . ,(plist-get template :mail-followup-to))
-       ("Mail-Followup-To" . ,(plist-get template :cc))))
+       ("Cc" . ,(plist-get template :cc))))
     (message-goto-body)
     (save-excursion (insert (emacsconf-replace-plist-in-string attrs (plist-get template :body))))))
 
@@ -1253,14 +1275,19 @@ Objectives for this e-mail:
 :SUBJECT:  EmacsConf ${year} acceptance: ${titles}
 :EMAIL_ID: early-acceptance
 :CC: emacsconf-submit@gnu.org
+:MAIL_FOLLOWUP_TO: emacsconf-submit@gnu.org
+:REPLY_TO: emacsconf-submit@gnu.org
 :END:
 Hi, ${speakers-short}!
 
-I'm happy to tell you that we've accepted your EmacsConf proposal for
-${titles}. Thanks for volunteering to share what you're learning about!
-I know it takes a fair bit of work to prepare a presentation, so I
-appreciate that you're taking the time to show what's possible with
-Emacs and encourage people to learn more.
+Summary:
+,${acceptance-tasks}
+
+We've accepted your EmacsConf proposal for ${titles}! Thanks for
+volunteering to share what you're learning about. I know it takes a
+fair bit of work to prepare a presentation, so I appreciate that
+you're taking the time to show what's possible with Emacs and
+encourage people to learn more.
 
 ---------------------------------------------------------------------
 ${talk-details-and-comments}
@@ -1274,19 +1301,21 @@ We've posted preparation tips at https://emacsconf.org/${year}/prepare/ .
 We'll send you instructions on how to upload files once we get that
 set up.
 
-Could you please plan to put your pre-rec together by *${prerec-target}* (or
-even earlier if you want)? We're going to try to caption as many talks
+Could you please plan to **put your pre-rec together by ${prerec-target}**
+(or even earlier if you want)? We're going to try to caption as many talks
 as possible again this year, and extra time helps a lot. People found
 the captions really helpful while watching the stream, and sending
 your talk in early will make it more likely that we'll be able to get
 your captions edited and reviewed before the conference.
 
-Please reply to this e-mail (including Cc: emacsconf-submit@gnu.org)
-as soon as you can so that we can confirm that we've got the right
-email address for you and that messages can get properly delivered.
+**Please reply to this e-mail by ${reply-date}** (including
+emacsconf-submit@gnu.org in the To: or Cc:) so that we can confirm
+that we've got the right email address for you and that messages can
+get properly delivered.
 
 Would you like us to put ${email} as the public contact information
 for you, or would you like us to add something else to the talk pages?
+${page-urls}
 
 Thank you so much!