(whimsy) branch master updated: Reformat meeting display text

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 47b9c4e3 Reformat meeting display text
47b9c4e3 is described below

commit 47b9c4e3b8681ad3f8bff522ac27cda82c921c9a
Author: Sebb <s...@apache.org>
AuthorDate: Fri Feb 9 16:03:03 2024 +0000

    Reformat meeting display text
---
 www/members/proxy.cgi | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/www/members/proxy.cgi b/www/members/proxy.cgi
index 874d4ea7..56ef2ef0 100755
--- a/www/members/proxy.cgi
+++ b/www/members/proxy.cgi
@@ -12,18 +12,19 @@ require 'whimsy/asf/meeting-util'
 
 # Emit basic instructions and details on quorum
 def emit_instructions(today, cur_mtg_dir, meeting)
+  meeting_display = meeting.gsub(%r{\A(\d\d\d\d)(\d\d)(\d\d)\z}, "\\1-\\2-\\3")
   if today > meeting
     _p.text_warning %{
         WARNING: Data for the next Member's Meeting is not yet available,
         so this form will not work yet.  Please wait until the Board Chair
         announces the opening of nominations for the board and new members,
         and then check back to assign a new proxy for the meeting.
-        Data from the previous meeting on #{meeting} is shown below for 
debugging only.
+        Data from the previous meeting on #{meeting_display} is shown below 
for debugging only.
       }
   end
   _p %{
     This form allows you to assign a proxy for the upcoming
-    Member's Meeting on #{meeting}. If there is any chance you might not be 
able
+    Member's Meeting on #{meeting_display}. If there is any chance you might 
not be able
     to attend the first part of the Member's Meeting on Tuesday in IRC, then
     please assign a proxy, because that helps the meeting reach
     quorum more quickly - the meeting can't formally continue without quorum 
at the start.
@@ -50,7 +51,7 @@ def emit_instructions(today, cur_mtg_dir, meeting)
     _p do
       _ 'Currently, we must have '
       _span.text_primary attend_irc
-      _ " Members attend the #{meeting} meeting and respond to Roll Call to 
reach quorum and continue the meeting."
+      _ " Members attend the #{meeting_display} meeting and respond to Roll 
Call to reach quorum and continue the meeting."
       _ " Calculation: Total voting members: #{num_members}, with one third 
for quorum: #{quorum_need}, minus previously submitted proxies: #{num_proxies}"
     end
   end